From ca4f79ede7483148ba6869ea7fdc514b4051633b Mon Sep 17 00:00:00 2001 From: Richard Plangger Date: Mon, 21 Nov 2016 13:21:06 +0100 Subject: 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 --- src/_cffi_src/openssl/x509_vfy.py | 3 +++ src/_cffi_src/openssl/x509v3.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) 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 *); """ -- cgit v1.2.3