aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2014-01-29 09:40:12 -0800
committerPaul Kehrer <paul.l.kehrer@gmail.com>2014-01-29 09:40:12 -0800
commitcfde5ab2857074b9a13f746ba882bd57d7c46a84 (patch)
tree7b08496bb4a9334d1fb35328a8d62bb3a0d53d1c
parent4f78ee7c368603507a2c2cf7ac4e474df3834f58 (diff)
parentab09605c72eaa73cb8672a822a3a3112a59f12b3 (diff)
downloadcryptography-cfde5ab2857074b9a13f746ba882bd57d7c46a84.tar.gz
cryptography-cfde5ab2857074b9a13f746ba882bd57d7c46a84.tar.bz2
cryptography-cfde5ab2857074b9a13f746ba882bd57d7c46a84.zip
Merge pull request #524 from sholsapp/master
Add bindings for X509_REQ_get_extensions.
-rw-r--r--AUTHORS.rst1
-rw-r--r--cryptography/hazmat/bindings/openssl/x509.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/AUTHORS.rst b/AUTHORS.rst
index b9dc459f..0e3979ad 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -13,3 +13,4 @@ PGP key fingerprints are enclosed in parentheses.
* Alex Stapleton <alexs@prol.etari.at> (A1C7 E50B 66DE 39ED C847 9665 8E3C 20D1 9BD9 5C4C)
* David Reid <dreid@dreid.org> (0F83 CC87 B32F 482B C726 B58A 9FBF D8F4 DA89 6D74)
* Konstantinos Koukopoulos <koukopoulos@gmail.com> (D6BD 52B6 8C99 A91C E2C8 934D 3300 566B 3A46 726E)
+* Stephen Holsapple <sholsapp@gmail.com>
diff --git a/cryptography/hazmat/bindings/openssl/x509.py b/cryptography/hazmat/bindings/openssl/x509.py
index 840254a2..d492ea01 100644
--- a/cryptography/hazmat/bindings/openssl/x509.py
+++ b/cryptography/hazmat/bindings/openssl/x509.py
@@ -119,6 +119,7 @@ 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);