diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-02-22 09:32:18 -0600 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-02-22 09:32:18 -0600 |
| commit | 017d0fd513f684a42262e72275142e561f5c5b89 (patch) | |
| tree | fd2993eb3db7fe6a877faf9019dc7afacf8095a8 | |
| parent | 33f0f0ca075dd2c64f067779fad5ecbf83caa98e (diff) | |
| parent | c663ff37d5e41dba2cb8ed93a8d37ff05cca3e4a (diff) | |
| download | cryptography-017d0fd513f684a42262e72275142e561f5c5b89.tar.gz cryptography-017d0fd513f684a42262e72275142e561f5c5b89.tar.bz2 cryptography-017d0fd513f684a42262e72275142e561f5c5b89.zip | |
Merge pull request #666 from public/pkcs8-bindings
PKCS8 bindings that let you specify the encryption
| -rw-r--r-- | cryptography/hazmat/bindings/openssl/pem.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cryptography/hazmat/bindings/openssl/pem.py b/cryptography/hazmat/bindings/openssl/pem.py index 8b717c2d..d623db26 100644 --- a/cryptography/hazmat/bindings/openssl/pem.py +++ b/cryptography/hazmat/bindings/openssl/pem.py @@ -31,9 +31,13 @@ EVP_PKEY *PEM_read_bio_PrivateKey(BIO *, EVP_PKEY **, pem_password_cb *, int PEM_write_bio_PKCS8PrivateKey(BIO *, EVP_PKEY *, const EVP_CIPHER *, char *, int, pem_password_cb *, void *); +int PEM_write_bio_PKCS8PrivateKey_nid(BIO *, EVP_PKEY *, int, + char *, int, pem_password_cb *, void *); int i2d_PKCS8PrivateKey_bio(BIO *, EVP_PKEY *, const EVP_CIPHER *, char *, int, pem_password_cb *, void *); +int i2d_PKCS8PrivateKey_nid_bio(BIO *, EVP_PKEY *, int, + char *, int, pem_password_cb *, void *); EVP_PKEY *d2i_PKCS8PrivateKey_bio(BIO *, EVP_PKEY **, pem_password_cb *, void *); |