diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2015-08-05 08:49:45 -0400 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2015-08-05 08:49:45 -0400 |
| commit | bfc5ce1e685a1ad02f648830b69cb7fa1e6933b3 (patch) | |
| tree | e883bb802aec3d6ad6c9292f6ece4bd495963ef1 | |
| parent | 2fe409eb008acdfe598386f7f17a502a535e5864 (diff) | |
| parent | 152757ce4fec249d5cd9cc4dc3f809e4a48c4c3f (diff) | |
| download | cryptography-bfc5ce1e685a1ad02f648830b69cb7fa1e6933b3.tar.gz cryptography-bfc5ce1e685a1ad02f648830b69cb7fa1e6933b3.tar.bz2 cryptography-bfc5ce1e685a1ad02f648830b69cb7fa1e6933b3.zip | |
Merge pull request #2205 from reaperhulk/more-cdp-bindings
more bindings for CRLDistributionPoints encoding
| -rw-r--r-- | src/_cffi_src/openssl/x509name.py | 10 | ||||
| -rw-r--r-- | src/_cffi_src/openssl/x509v3.py | 3 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/_cffi_src/openssl/x509name.py b/src/_cffi_src/openssl/x509name.py index 2d87db4c..7b833d61 100644 --- a/src/_cffi_src/openssl/x509name.py +++ b/src/_cffi_src/openssl/x509name.py @@ -15,10 +15,13 @@ typedef STACK_OF(X509_NAME_ENTRY) Cryptography_STACK_OF_X509_NAME_ENTRY; """ TYPES = """ -typedef ... X509_NAME; +typedef ... Cryptography_STACK_OF_X509_NAME_ENTRY; +typedef struct { + Cryptography_STACK_OF_X509_NAME_ENTRY *entries; + ...; +} X509_NAME; typedef ... X509_NAME_ENTRY; typedef ... Cryptography_STACK_OF_X509_NAME; -typedef ... Cryptography_STACK_OF_X509_NAME_ENTRY; """ FUNCTIONS = """ @@ -55,6 +58,9 @@ void sk_X509_NAME_free(Cryptography_STACK_OF_X509_NAME *); int sk_X509_NAME_ENTRY_num(Cryptography_STACK_OF_X509_NAME_ENTRY *); X509_NAME_ENTRY *sk_X509_NAME_ENTRY_value( Cryptography_STACK_OF_X509_NAME_ENTRY *, int); +Cryptography_STACK_OF_X509_NAME_ENTRY *sk_X509_NAME_ENTRY_dup( + Cryptography_STACK_OF_X509_NAME_ENTRY * +); """ CUSTOMIZATIONS = """ diff --git a/src/_cffi_src/openssl/x509v3.py b/src/_cffi_src/openssl/x509v3.py index f6a18903..d8edb979 100644 --- a/src/_cffi_src/openssl/x509v3.py +++ b/src/_cffi_src/openssl/x509v3.py @@ -283,6 +283,9 @@ X509_EXTENSION *X509V3_EXT_i2d(int, int, void *); DIST_POINT *DIST_POINT_new(void); void DIST_POINT_free(DIST_POINT *); +DIST_POINT_NAME *DIST_POINT_NAME_new(void); +void DIST_POINT_NAME_free(DIST_POINT_NAME *); + int i2d_CRL_DIST_POINTS(Cryptography_STACK_OF_DIST_POINT *, unsigned char **); """ |