diff options
author | Richard Plangger <planrich@users.noreply.github.com> | 2016-11-21 13:21:06 +0100 |
---|---|---|
committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-11-21 20:21:06 +0800 |
commit | ca4f79ede7483148ba6869ea7fdc514b4051633b (patch) | |
tree | f9bcf68e1068e36680221c61c0c09a0f667dedb6 /src | |
parent | ec7fc461510ce6fa7fe0846dd51907ae5c611a2f (diff) | |
download | cryptography-ca4f79ede7483148ba6869ea7fdc514b4051633b.tar.gz cryptography-ca4f79ede7483148ba6869ea7fdc514b4051633b.tar.bz2 cryptography-ca4f79ede7483148ba6869ea7fdc514b4051633b.zip |
PyPy's ssl module, the last missing macro and three macro functions (#3270)
* missing macro and three macro functions
* removed space before function name (style issue)
* remove macro which always will not be set by cryptography
Diffstat (limited to 'src')
-rw-r--r-- | src/_cffi_src/openssl/x509_vfy.py | 3 | ||||
-rw-r--r-- | src/_cffi_src/openssl/x509v3.py | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/_cffi_src/openssl/x509_vfy.py b/src/_cffi_src/openssl/x509_vfy.py index cf2d7d7d..8bd6e41c 100644 --- a/src/_cffi_src/openssl/x509_vfy.py +++ b/src/_cffi_src/openssl/x509_vfy.py @@ -200,6 +200,9 @@ int X509_VERIFY_PARAM_set1_ip(X509_VERIFY_PARAM *, const unsigned char *, size_t); int X509_VERIFY_PARAM_set1_ip_asc(X509_VERIFY_PARAM *, const char *); +int sk_X509_OBJECT_num(Cryptography_STACK_OF_X509_OBJECT *); +X509_OBJECT *sk_X509_OBJECT_value(Cryptography_STACK_OF_X509_OBJECT *, int); +X509_VERIFY_PARAM *X509_STORE_get0_param(X509_STORE *); Cryptography_STACK_OF_X509_OBJECT *X509_STORE_get0_objects(X509_STORE *); X509 *X509_OBJECT_get0_X509(X509_OBJECT *); int X509_OBJECT_get_type(const X509_OBJECT *); diff --git a/src/_cffi_src/openssl/x509v3.py b/src/_cffi_src/openssl/x509v3.py index ba6fc91a..38099a9a 100644 --- a/src/_cffi_src/openssl/x509v3.py +++ b/src/_cffi_src/openssl/x509v3.py @@ -171,7 +171,7 @@ typedef struct { Cryptography_STACK_OF_POLICYQUALINFO *qualifiers; } POLICYINFO; -typedef void (*sk_GENERAL_NAME_freefunc)(struct GENERAL_NAME_st *); +typedef void (*sk_GENERAL_NAME_freefunc)(GENERAL_NAME *); """ |