aboutsummaryrefslogtreecommitdiffstats
path: root/src/_cffi_src/openssl
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2016-11-20 02:27:45 +0800
committerAlex Gaynor <alex.gaynor@gmail.com>2016-11-19 13:27:45 -0500
commitae2fb63f6fed904c562d2add072c129b54006ab2 (patch)
tree25fafdd278139de041000d22f227a71373d2ccf5 /src/_cffi_src/openssl
parent9d736352567fce6c83d6e7be47700028ebf0994b (diff)
downloadcryptography-ae2fb63f6fed904c562d2add072c129b54006ab2.tar.gz
cryptography-ae2fb63f6fed904c562d2add072c129b54006ab2.tar.bz2
cryptography-ae2fb63f6fed904c562d2add072c129b54006ab2.zip
bind a few things pypy ssl stdlib needs in x509v3 (#3255)
Diffstat (limited to 'src/_cffi_src/openssl')
-rw-r--r--src/_cffi_src/openssl/x509v3.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/_cffi_src/openssl/x509v3.py b/src/_cffi_src/openssl/x509v3.py
index f8d5374d..ba6fc91a 100644
--- a/src/_cffi_src/openssl/x509v3.py
+++ b/src/_cffi_src/openssl/x509v3.py
@@ -170,6 +170,8 @@ typedef struct {
ASN1_OBJECT *policyid;
Cryptography_STACK_OF_POLICYQUALINFO *qualifiers;
} POLICYINFO;
+
+typedef void (*sk_GENERAL_NAME_freefunc)(struct GENERAL_NAME_st *);
"""
@@ -180,9 +182,12 @@ int GENERAL_NAME_print(BIO *, GENERAL_NAME *);
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 @@ GENERAL_NAMES *d2i_GENERAL_NAMES(GENERAL_NAMES **, const unsigned char **,
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 *);