diff options
| author | Mathias Panzenböck <grosser.meister.morti@gmx.net> | 2021-08-29 19:43:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-29 13:43:16 -0400 |
| commit | eb6f658e5fccf0f5a66e1d6bdb4dda4ced5c6aa8 (patch) | |
| tree | 381f5d8904e8607cf3355936bf0fdfbf45d8378e | |
| parent | 5b966396a255cdb0f8e90f998c7e42b11ffdecd8 (diff) | |
| download | cryptography-eb6f658e5fccf0f5a66e1d6bdb4dda4ced5c6aa8.tar.gz | |
add PKCS7_get0_signers(), X509_STORE_set_purpose(), and X509_PURPOSE_* (#6187)
* add PKCS7_get0_signers(), X509_STORE_set_purpose(), and X509_PURPOSE_*
* removed argument names of X509_STORE_set_purpose() and PKCS7_get0_signers()
* Update pkcs7.py
* Update x509_vfy.py
Co-authored-by: Paul Kehrer <paul.l.kehrer@gmail.com>
| -rw-r--r-- | src/_cffi_src/openssl/pkcs7.py | 5 | ||||
| -rw-r--r-- | src/_cffi_src/openssl/x509_vfy.py | 17 |
2 files changed, 22 insertions, 0 deletions
diff --git a/src/_cffi_src/openssl/pkcs7.py b/src/_cffi_src/openssl/pkcs7.py index 052bd0508..b58b293a5 100644 --- a/src/_cffi_src/openssl/pkcs7.py +++ b/src/_cffi_src/openssl/pkcs7.py @@ -68,6 +68,11 @@ int PKCS7_final(PKCS7 *, BIO *, int); int PKCS7_verify(PKCS7 *, Cryptography_STACK_OF_X509 *, X509_STORE *, BIO *, BIO *, int); PKCS7 *SMIME_read_PKCS7(BIO *, BIO **); +/* Included due to external consumer, see + https://github.com/pyca/pyopenssl/issues/1031 */ +Cryptography_STACK_OF_X509 *PKCS7_get0_signers(PKCS7 *, + Cryptography_STACK_OF_X509 *, + int); int PKCS7_type_is_signed(PKCS7 *); int PKCS7_type_is_enveloped(PKCS7 *); diff --git a/src/_cffi_src/openssl/x509_vfy.py b/src/_cffi_src/openssl/x509_vfy.py index 4642d8277..16c0ae0be 100644 --- a/src/_cffi_src/openssl/x509_vfy.py +++ b/src/_cffi_src/openssl/x509_vfy.py @@ -124,6 +124,20 @@ static const long X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS; static const long X509_CHECK_FLAG_MULTI_LABEL_WILDCARDS; static const long X509_CHECK_FLAG_SINGLE_LABEL_SUBDOMAINS; static const long X509_CHECK_FLAG_NEVER_CHECK_SUBJECT; + +/* Included due to external consumer, see + https://github.com/pyca/pyopenssl/issues/1031 */ +static const long X509_PURPOSE_SSL_CLIENT; +static const long X509_PURPOSE_SSL_SERVER; +static const long X509_PURPOSE_NS_SSL_SERVER; +static const long X509_PURPOSE_SMIME_SIGN; +static const long X509_PURPOSE_SMIME_ENCRYPT; +static const long X509_PURPOSE_CRL_SIGN; +static const long X509_PURPOSE_ANY; +static const long X509_PURPOSE_OCSP_HELPER; +static const long X509_PURPOSE_TIMESTAMP_SIGN; +static const long X509_PURPOSE_MIN; +static const long X509_PURPOSE_MAX; """ FUNCTIONS = """ @@ -137,6 +151,9 @@ int X509_STORE_load_locations(X509_STORE *, const char *, const char *); int X509_STORE_set1_param(X509_STORE *, X509_VERIFY_PARAM *); int X509_STORE_set_default_paths(X509_STORE *); int X509_STORE_set_flags(X509_STORE *, unsigned long); +/* Included due to external consumer, see + https://github.com/pyca/pyopenssl/issues/1031 */ +int X509_STORE_set_purpose(X509_STORE *, int); void X509_STORE_free(X509_STORE *); /* X509_STORE_CTX */ |