diff options
| author | cyli <cyli@twistedmatrix.com> | 2013-10-19 12:37:52 -0700 |
|---|---|---|
| committer | cyli <cyli@twistedmatrix.com> | 2013-10-19 12:37:52 -0700 |
| commit | afc9c3278885827c1b6a39678e7e87d25edd968d (patch) | |
| tree | da3ab357c5c35332e5271dcb4a58e23419bc0e9a | |
| parent | 37e305696b9bfa7c42c17c629727c3e17ae7e11a (diff) | |
| download | cryptography-afc9c3278885827c1b6a39678e7e87d25edd968d.tar.gz cryptography-afc9c3278885827c1b6a39678e7e87d25edd968d.tar.bz2 cryptography-afc9c3278885827c1b6a39678e7e87d25edd968d.zip | |
Add some functions to the macros section since they changed from non-const to const between openssl versions
| -rw-r--r-- | cryptography/bindings/openssl/x509v3.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cryptography/bindings/openssl/x509v3.py b/cryptography/bindings/openssl/x509v3.py index 18226050..413bde5f 100644 --- a/cryptography/bindings/openssl/x509v3.py +++ b/cryptography/bindings/openssl/x509v3.py @@ -79,8 +79,6 @@ typedef struct stack_st_GENERAL_NAME GENERAL_NAMES; FUNCTIONS = """ void X509V3_set_ctx(X509V3_CTX *, X509 *, X509 *, X509_REQ *, X509_CRL *, int); X509_EXTENSION *X509V3_EXT_nconf(CONF *, X509V3_CTX *, char *, char *); -const X509V3_EXT_METHOD *X509V3_EXT_get(X509_EXTENSION *); -const X509V3_EXT_METHOD *X509V3_EXT_get_nid(int); int GENERAL_NAME_print(BIO *, GENERAL_NAME *); """ @@ -89,4 +87,8 @@ void *X509V3_set_ctx_nodb(X509V3_CTX *); 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); + +/* These aren't macros these functions are all const X on openssl > 1.0.x */ +const X509V3_EXT_METHOD *X509V3_EXT_get(X509_EXTENSION *); +const X509V3_EXT_METHOD *X509V3_EXT_get_nid(int); """ |