diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2015-01-05 11:59:53 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2015-01-05 11:59:53 -0800 |
| commit | b1893e8d1b3cbbfa7796bb1813b140bca98762e9 (patch) | |
| tree | 11276502e8fd965920140f8d605ba43de1c7e7e9 | |
| parent | fc89b5512782ce3beee64c039512991bba7e1e1c (diff) | |
| parent | 4e9d01d40546b2f93940d14e38ddbb515fab458d (diff) | |
| download | cryptography-b1893e8d1b3cbbfa7796bb1813b140bca98762e9.tar.gz cryptography-b1893e8d1b3cbbfa7796bb1813b140bca98762e9.tar.bz2 cryptography-b1893e8d1b3cbbfa7796bb1813b140bca98762e9.zip | |
Merge pull request #1611 from reaperhulk/new-pkcs8-bindings
add some new bindings for using the PKCS8_PRIV_KEY_INFO struct
| -rw-r--r-- | src/cryptography/hazmat/bindings/openssl/evp.py | 2 | ||||
| -rw-r--r-- | src/cryptography/hazmat/bindings/openssl/x509.py | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/cryptography/hazmat/bindings/openssl/evp.py b/src/cryptography/hazmat/bindings/openssl/evp.py index f00c2f0d..780ce900 100644 --- a/src/cryptography/hazmat/bindings/openssl/evp.py +++ b/src/cryptography/hazmat/bindings/openssl/evp.py @@ -119,6 +119,8 @@ int EVP_PKEY_add1_attr_by_txt(EVP_PKEY *, const char *, int, const unsigned char *, int); int EVP_PKEY_cmp(const EVP_PKEY *, const EVP_PKEY *); + +EVP_PKEY *EVP_PKCS82PKEY(PKCS8_PRIV_KEY_INFO *); """ MACROS = """ diff --git a/src/cryptography/hazmat/bindings/openssl/x509.py b/src/cryptography/hazmat/bindings/openssl/x509.py index f51b0e59..e30d23b7 100644 --- a/src/cryptography/hazmat/bindings/openssl/x509.py +++ b/src/cryptography/hazmat/bindings/openssl/x509.py @@ -71,6 +71,8 @@ typedef struct { typedef ... NETSCAPE_SPKI; +typedef ... PKCS8_PRIV_KEY_INFO; + static const int X509_FLAG_COMPAT; static const int X509_FLAG_NO_HEADER; static const int X509_FLAG_NO_VERSION; @@ -224,6 +226,9 @@ DSA *d2i_DSA_PUBKEY_bio(BIO *, DSA **); int i2d_DSA_PUBKEY_bio(BIO *, DSA *); DSA *d2i_DSAPrivateKey_bio(BIO *, DSA **); int i2d_DSAPrivateKey_bio(BIO *, DSA *); + +PKCS8_PRIV_KEY_INFO *d2i_PKCS8_PRIV_KEY_INFO_bio(BIO *, + PKCS8_PRIV_KEY_INFO **); """ MACROS = """ |