diff options
| author | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2016-04-08 23:19:22 +0200 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-04-08 17:19:22 -0400 |
| commit | 97511e5b8d8169096b48ff73ecce7d973129cf87 (patch) | |
| tree | d1d585a57f2b96ab6b98007d0e6b41d30b8e3e60 /src/_cffi_src/openssl/pem.py | |
| parent | d824f6005a8520e3b98fb349a899c33f300b7a08 (diff) | |
| download | cryptography-97511e5b8d8169096b48ff73ecce7d973129cf87.tar.gz cryptography-97511e5b8d8169096b48ff73ecce7d973129cf87.tar.bz2 cryptography-97511e5b8d8169096b48ff73ecce7d973129cf87.zip | |
Add more bindings to OpenSSL, to be used by the Python _ssl module. (#2868)
* Add more bindings to OpenSSL, all are used by the Python _ssl module.
* Add a conditional: SSL_CTX_clear_options() does not exist before 0.9.8m
* 80 cols
* Condionally define the TLSEXT error codes.
* Address review comments
* Remove all parameter names
Diffstat (limited to 'src/_cffi_src/openssl/pem.py')
| -rw-r--r-- | src/_cffi_src/openssl/pem.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/_cffi_src/openssl/pem.py b/src/_cffi_src/openssl/pem.py index 4eb6bb45..99881dd7 100644 --- a/src/_cffi_src/openssl/pem.py +++ b/src/_cffi_src/openssl/pem.py @@ -46,6 +46,8 @@ X509_CRL *PEM_read_bio_X509_CRL(BIO *, X509_CRL **, pem_password_cb *, void *); int PEM_write_bio_X509_CRL(BIO *, X509_CRL *); +X509 *PEM_read_bio_X509_AUX(BIO *, X509 **, pem_password_cb *, void *); + PKCS7 *PEM_read_bio_PKCS7(BIO *, PKCS7 **, pem_password_cb *, void *); int PEM_write_bio_PKCS7(BIO *, PKCS7 *); |