diff options
author | David Reid <dreid@dreid.org> | 2013-11-18 13:36:04 -0800 |
---|---|---|
committer | David Reid <dreid@dreid.org> | 2013-11-18 13:36:04 -0800 |
commit | fb0ed19589072e030da7e4a573cbf0a9de06d999 (patch) | |
tree | 4cbe0f713e9da3d07f274cd290af916fd0eece2a | |
parent | 3daa8b45151be755a29f708832c49e901c6e9fdc (diff) | |
parent | 984eeeb388e79db6354efd884e0f5d8b7b069560 (diff) | |
download | cryptography-fb0ed19589072e030da7e4a573cbf0a9de06d999.tar.gz cryptography-fb0ed19589072e030da7e4a573cbf0a9de06d999.tar.bz2 cryptography-fb0ed19589072e030da7e4a573cbf0a9de06d999.zip |
Merge branch 'master' into backend-interfaces
-rw-r--r-- | cryptography/hazmat/bindings/openssl/evp.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cryptography/hazmat/bindings/openssl/evp.py b/cryptography/hazmat/bindings/openssl/evp.py index da54f89d..8cb44610 100644 --- a/cryptography/hazmat/bindings/openssl/evp.py +++ b/cryptography/hazmat/bindings/openssl/evp.py @@ -16,10 +16,13 @@ INCLUDES = """ """ TYPES = """ +typedef ... EVP_CIPHER; typedef struct { + const EVP_CIPHER *cipher; + ENGINE *engine; + int encrypt; ...; } EVP_CIPHER_CTX; -typedef ... EVP_CIPHER; typedef ... EVP_MD; typedef struct env_md_ctx_st EVP_MD_CTX; |