diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2019-07-09 08:00:43 -0400 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2019-07-09 08:00:43 -0400 |
| commit | e1fcc6e34ef3136fbabaf2e7a21307d4b8784025 (patch) | |
| tree | 32274d6c7d99f6705771b56e998b77c061fd5203 /src/_cffi_src/openssl | |
| parent | cd59bd275ecc484b1662c86ae9ef0a64eb17d00f (diff) | |
| download | cryptography-e1fcc6e34ef3136fbabaf2e7a21307d4b8784025.tar.gz cryptography-e1fcc6e34ef3136fbabaf2e7a21307d4b8784025.tar.bz2 cryptography-e1fcc6e34ef3136fbabaf2e7a21307d4b8784025.zip | |
add bindings to parse and create challenge passwords in X509 CSRs (#4943)
* add bindings to parse and create challenge passwords in X509 CSRs
* moved away from the 1.1.0 section
Diffstat (limited to 'src/_cffi_src/openssl')
| -rw-r--r-- | src/_cffi_src/openssl/asn1.py | 5 | ||||
| -rw-r--r-- | src/_cffi_src/openssl/x509.py | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/_cffi_src/openssl/asn1.py b/src/_cffi_src/openssl/asn1.py index 82bf7979..3e148ce0 100644 --- a/src/_cffi_src/openssl/asn1.py +++ b/src/_cffi_src/openssl/asn1.py @@ -27,7 +27,10 @@ typedef struct asn1_string_st ASN1_TIME; typedef ... ASN1_OBJECT; typedef struct asn1_string_st ASN1_STRING; typedef struct asn1_string_st ASN1_UTF8STRING; -typedef ... ASN1_TYPE; +typedef struct { + int type; + ...; +} ASN1_TYPE; typedef ... ASN1_GENERALIZEDTIME; typedef ... ASN1_ENUMERATED; typedef ... ASN1_NULL; diff --git a/src/_cffi_src/openssl/x509.py b/src/_cffi_src/openssl/x509.py index d1c8699f..b48f3179 100644 --- a/src/_cffi_src/openssl/x509.py +++ b/src/_cffi_src/openssl/x509.py @@ -29,6 +29,7 @@ typedef struct { ...; } X509_ALGOR; +typedef ... X509_ATTRIBUTE; typedef ... X509_EXTENSION; typedef ... X509_EXTENSIONS; typedef ... X509_REQ; @@ -87,6 +88,12 @@ EVP_PKEY *X509_REQ_get_pubkey(X509_REQ *); int X509_REQ_print_ex(BIO *, X509_REQ *, unsigned long, unsigned long); int X509_REQ_add_extensions(X509_REQ *, X509_EXTENSIONS *); X509_EXTENSIONS *X509_REQ_get_extensions(X509_REQ *); +X509_ATTRIBUTE *X509_REQ_get_attr(const X509_REQ *, int); +int X509_REQ_get_attr_by_OBJ(const X509_REQ *, const ASN1_OBJECT *, int); +void *X509_ATTRIBUTE_get0_data(X509_ATTRIBUTE *, int, int, void *); +ASN1_TYPE *X509_ATTRIBUTE_get0_type(X509_ATTRIBUTE *, int); +int X509_REQ_add1_attr_by_txt(X509_REQ *, const char *, int, + const unsigned char *, int); int X509V3_EXT_print(BIO *, X509_EXTENSION *, unsigned long, int); ASN1_OCTET_STRING *X509_EXTENSION_get_data(X509_EXTENSION *); |