aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-05-26 19:54:56 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2015-05-26 19:54:56 -0400
commit9b4c3132ac38beca887786b5528b05a2186a5bfe (patch)
tree892caccc15401b495533aa1c6e516729436ef381
parent7e6172104ee755fa92f202a7fd47bca8d38f01da (diff)
downloadcryptography-9b4c3132ac38beca887786b5528b05a2186a5bfe.tar.gz
cryptography-9b4c3132ac38beca887786b5528b05a2186a5bfe.tar.bz2
cryptography-9b4c3132ac38beca887786b5528b05a2186a5bfe.zip
Fixed #1969 -- added bindings for some more OpenSSL functions
-rw-r--r--src/cryptography/hazmat/bindings/openssl/x509.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/cryptography/hazmat/bindings/openssl/x509.py b/src/cryptography/hazmat/bindings/openssl/x509.py
index caa33969..262163e4 100644
--- a/src/cryptography/hazmat/bindings/openssl/x509.py
+++ b/src/cryptography/hazmat/bindings/openssl/x509.py
@@ -310,9 +310,14 @@ int i2d_EC_PUBKEY(EC_KEY *, unsigned char **);
EC_KEY *d2i_EC_PUBKEY(EC_KEY **, const unsigned char **, long);
EC_KEY *d2i_EC_PUBKEY_bio(BIO *, EC_KEY **);
int i2d_EC_PUBKEY_bio(BIO *, EC_KEY *);
+EC_KEY *d2i_ECPrivateKey(EC_KEY **, const unsigned char **, long);
EC_KEY *d2i_ECPrivateKey_bio(BIO *, EC_KEY **);
+int i2d_ECPrivateKey(EC_KEY *, unsigned char **);
int i2d_ECPrivateKey_bio(BIO *, EC_KEY *);
+EC_KEY *d2o_ECPrivateKey(EC_KEY **, const unsigned char **, long);
+int i2o_ECPrivateKey(EC_KEY *, unsigned char **);
+
// declared in safestack
int sk_ASN1_OBJECT_num(Cryptography_STACK_OF_ASN1_OBJECT *);
ASN1_OBJECT *sk_ASN1_OBJECT_value(Cryptography_STACK_OF_ASN1_OBJECT *, int);
@@ -340,7 +345,11 @@ CONDITIONAL_NAMES = {
"d2i_EC_PUBKEY",
"d2i_EC_PUBKEY_bio",
"i2d_EC_PUBKEY_bio",
+ "d2i_ECPrivateKey",
"d2i_ECPrivateKey_bio",
+ "i2d_ECPrivateKey",
"i2d_ECPrivateKey_bio",
+ "i2o_ECPublicKey"
+ "o2i_ECPublicKey",
]
}