diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2015-07-12 09:19:12 -0500 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2015-07-12 09:19:12 -0500 |
| commit | 534846178021b1a2993730409e8a3937b589ea12 (patch) | |
| tree | 4cd7e7d1cc7def31f47d24619d1dc24a343c9f2d /src/_cffi_src | |
| parent | 91a27a484a88063679e8b21a99b2714dddfd6c12 (diff) | |
| parent | 7863d7535f2ce6fd5c41c9b0c360738abc954e78 (diff) | |
| download | cryptography-534846178021b1a2993730409e8a3937b589ea12.tar.gz cryptography-534846178021b1a2993730409e8a3937b589ea12.tar.bz2 cryptography-534846178021b1a2993730409e8a3937b589ea12.zip | |
Merge pull request #2136 from reaperhulk/encode-othername
Encode othername
Diffstat (limited to 'src/_cffi_src')
| -rw-r--r-- | src/_cffi_src/openssl/asn1.py | 1 | ||||
| -rw-r--r-- | src/_cffi_src/openssl/x509v3.py | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/_cffi_src/openssl/asn1.py b/src/_cffi_src/openssl/asn1.py index 01d6f4c2..5f8ca697 100644 --- a/src/_cffi_src/openssl/asn1.py +++ b/src/_cffi_src/openssl/asn1.py @@ -157,6 +157,7 @@ int ASN1_UTCTIME_check(ASN1_UTCTIME *); int ASN1_STRING_set_default_mask_asc(char *); int i2d_ASN1_TYPE(ASN1_TYPE *, unsigned char **); +ASN1_TYPE *d2i_ASN1_TYPE(ASN1_TYPE **, const unsigned char **, long); """ CUSTOMIZATIONS = """ diff --git a/src/_cffi_src/openssl/x509v3.py b/src/_cffi_src/openssl/x509v3.py index 0f5306d0..8e42b65d 100644 --- a/src/_cffi_src/openssl/x509v3.py +++ b/src/_cffi_src/openssl/x509v3.py @@ -193,6 +193,9 @@ void AUTHORITY_KEYID_free(AUTHORITY_KEYID *); NAME_CONSTRAINTS *NAME_CONSTRAINTS_new(void); void NAME_CONSTRAINTS_free(NAME_CONSTRAINTS *); +OTHERNAME *OTHERNAME_new(void); +void OTHERNAME_free(OTHERNAME *); + void *X509V3_set_ctx_nodb(X509V3_CTX *); int i2d_GENERAL_NAMES(GENERAL_NAMES *, unsigned char **); |