diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-03-07 14:07:57 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-03-07 14:07:57 -0800 |
| commit | 128e331f55dd4fee9111af50ee5a41be39557556 (patch) | |
| tree | c00c5dad4a1b8b08c1f143650d06260c2bb2b2ac | |
| parent | 667182f1421825b889b0cd0402f8538e7e00ba4d (diff) | |
| parent | 1a576e45eed3c03c6cf905ec22c3ac94a6c1080b (diff) | |
| download | cryptography-128e331f55dd4fee9111af50ee5a41be39557556.tar.gz cryptography-128e331f55dd4fee9111af50ee5a41be39557556.tar.bz2 cryptography-128e331f55dd4fee9111af50ee5a41be39557556.zip | |
Merge pull request #758 from reaperhulk/x509-098e
x509 changes for 0.9.8e support
| -rw-r--r-- | cryptography/hazmat/bindings/openssl/x509.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/cryptography/hazmat/bindings/openssl/x509.py b/cryptography/hazmat/bindings/openssl/x509.py index 95c88b3a..e8b036c3 100644 --- a/cryptography/hazmat/bindings/openssl/x509.py +++ b/cryptography/hazmat/bindings/openssl/x509.py @@ -120,8 +120,6 @@ int X509_REQ_set_pubkey(X509_REQ *, EVP_PKEY *); int X509_REQ_sign(X509_REQ *, EVP_PKEY *, const EVP_MD *); int X509_REQ_verify(X509_REQ *, EVP_PKEY *); EVP_PKEY *X509_REQ_get_pubkey(X509_REQ *); -int X509_REQ_add_extensions(X509_REQ *, X509_EXTENSIONS *); -X509_EXTENSIONS *X509_REQ_get_extensions(X509_REQ *); int X509_REQ_print_ex(BIO *, X509_REQ *, unsigned long, unsigned long); int X509V3_EXT_print(BIO *, X509_EXTENSION *, unsigned long, int); @@ -208,9 +206,18 @@ X509_REVOKED *sk_X509_REVOKED_value(Cryptography_STACK_OF_X509_REVOKED *, int); /* These aren't macros these arguments are all const X on openssl > 1.0.x */ int X509_CRL_set_lastUpdate(X509_CRL *, ASN1_TIME *); int X509_CRL_set_nextUpdate(X509_CRL *, ASN1_TIME *); + +/* these use STACK_OF(X509_EXTENSION) in 0.9.8e. Once we drop support for + RHEL/CentOS 5 we should move these back to FUNCTIONS. */ +int X509_REQ_add_extensions(X509_REQ *, X509_EXTENSIONS *); +X509_EXTENSIONS *X509_REQ_get_extensions(X509_REQ *); """ CUSTOMIZATIONS = """ +// OpenSSL 0.9.8e does not have this definition +#if OPENSSL_VERSION_NUMBER <= 0x0090805fL +typedef STACK_OF(X509_EXTENSION) X509_EXTENSIONS; +#endif """ CONDITIONAL_NAMES = {} |