diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-01-31 11:29:12 -0600 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-01-31 11:29:12 -0600 |
| commit | d7ef98b1827b96e01f13fe7a11e76ff0ad03a9c9 (patch) | |
| tree | f937cf6d92f3f737c8791d898c6c372b0bc9d11e /src | |
| parent | e409d22b0fa78b854152333ffc3b54180553478f (diff) | |
| parent | 91bded9b34a601c953587ce8ff52d87c5ad6e03a (diff) | |
| download | cryptography-d7ef98b1827b96e01f13fe7a11e76ff0ad03a9c9.tar.gz cryptography-d7ef98b1827b96e01f13fe7a11e76ff0ad03a9c9.tar.bz2 cryptography-d7ef98b1827b96e01f13fe7a11e76ff0ad03a9c9.zip | |
Merge pull request #2703 from alex/pyopenssl-binding
Added two additional bindings that PyOpenSSL might want
Diffstat (limited to 'src')
| -rw-r--r-- | src/_cffi_src/openssl/ssl.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/_cffi_src/openssl/ssl.py b/src/_cffi_src/openssl/ssl.py index 64e4e2f0..98b396da 100644 --- a/src/_cffi_src/openssl/ssl.py +++ b/src/_cffi_src/openssl/ssl.py @@ -234,6 +234,8 @@ int SSL_CTX_check_private_key(const SSL_CTX *); void SSL_CTX_set_cert_verify_callback(SSL_CTX *, int (*)(X509_STORE_CTX *,void *), void *); +int SSL_CTX_set_session_id_context(SSL_CTX *, const unsigned char *, + unsigned int); void SSL_CTX_set_cert_store(SSL_CTX *, X509_STORE *); X509_STORE *SSL_CTX_get_cert_store(const SSL_CTX *); @@ -260,6 +262,8 @@ int SSL_set_ex_data(SSL *, int, void *); int SSL_CTX_get_ex_new_index(long, void *, CRYPTO_EX_new *, CRYPTO_EX_dup *, CRYPTO_EX_free *); int SSL_CTX_set_ex_data(SSL_CTX *, int, void *); + +Cryptography_STACK_OF_X509_NAME *SSL_load_client_CA_file(const char *); """ MACROS = """ |