summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/libcrypto/x509/x509_trs.c29
1 files changed, 14 insertions, 15 deletions
diff --git a/src/lib/libcrypto/x509/x509_trs.c b/src/lib/libcrypto/x509/x509_trs.c
index 73f24682f6..6fb818a76e 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.46 2024/03/24 01:24:26 tb Exp $ */ 1/* $OpenBSD: x509_trs.c,v 1.47 2024/03/24 08:03:29 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 */
@@ -83,22 +83,21 @@ obj_trust(int id, X509 *x)
83 ax = x->aux; 83 ax = x->aux;
84 if (!ax) 84 if (!ax)
85 return X509_TRUST_UNTRUSTED; 85 return X509_TRUST_UNTRUSTED;
86 if (ax->reject) { 86
87 for (i = 0; i < sk_ASN1_OBJECT_num(ax->reject); i++) { 87 for (i = 0; i < sk_ASN1_OBJECT_num(ax->reject); i++) {
88 obj = sk_ASN1_OBJECT_value(ax->reject, i); 88 obj = sk_ASN1_OBJECT_value(ax->reject, i);
89 nid = OBJ_obj2nid(obj); 89 nid = OBJ_obj2nid(obj);
90 if (nid == id || nid == NID_anyExtendedKeyUsage) 90 if (nid == id || nid == NID_anyExtendedKeyUsage)
91 return X509_TRUST_REJECTED; 91 return X509_TRUST_REJECTED;
92 }
93 } 92 }
94 if (ax->trust) { 93
95 for (i = 0; i < sk_ASN1_OBJECT_num(ax->trust); i++) { 94 for (i = 0; i < sk_ASN1_OBJECT_num(ax->trust); i++) {
96 obj = sk_ASN1_OBJECT_value(ax->trust, i); 95 obj = sk_ASN1_OBJECT_value(ax->trust, i);
97 nid = OBJ_obj2nid(obj); 96 nid = OBJ_obj2nid(obj);
98 if (nid == id || nid == NID_anyExtendedKeyUsage) 97 if (nid == id || nid == NID_anyExtendedKeyUsage)
99 return X509_TRUST_TRUSTED; 98 return X509_TRUST_TRUSTED;
100 }
101 } 99 }
100
102 return X509_TRUST_UNTRUSTED; 101 return X509_TRUST_UNTRUSTED;
103} 102}
104 103