aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Stapleton <alexs@prol.etari.at>2014-02-22 10:16:38 +0000
committerAlex Stapleton <alexs@prol.etari.at>2014-02-22 10:16:38 +0000
commitc663ff37d5e41dba2cb8ed93a8d37ff05cca3e4a (patch)
treefd2993eb3db7fe6a877faf9019dc7afacf8095a8
parent5eed941af250567c3deed07dde4f1d741b1d2cd5 (diff)
downloadcryptography-c663ff37d5e41dba2cb8ed93a8d37ff05cca3e4a.tar.gz
cryptography-c663ff37d5e41dba2cb8ed93a8d37ff05cca3e4a.tar.bz2
cryptography-c663ff37d5e41dba2cb8ed93a8d37ff05cca3e4a.zip
PKCS8 bindings that let you specify the encryption
-rw-r--r--cryptography/hazmat/bindings/openssl/pem.py4
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 *);