diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2015-12-07 21:44:30 -0500 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2015-12-07 21:44:30 -0500 |
| commit | 26c776f71d0f548fdfc9122517923268d740d3af (patch) | |
| tree | e6f69805f7ee0f5aa5ef7ddc88a8c32709c3854d /src/_cffi_src/openssl/x509v3.py | |
| parent | e36da1754dc04225f22db46c5b06602db377b429 (diff) | |
| parent | 3fd2f7ac71ecdf26c7f85d8bce21714949e6933b (diff) | |
| download | cryptography-26c776f71d0f548fdfc9122517923268d740d3af.tar.gz cryptography-26c776f71d0f548fdfc9122517923268d740d3af.tar.bz2 cryptography-26c776f71d0f548fdfc9122517923268d740d3af.zip | |
Merge branch 'master' into pypy-4.0.1
Diffstat (limited to 'src/_cffi_src/openssl/x509v3.py')
| -rw-r--r-- | src/_cffi_src/openssl/x509v3.py | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/_cffi_src/openssl/x509v3.py b/src/_cffi_src/openssl/x509v3.py index 8e163dc2..51c8410a 100644 --- a/src/_cffi_src/openssl/x509v3.py +++ b/src/_cffi_src/openssl/x509v3.py @@ -195,6 +195,7 @@ int i2d_AUTHORITY_KEYID(AUTHORITY_KEYID *, unsigned char **); NAME_CONSTRAINTS *NAME_CONSTRAINTS_new(void); void NAME_CONSTRAINTS_free(NAME_CONSTRAINTS *); +int Cryptography_i2d_NAME_CONSTRAINTS(NAME_CONSTRAINTS *, unsigned char **); OTHERNAME *OTHERNAME_new(void); void OTHERNAME_free(OTHERNAME *); @@ -277,6 +278,8 @@ GENERAL_SUBTREE *sk_GENERAL_SUBTREE_value( int sk_GENERAL_SUBTREE_push(Cryptography_STACK_OF_GENERAL_SUBTREE *, GENERAL_SUBTREE *); +GENERAL_SUBTREE *GENERAL_SUBTREE_new(void); + void sk_ASN1_INTEGER_free(Cryptography_STACK_OF_ASN1_INTEGER *); int sk_ASN1_INTEGER_num(Cryptography_STACK_OF_ASN1_INTEGER *); ASN1_INTEGER *sk_ASN1_INTEGER_value(Cryptography_STACK_OF_ASN1_INTEGER *, int); @@ -295,4 +298,13 @@ int i2d_CRL_DIST_POINTS(Cryptography_STACK_OF_DIST_POINT *, unsigned char **); """ CUSTOMIZATIONS = """ +/* i2d_NAME_CONSTRAINTS doesn't exist, but this is the way the macros in + asn1t.h would implement it. We're not using those macros in case + OpenSSL exposes this function in the future. */ +int Cryptography_i2d_NAME_CONSTRAINTS(NAME_CONSTRAINTS *nc, + unsigned char **out) { + return ASN1_item_i2d((ASN1_VALUE *)nc, out, + ASN1_ITEM_rptr(NAME_CONSTRAINTS)); +} + """ |