diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-04-24 18:35:31 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-04-24 18:35:31 -0700 |
| commit | dd75a3fd330036a0fc8cfbd65b0f4bc2d9707597 (patch) | |
| tree | 837b49dec8aa841ae80a5990f2045cdd0426d5dc | |
| parent | cfa077fe0ce0e60c1285c923dad564fef55c2274 (diff) | |
| parent | a179ff84891550e4186cd421e1f0e11a7f818414 (diff) | |
| download | cryptography-dd75a3fd330036a0fc8cfbd65b0f4bc2d9707597.tar.gz cryptography-dd75a3fd330036a0fc8cfbd65b0f4bc2d9707597.tar.bz2 cryptography-dd75a3fd330036a0fc8cfbd65b0f4bc2d9707597.zip | |
Merge pull request #966 from reaperhulk/more-i2d-bindings
More d2i/i2d bindings
| -rw-r--r-- | cryptography/hazmat/bindings/openssl/x509.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/cryptography/hazmat/bindings/openssl/x509.py b/cryptography/hazmat/bindings/openssl/x509.py index 92870369..36a15e4a 100644 --- a/cryptography/hazmat/bindings/openssl/x509.py +++ b/cryptography/hazmat/bindings/openssl/x509.py @@ -183,8 +183,13 @@ const char *X509_get_default_private_dir(void); int i2d_RSA_PUBKEY(RSA *, unsigned char **); RSA *d2i_RSA_PUBKEY(RSA **, const unsigned char **, long); +RSA *d2i_RSAPublicKey(RSA **, const unsigned char **, long); +RSA *d2i_RSAPrivateKey(RSA **, const unsigned char **, long); int i2d_DSA_PUBKEY(DSA *, unsigned char **); DSA *d2i_DSA_PUBKEY(DSA **, const unsigned char **, long); +DSA *d2i_DSAPublicKey(DSA **, const unsigned char **, long); +DSA *d2i_DSAPrivateKey(DSA **, const unsigned char **, long); + RSA *d2i_RSAPrivateKey_bio(BIO *, RSA **); int i2d_RSAPrivateKey_bio(BIO *, RSA *); @@ -223,6 +228,11 @@ void sk_X509_EXTENSION_free(X509_EXTENSIONS *); int sk_X509_REVOKED_num(Cryptography_STACK_OF_X509_REVOKED *); X509_REVOKED *sk_X509_REVOKED_value(Cryptography_STACK_OF_X509_REVOKED *, int); +int i2d_RSAPublicKey(RSA *, unsigned char **); +int i2d_RSAPrivateKey(RSA *, unsigned char **); +int i2d_DSAPublicKey(DSA *, unsigned char **); +int i2d_DSAPrivateKey(DSA *, unsigned char **); + /* These aren't macros these arguments are all const X on openssl > 1.0.x */ int X509_CRL_set_lastUpdate(X509_CRL *, ASN1_TIME *); int X509_CRL_set_nextUpdate(X509_CRL *, ASN1_TIME *); |