b65cbc2359
Additionally, fix it to compile against openssl-0.9.7i, the
current pkgsrc version; due to its way of checking compatibility,
py-m2crypto is extremely picky about constness.
If this works with other versions too, just add them to the pattern.
Changes since 0.12/0.11
-------------------------
- Patches from Artur Frysiak. Thanks Artur.
= Allow using a passphrase callback in class SMIME.
= Added method get0_signers to class PKCS7, which retrieves signers'
certificates from a PKCS7 blob.
= Added methods as_pem and save_pem to class X509.
= Added file version.py.
= Allow SSL.Context.load_verify_locations to accept both 'cafile' and
'capath'.
- Fixed BIO.read() not reading until EOF. Thanks to Egil Muller
for suggestion.
- Honour 'mode' parameter in SSL.Connection.makefile. Thanks again to Egil
Muller.
- Roger Binns contributed epydoc-generated docs for M2Crypto. Thanks Roger.
- Peter Teniz contributed patches to create X.509 requests and certificates.
Thanks Peter.
- Updated Medusa to 0.54.
- Make various OpenSSL bignum functions (written long ago) available to Python.
74 lines
4.5 KiB
Text
74 lines
4.5 KiB
Text
$NetBSD: patch-ac,v 1.1 2006/01/14 23:07:26 wiz Exp $
|
|
|
|
--- SWIG/_ssl.i.orig 2004-03-25 04:41:11.000000000 +0000
|
|
+++ SWIG/_ssl.i
|
|
@@ -18,7 +18,7 @@
|
|
%apply Pointer NONNULL { RSA * };
|
|
%apply Pointer NONNULL { PyObject *pyfunc };
|
|
|
|
-%name(ssl_get_error) extern int SSL_get_error(SSL *, int);
|
|
+%name(ssl_get_error) extern int SSL_get_error(const SSL *, int);
|
|
%name(ssl_get_state) extern const char *SSL_state_string(const SSL *);
|
|
%name(ssl_get_state_v) extern const char *SSL_state_string_long(const SSL *);
|
|
%name(ssl_get_alert_type) extern const char *SSL_alert_type_string(int);
|
|
@@ -34,13 +34,13 @@
|
|
%name(ssl_ctx_new) extern SSL_CTX *SSL_CTX_new(SSL_METHOD *);
|
|
%name(ssl_ctx_free) extern void SSL_CTX_free(SSL_CTX *);
|
|
%name(ssl_ctx_set_verify_depth) extern void SSL_CTX_set_verify_depth(SSL_CTX *, int);
|
|
-%name(ssl_ctx_get_verify_depth) extern int SSL_CTX_get_verify_depth(SSL_CTX *);
|
|
-%name(ssl_ctx_get_verify_mode) extern int SSL_CTX_get_verify_mode(SSL_CTX *);
|
|
+%name(ssl_ctx_get_verify_depth) extern int SSL_CTX_get_verify_depth(const SSL_CTX *);
|
|
+%name(ssl_ctx_get_verify_mode) extern int SSL_CTX_get_verify_mode(const SSL_CTX *);
|
|
%name(ssl_ctx_set_cipher_list) extern int SSL_CTX_set_cipher_list(SSL_CTX *, const char *);
|
|
%name(ssl_ctx_add_session) extern int SSL_CTX_add_session(SSL_CTX *, SSL_SESSION *);
|
|
%name(ssl_ctx_remove_session) extern int SSL_CTX_remove_session(SSL_CTX *, SSL_SESSION *);
|
|
%name(ssl_ctx_set_session_timeout) extern long SSL_CTX_set_timeout(SSL_CTX *, long);
|
|
-%name(ssl_ctx_get_session_timeout) extern long SSL_CTX_get_timeout(SSL_CTX *);
|
|
+%name(ssl_ctx_get_session_timeout) extern long SSL_CTX_get_timeout(const SSL_CTX *);
|
|
|
|
%name(bio_new_ssl) extern BIO *BIO_new_ssl(SSL_CTX *, int);
|
|
|
|
@@ -54,29 +54,29 @@
|
|
%name(ssl_shutdown) extern int SSL_shutdown(SSL *);
|
|
%name(ssl_do_handshake) extern int SSL_do_handshake(SSL *);
|
|
%name(ssl_renegotiate) extern int SSL_renegotiate(SSL *);
|
|
-%name(ssl_pending) extern int SSL_pending(SSL *);
|
|
+%name(ssl_pending) extern int SSL_pending(const SSL *);
|
|
|
|
-%name(ssl_get_peer_cert) extern X509 *SSL_get_peer_certificate(SSL *);
|
|
-%name(ssl_get_current_cipher) extern SSL_CIPHER *SSL_get_current_cipher(SSL *);
|
|
-%name(ssl_get_verify_mode) extern int SSL_get_verify_mode(SSL *);
|
|
-%name(ssl_get_verify_depth) extern int SSL_get_verify_depth(SSL *);
|
|
-%name(ssl_get_verify_result) extern long SSL_get_verify_result(SSL *);
|
|
-%name(ssl_get_ssl_ctx) extern SSL_CTX *SSL_get_SSL_CTX(SSL *);
|
|
-%name(ssl_get_default_session_timeout) extern long SSL_get_default_timeout(SSL *);
|
|
+%name(ssl_get_peer_cert) extern X509 *SSL_get_peer_certificate(const SSL *);
|
|
+%name(ssl_get_current_cipher) extern SSL_CIPHER *SSL_get_current_cipher(const SSL *);
|
|
+%name(ssl_get_verify_mode) extern int SSL_get_verify_mode(const SSL *);
|
|
+%name(ssl_get_verify_depth) extern int SSL_get_verify_depth(const SSL *);
|
|
+%name(ssl_get_verify_result) extern long SSL_get_verify_result(const SSL *);
|
|
+%name(ssl_get_ssl_ctx) extern SSL_CTX *SSL_get_SSL_CTX(const SSL *);
|
|
+%name(ssl_get_default_session_timeout) extern long SSL_get_default_timeout(const SSL *);
|
|
|
|
%name(ssl_set_cipher_list) extern int SSL_set_cipher_list(SSL *, const char *);
|
|
-%name(ssl_get_cipher_list) extern const char *SSL_get_cipher_list(SSL *, int);
|
|
+%name(ssl_get_cipher_list) extern const char *SSL_get_cipher_list(const SSL *, int);
|
|
|
|
-%name(ssl_cipher_get_name) extern const char *SSL_CIPHER_get_name(SSL_CIPHER *);
|
|
-%name(ssl_cipher_get_version) extern char *SSL_CIPHER_get_version(SSL_CIPHER *);
|
|
+%name(ssl_cipher_get_name) extern const char *SSL_CIPHER_get_name(const SSL_CIPHER *);
|
|
+%name(ssl_cipher_get_version) extern char *SSL_CIPHER_get_version(const SSL_CIPHER *);
|
|
|
|
-%name(ssl_get_session) extern SSL_SESSION *SSL_get_session(SSL *);
|
|
+%name(ssl_get_session) extern SSL_SESSION *SSL_get_session(const SSL *);
|
|
%name(ssl_get1_session) extern SSL_SESSION *SSL_get1_session(SSL *);
|
|
%name(ssl_set_session) extern int SSL_set_session(SSL *, SSL_SESSION *);
|
|
%name(ssl_session_free) extern void SSL_SESSION_free(SSL_SESSION *);
|
|
-%name(ssl_session_print) extern int SSL_SESSION_print(BIO *, SSL_SESSION *);
|
|
+%name(ssl_session_print) extern int SSL_SESSION_print(BIO *, const SSL_SESSION *);
|
|
%name(ssl_session_set_timeout) extern long SSL_SESSION_set_timeout(SSL_SESSION *, long);
|
|
-%name(ssl_session_get_timeout) extern long SSL_SESSION_get_timeout(SSL_SESSION *);
|
|
+%name(ssl_session_get_timeout) extern long SSL_SESSION_get_timeout(const SSL_SESSION *);
|
|
|
|
%constant int ssl_error_none = SSL_ERROR_NONE;
|
|
%constant int ssl_error_ssl = SSL_ERROR_SSL;
|