diff options
| author | Kelby Ludwig <kelbyludwig@gmail.com> | 2017-08-28 20:46:35 -0500 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2017-08-29 09:46:35 +0800 |
| commit | 10041cd9945ed33fd96788f5c620a58993d3926a (patch) | |
| tree | c22e4ad3f5a8a7e7056da8ca1f131d09b3d52a3e /src/_cffi_src | |
| parent | 4c41ab087d4fa741ced2a8aba6fd38b20137f42b (diff) | |
| download | cryptography-10041cd9945ed33fd96788f5c620a58993d3926a.tar.gz cryptography-10041cd9945ed33fd96788f5c620a58993d3926a.tar.bz2 cryptography-10041cd9945ed33fd96788f5c620a58993d3926a.zip | |
added binding support for rfc 5705 (#3878)
* added binding support for rfc 5705
* WIP: testing some cffi updates
* added openssl version check
* updated cffi defs to align with pep8
* removed superfluous version checks
* remove more unecessary boilerplate
Diffstat (limited to 'src/_cffi_src')
| -rw-r--r-- | src/_cffi_src/openssl/ssl.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/_cffi_src/openssl/ssl.py b/src/_cffi_src/openssl/ssl.py index 8bda4e01..7f9eff05 100644 --- a/src/_cffi_src/openssl/ssl.py +++ b/src/_cffi_src/openssl/ssl.py @@ -420,6 +420,8 @@ size_t SSL_SESSION_get_master_key(const SSL_SESSION *, unsigned char *, size_t); size_t SSL_get_client_random(const SSL *, unsigned char *, size_t); size_t SSL_get_server_random(const SSL *, unsigned char *, size_t); +int SSL_export_keying_material(SSL *, unsigned char *, size_t, const char *, + size_t, const unsigned char *, size_t, int); long SSL_CTX_sess_number(SSL_CTX *); long SSL_CTX_sess_connect(SSL_CTX *); |