From b25bdcc95c9482c56a26d16f7984e824a543c977 Mon Sep 17 00:00:00 2001 From: Fedor Brunner Date: Tue, 25 Feb 2014 14:43:17 +0100 Subject: Add OpenSSL bindings for TLS Finished message. Add OpenSSL binding socket type. Add OpenSSL binding to check if TLS session is reused. --- cryptography/hazmat/bindings/openssl/ssl.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/cryptography/hazmat/bindings/openssl/ssl.py b/cryptography/hazmat/bindings/openssl/ssl.py index ca3e96c8..7eff50d4 100644 --- a/cryptography/hazmat/bindings/openssl/ssl.py +++ b/cryptography/hazmat/bindings/openssl/ssl.py @@ -136,6 +136,7 @@ typedef struct { typedef struct { SSL3_STATE *s3; SSL_SESSION *session; + int type; /* SSL_ST_CONNECT or SSL_ST_ACCEPT */ ...; } SSL; @@ -219,6 +220,13 @@ void SSL_SESSION_free(SSL_SESSION *); const char *SSL_CIPHER_get_name(const SSL_CIPHER *); int SSL_CIPHER_get_bits(const SSL_CIPHER *, int *); char *SSL_CIPHER_get_version(const SSL_CIPHER *); + +/* Obtain latest Finished message + * -- that we sent (SSL_get_finished) + * -- that we expected from peer (SSL_get_peer_finished). + * Returns length (0 == no Finished so far), copies up to 'count' bytes. */ +size_t SSL_get_finished(const SSL *, void *, size_t); +size_t SSL_get_peer_finished(const SSL *, void *, size_t); """ MACROS = """ @@ -298,6 +306,8 @@ void SSL_set_tlsext_host_name(SSL *, char *); void SSL_CTX_set_tlsext_servername_callback( SSL_CTX *, int (*)(const SSL *, int *, void *)); + +int SSL_session_reused(SSL *); """ CUSTOMIZATIONS = """ -- cgit v1.2.3 From f374f4b335b081e5a0107c36368b22c3379551b9 Mon Sep 17 00:00:00 2001 From: Fedor Brunner Date: Tue, 25 Feb 2014 17:05:04 +0100 Subject: Remove comments --- cryptography/hazmat/bindings/openssl/ssl.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/cryptography/hazmat/bindings/openssl/ssl.py b/cryptography/hazmat/bindings/openssl/ssl.py index 7eff50d4..2c3710c2 100644 --- a/cryptography/hazmat/bindings/openssl/ssl.py +++ b/cryptography/hazmat/bindings/openssl/ssl.py @@ -136,7 +136,7 @@ typedef struct { typedef struct { SSL3_STATE *s3; SSL_SESSION *session; - int type; /* SSL_ST_CONNECT or SSL_ST_ACCEPT */ + int type; ...; } SSL; @@ -221,10 +221,6 @@ const char *SSL_CIPHER_get_name(const SSL_CIPHER *); int SSL_CIPHER_get_bits(const SSL_CIPHER *, int *); char *SSL_CIPHER_get_version(const SSL_CIPHER *); -/* Obtain latest Finished message - * -- that we sent (SSL_get_finished) - * -- that we expected from peer (SSL_get_peer_finished). - * Returns length (0 == no Finished so far), copies up to 'count' bytes. */ size_t SSL_get_finished(const SSL *, void *, size_t); size_t SSL_get_peer_finished(const SSL *, void *, size_t); """ -- cgit v1.2.3