diff options
author | tb <> | 2021-10-23 11:53:24 +0000 |
---|---|---|
committer | tb <> | 2021-10-23 11:53:24 +0000 |
commit | c5d933b73b08738de0850281b4f0a6fb9ae942c2 (patch) | |
tree | 2383f4c7cba8ba8f398a4f63d29924021ad6fdc0 /src | |
parent | 7585b0231596c5d2015f31d0be70147c37b7f771 (diff) | |
download | openbsd-c5d933b73b08738de0850281b4f0a6fb9ae942c2.tar.gz openbsd-c5d933b73b08738de0850281b4f0a6fb9ae942c2.tar.bz2 openbsd-c5d933b73b08738de0850281b4f0a6fb9ae942c2.zip |
Prepare to provide X509_get_extension_flags()
ok beck jsing
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/x509/x509_purp.c | 12 | ||||
-rw-r--r-- | src/lib/libcrypto/x509/x509v3.h | 3 |
2 files changed, 13 insertions, 2 deletions
diff --git a/src/lib/libcrypto/x509/x509_purp.c b/src/lib/libcrypto/x509/x509_purp.c index 43236b2cd3..94e9852fc6 100644 --- a/src/lib/libcrypto/x509/x509_purp.c +++ b/src/lib/libcrypto/x509/x509_purp.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x509_purp.c,v 1.9 2021/10/22 18:37:15 tb Exp $ */ | 1 | /* $OpenBSD: x509_purp.c,v 1.10 2021/10/23 11:53:24 tb Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 2001. | 3 | * project 2001. |
4 | */ | 4 | */ |
@@ -944,6 +944,16 @@ X509_check_akid(X509 *issuer, AUTHORITY_KEYID *akid) | |||
944 | } | 944 | } |
945 | 945 | ||
946 | uint32_t | 946 | uint32_t |
947 | X509_get_extension_flags(X509 *x) | ||
948 | { | ||
949 | /* Call for side-effect of computing hash and caching extensions */ | ||
950 | if (X509_check_purpose(x, -1, -1) != 1) | ||
951 | return 0; | ||
952 | |||
953 | return x->ex_flags; | ||
954 | } | ||
955 | |||
956 | uint32_t | ||
947 | X509_get_key_usage(X509 *x) | 957 | X509_get_key_usage(X509 *x) |
948 | { | 958 | { |
949 | /* Call for side-effect of computing hash and caching extensions */ | 959 | /* Call for side-effect of computing hash and caching extensions */ |
diff --git a/src/lib/libcrypto/x509/x509v3.h b/src/lib/libcrypto/x509/x509v3.h index 84229a1890..b9fe1ca4b0 100644 --- a/src/lib/libcrypto/x509/x509v3.h +++ b/src/lib/libcrypto/x509/x509v3.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x509v3.h,v 1.7 2021/10/22 18:37:15 tb Exp $ */ | 1 | /* $OpenBSD: x509v3.h,v 1.8 2021/10/23 11:53:24 tb Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 1999. | 3 | * project 1999. |
4 | */ | 4 | */ |
@@ -800,6 +800,7 @@ int X509_PURPOSE_get_trust(const X509_PURPOSE *xp); | |||
800 | void X509_PURPOSE_cleanup(void); | 800 | void X509_PURPOSE_cleanup(void); |
801 | int X509_PURPOSE_get_id(const X509_PURPOSE *); | 801 | int X509_PURPOSE_get_id(const X509_PURPOSE *); |
802 | #if defined(LIBRESSL_NEW_API) | 802 | #if defined(LIBRESSL_NEW_API) |
803 | uint32_t X509_get_extension_flags(X509 *x); | ||
803 | uint32_t X509_get_key_usage(X509 *x); | 804 | uint32_t X509_get_key_usage(X509 *x); |
804 | uint32_t X509_get_extended_key_usage(X509 *x); | 805 | uint32_t X509_get_extended_key_usage(X509 *x); |
805 | #endif | 806 | #endif |