diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-06-19 23:30:17 -0400 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-06-19 22:30:17 -0500 |
| commit | b927426213ff6f528e5e3c877bbcdc28fa51f9fe (patch) | |
| tree | d0ff4997943e9e3cc0f934b2b54cca8f68083979 /src/_cffi_src/openssl/x509.py | |
| parent | 41b4bce14260325348191044571c9808a77229aa (diff) | |
| download | cryptography-b927426213ff6f528e5e3c877bbcdc28fa51f9fe.tar.gz cryptography-b927426213ff6f528e5e3c877bbcdc28fa51f9fe.tar.bz2 cryptography-b927426213ff6f528e5e3c877bbcdc28fa51f9fe.zip | |
Remove some 0.9.8 code in x509 extension land (#2999)
Diffstat (limited to 'src/_cffi_src/openssl/x509.py')
| -rw-r--r-- | src/_cffi_src/openssl/x509.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/_cffi_src/openssl/x509.py b/src/_cffi_src/openssl/x509.py index 5b4d79d6..99b565a8 100644 --- a/src/_cffi_src/openssl/x509.py +++ b/src/_cffi_src/openssl/x509.py @@ -175,6 +175,8 @@ int X509_REQ_digest(const X509_REQ *, const EVP_MD *, EVP_PKEY *X509_REQ_get_pubkey(X509_REQ *); int X509_REQ_print(BIO *, X509_REQ *); int X509_REQ_print_ex(BIO *, X509_REQ *, unsigned long, unsigned long); +int X509_REQ_add_extensions(X509_REQ *, X509_EXTENSIONS *); +X509_EXTENSIONS *X509_REQ_get_extensions(X509_REQ *); int X509V3_EXT_print(BIO *, X509_EXTENSION *, unsigned long, int); ASN1_OCTET_STRING *X509_EXTENSION_get_data(X509_EXTENSION *); @@ -333,11 +335,6 @@ int X509_CRL_set_nextUpdate(X509_CRL *, ASN1_TIME *); int X509_set_notBefore(X509 *, ASN1_TIME *); int X509_set_notAfter(X509 *, 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 *); - int i2d_EC_PUBKEY(EC_KEY *, unsigned char **); EC_KEY *d2i_EC_PUBKEY(EC_KEY **, const unsigned char **, long); EC_KEY *d2i_EC_PUBKEY_bio(BIO *, EC_KEY **); |