diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2015-08-19 19:34:19 -0400 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2015-08-19 19:34:19 -0400 |
| commit | 7e6ac3c8587cb1f79b62ca9049befe8e39e868a0 (patch) | |
| tree | 4f4ccbdd1f06dbdbc3192fba9b9136bec4cfc24d | |
| parent | 222e61d5855059c4267b04e5a5657b8db7719cc5 (diff) | |
| parent | 421ba64f450d10789df087644fa300f1824e3b6c (diff) | |
| download | cryptography-7e6ac3c8587cb1f79b62ca9049befe8e39e868a0.tar.gz cryptography-7e6ac3c8587cb1f79b62ca9049befe8e39e868a0.tar.bz2 cryptography-7e6ac3c8587cb1f79b62ca9049befe8e39e868a0.zip | |
Merge pull request #2282 from reaperhulk/ssl-bindings
additional SSL bindings
| -rw-r--r-- | src/_cffi_src/openssl/ssl.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/_cffi_src/openssl/ssl.py b/src/_cffi_src/openssl/ssl.py index f15b9b32..7a7968a1 100644 --- a/src/_cffi_src/openssl/ssl.py +++ b/src/_cffi_src/openssl/ssl.py @@ -132,6 +132,10 @@ typedef ... SSL_CTX; typedef struct { int master_key_length; unsigned char master_key[...]; + unsigned int session_id_length; + unsigned char session_id[...]; + unsigned int sid_ctx_length; + unsigned char sid_ctx[...]; ...; } SSL_SESSION; @@ -247,6 +251,10 @@ size_t SSL_get_peer_finished(const SSL *, void *, size_t); """ MACROS = """ +/* not a macro, but older OpenSSLs don't pass the args as const */ +char *SSL_CIPHER_description(const SSL_CIPHER *, char *, int); +int SSL_SESSION_print(BIO *, const SSL_SESSION *); + /* not macros, but will be conditionally bound so can't live in functions */ const COMP_METHOD *SSL_get_current_compression(SSL *); const COMP_METHOD *SSL_get_current_expansion(SSL *); |