diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-12-06 16:40:28 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-12-06 16:40:28 -0800 |
| commit | 2cbb78302c42bff04d9f78cd962c1a425cfb11d0 (patch) | |
| tree | ef28475247fef9b128d9200dd9adc9d33402d1e7 /src | |
| parent | fb613d10fbe0e9672b5d7b7e5ddb3f97f65f4715 (diff) | |
| parent | 82cce84c4b956b551593e902e9509a55d511b454 (diff) | |
| download | cryptography-2cbb78302c42bff04d9f78cd962c1a425cfb11d0.tar.gz cryptography-2cbb78302c42bff04d9f78cd962c1a425cfb11d0.tar.bz2 cryptography-2cbb78302c42bff04d9f78cd962c1a425cfb11d0.zip | |
Merge pull request #1511 from delroth/master
OpenSSL binding: add support for NETSCAPE_SPKI_b64_decode
Diffstat (limited to 'src')
| -rw-r--r-- | src/cryptography/hazmat/bindings/openssl/x509.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/cryptography/hazmat/bindings/openssl/x509.py b/src/cryptography/hazmat/bindings/openssl/x509.py index c2b84071..a6e1cb63 100644 --- a/src/cryptography/hazmat/bindings/openssl/x509.py +++ b/src/cryptography/hazmat/bindings/openssl/x509.py @@ -173,6 +173,7 @@ int X509_CRL_sign(X509_CRL *, EVP_PKEY *, const EVP_MD *); int NETSCAPE_SPKI_verify(NETSCAPE_SPKI *, EVP_PKEY *); int NETSCAPE_SPKI_sign(NETSCAPE_SPKI *, EVP_PKEY *, const EVP_MD *); char *NETSCAPE_SPKI_b64_encode(NETSCAPE_SPKI *); +NETSCAPE_SPKI *NETSCAPE_SPKI_b64_decode(const char *, int); EVP_PKEY *NETSCAPE_SPKI_get_pubkey(NETSCAPE_SPKI *); int NETSCAPE_SPKI_set_pubkey(NETSCAPE_SPKI *, EVP_PKEY *); NETSCAPE_SPKI *NETSCAPE_SPKI_new(void); |