aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-02-25 08:30:30 -0800
committerAlex Gaynor <alex.gaynor@gmail.com>2014-02-25 08:30:30 -0800
commit57a56b2c8b90fd7a939561c26c586b4a006a7d1c (patch)
tree59f15c00454a6951d965af4b3dd9de6ca6d567c8
parenteaf9a80399dabb05304b315181e48de48c66008a (diff)
parentf374f4b335b081e5a0107c36368b22c3379551b9 (diff)
downloadcryptography-57a56b2c8b90fd7a939561c26c586b4a006a7d1c.tar.gz
cryptography-57a56b2c8b90fd7a939561c26c586b4a006a7d1c.tar.bz2
cryptography-57a56b2c8b90fd7a939561c26c586b4a006a7d1c.zip
Merge pull request #686 from fedor-brunner/channel_binding
Add OpenSSL bindings for TLS Finished message.
-rw-r--r--cryptography/hazmat/bindings/openssl/ssl.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/cryptography/hazmat/bindings/openssl/ssl.py b/cryptography/hazmat/bindings/openssl/ssl.py
index ca3e96c8..2c3710c2 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;
@@ -219,6 +220,9 @@ 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 *);
+
+size_t SSL_get_finished(const SSL *, void *, size_t);
+size_t SSL_get_peer_finished(const SSL *, void *, size_t);
"""
MACROS = """
@@ -298,6 +302,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 = """