diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-05-19 14:18:16 -0700 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-05-19 14:18:16 -0700 |
| commit | c5db584e727c180b7d426bd13675a8e0d0980dd3 (patch) | |
| tree | df7d31c4f7d5b9a4f3501879584c1a9406bb9f1f | |
| parent | 8b8df2337049abfcfc3991be8331e31b6d116d84 (diff) | |
| parent | 006d8799d4bb05dcc58b3b3d9d0f8520df266028 (diff) | |
| download | cryptography-c5db584e727c180b7d426bd13675a8e0d0980dd3.tar.gz cryptography-c5db584e727c180b7d426bd13675a8e0d0980dd3.tar.bz2 cryptography-c5db584e727c180b7d426bd13675a8e0d0980dd3.zip | |
Merge pull request #1983 from glyph/correct-structs
put the 'version' field into the 'SSL' struct where it belongs; make SSL_CTX opaque.
| -rw-r--r-- | src/cryptography/hazmat/bindings/openssl/ssl.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/cryptography/hazmat/bindings/openssl/ssl.py b/src/cryptography/hazmat/bindings/openssl/ssl.py index 5445f3c9..3754773b 100644 --- a/src/cryptography/hazmat/bindings/openssl/ssl.py +++ b/src/cryptography/hazmat/bindings/openssl/ssl.py @@ -124,12 +124,9 @@ static const long SSL_MODE_ENABLE_PARTIAL_WRITE; static const long SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER; static const long SSL_MODE_AUTO_RETRY; static const long SSL3_RANDOM_SIZE; + typedef ... SSL_METHOD; -typedef struct ssl_st { - int version; - int type; - ...; -} SSL_CTX; +typedef ... SSL_CTX; typedef struct { int master_key_length; @@ -144,9 +141,10 @@ typedef struct { } SSL3_STATE; typedef struct { + int version; + int type; SSL3_STATE *s3; SSL_SESSION *session; - int type; ...; } SSL; |