diff options
-rw-r--r-- | src/lib/libcrypto/x509/x509_trs.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/lib/libcrypto/x509/x509_trs.c b/src/lib/libcrypto/x509/x509_trs.c index 6fb818a76e..67576b6a70 100644 --- a/src/lib/libcrypto/x509/x509_trs.c +++ b/src/lib/libcrypto/x509/x509_trs.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x509_trs.c,v 1.47 2024/03/24 08:03:29 tb Exp $ */ | 1 | /* $OpenBSD: x509_trs.c,v 1.48 2024/03/24 08:27:35 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 | */ |
@@ -78,21 +78,20 @@ obj_trust(int id, X509 *x) | |||
78 | { | 78 | { |
79 | ASN1_OBJECT *obj; | 79 | ASN1_OBJECT *obj; |
80 | int i, nid; | 80 | int i, nid; |
81 | X509_CERT_AUX *ax; | 81 | X509_CERT_AUX *aux; |
82 | 82 | ||
83 | ax = x->aux; | 83 | if ((aux = x->aux) == NULL) |
84 | if (!ax) | ||
85 | return X509_TRUST_UNTRUSTED; | 84 | return X509_TRUST_UNTRUSTED; |
86 | 85 | ||
87 | for (i = 0; i < sk_ASN1_OBJECT_num(ax->reject); i++) { | 86 | for (i = 0; i < sk_ASN1_OBJECT_num(aux->reject); i++) { |
88 | obj = sk_ASN1_OBJECT_value(ax->reject, i); | 87 | obj = sk_ASN1_OBJECT_value(aux->reject, i); |
89 | nid = OBJ_obj2nid(obj); | 88 | nid = OBJ_obj2nid(obj); |
90 | if (nid == id || nid == NID_anyExtendedKeyUsage) | 89 | if (nid == id || nid == NID_anyExtendedKeyUsage) |
91 | return X509_TRUST_REJECTED; | 90 | return X509_TRUST_REJECTED; |
92 | } | 91 | } |
93 | 92 | ||
94 | for (i = 0; i < sk_ASN1_OBJECT_num(ax->trust); i++) { | 93 | for (i = 0; i < sk_ASN1_OBJECT_num(aux->trust); i++) { |
95 | obj = sk_ASN1_OBJECT_value(ax->trust, i); | 94 | obj = sk_ASN1_OBJECT_value(aux->trust, i); |
96 | nid = OBJ_obj2nid(obj); | 95 | nid = OBJ_obj2nid(obj); |
97 | if (nid == id || nid == NID_anyExtendedKeyUsage) | 96 | if (nid == id || nid == NID_anyExtendedKeyUsage) |
98 | return X509_TRUST_TRUSTED; | 97 | return X509_TRUST_TRUSTED; |