diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2015-08-08 17:42:04 -0400 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2015-08-08 17:42:04 -0400 |
| commit | 8b4b4166d3214509d6776b040c2409369bfd3363 (patch) | |
| tree | 1d6ecd6a75273c8cc2b8669305d89762452c73b1 | |
| parent | 8c1c24ccbab627419c97ad8b39ece3f90b5b1b1a (diff) | |
| parent | 34b5fc9d0cbc43fd4ada0f99133461bce552ee01 (diff) | |
| download | cryptography-8b4b4166d3214509d6776b040c2409369bfd3363.tar.gz cryptography-8b4b4166d3214509d6776b040c2409369bfd3363.tar.bz2 cryptography-8b4b4166d3214509d6776b040c2409369bfd3363.zip | |
Merge pull request #2227 from reaperhulk/cp-bindings
more openssl bindings for encoding certificate policy structures
| -rw-r--r-- | src/_cffi_src/openssl/asn1.py | 4 | ||||
| -rw-r--r-- | src/_cffi_src/openssl/x509v3.py | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/_cffi_src/openssl/asn1.py b/src/_cffi_src/openssl/asn1.py index c2d4fac0..96084721 100644 --- a/src/_cffi_src/openssl/asn1.py +++ b/src/_cffi_src/openssl/asn1.py @@ -43,6 +43,7 @@ typedef struct asn1_string_st ASN1_IA5STRING; typedef ... ASN1_BIT_STRING; typedef ... ASN1_OBJECT; typedef struct asn1_string_st ASN1_STRING; +typedef struct asn1_string_st ASN1_UTF8STRING; typedef ... ASN1_TYPE; typedef ... ASN1_GENERALIZEDTIME; typedef ... ASN1_ENUMERATED; @@ -125,6 +126,9 @@ int ASN1_BIT_STRING_set_bit(ASN1_BIT_STRING *, int, int); """ MACROS = """ +ASN1_UTF8STRING *ASN1_UTF8STRING_new(void); +void ASN1_UTF8STRING_free(ASN1_UTF8STRING *); + ASN1_BIT_STRING *ASN1_BIT_STRING_new(void); void ASN1_BIT_STRING_free(ASN1_BIT_STRING *); int i2d_ASN1_BIT_STRING(ASN1_BIT_STRING *, unsigned char **); diff --git a/src/_cffi_src/openssl/x509v3.py b/src/_cffi_src/openssl/x509v3.py index 6e35dacc..84e49640 100644 --- a/src/_cffi_src/openssl/x509v3.py +++ b/src/_cffi_src/openssl/x509v3.py @@ -279,6 +279,7 @@ 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); int sk_ASN1_INTEGER_push(Cryptography_STACK_OF_ASN1_INTEGER *, ASN1_INTEGER *); +Cryptography_STACK_OF_ASN1_INTEGER *sk_ASN1_INTEGER_new_null(void); X509_EXTENSION *X509V3_EXT_i2d(int, int, void *); |