commit ae2fb63f6fed904c562d2add072c129b54006ab2
author Paul Kehrer <paul.l.kehrer@gmail.com> Sun Nov 20 02:27:45 2016 +0800
committer Alex Gaynor <alex.gaynor@gmail.com> Sat Nov 19 13:27:45 2016 -0500
tree 25fafdd278139de041000d22f227a71373d2ccf5
parent 9d736352567fce6c83d6e7be47700028ebf0994b

bind a few things pypy ssl stdlib needs in x509v3 (#3255)

src/_cffi_src/openssl/x509v3.py

diff --git a/src/_cffi_src/openssl/x509v3.py b/src/_cffi_src/openssl/x509v3.py
index f8d5374..ba6fc91 100644
--- a/src/_cffi_src/openssl/x509v3.py
+++ b/src/_cffi_src/openssl/x509v3.py
@@ -170,6 +170,8 @@
     ASN1_OBJECT *policyid;
     Cryptography_STACK_OF_POLICYQUALINFO *qualifiers;
 } POLICYINFO;
+
+typedef void (*sk_GENERAL_NAME_freefunc)(struct GENERAL_NAME_st *);
 """
 
 
@@ -180,9 +182,12 @@
 GENERAL_NAMES *GENERAL_NAMES_new(void);
 void GENERAL_NAMES_free(GENERAL_NAMES *);
 void *X509V3_EXT_d2i(X509_EXTENSION *);
+int X509_check_ca(X509 *);
 """
 
 MACROS = """
+/* X509 became a const arg in 1.1.0 */
+void *X509_get_ext_d2i(X509 *, int, int *, int *);
 /* The last two char * args became const char * in 1.1.0 */
 X509_EXTENSION *X509V3_EXT_nconf(CONF *, X509V3_CTX *, char *, char *);
 /* This is a macro defined by a call to DECLARE_ASN1_FUNCTIONS in the
@@ -212,6 +217,8 @@
 int sk_GENERAL_NAME_num(struct stack_st_GENERAL_NAME *);
 int sk_GENERAL_NAME_push(struct stack_st_GENERAL_NAME *, GENERAL_NAME *);
 GENERAL_NAME *sk_GENERAL_NAME_value(struct stack_st_GENERAL_NAME *, int);
+void sk_GENERAL_NAME_pop_free(struct stack_st_GENERAL_NAME *,
+                              sk_GENERAL_NAME_freefunc);
 
 Cryptography_STACK_OF_ACCESS_DESCRIPTION *sk_ACCESS_DESCRIPTION_new_null(void);
 int sk_ACCESS_DESCRIPTION_num(Cryptography_STACK_OF_ACCESS_DESCRIPTION *);