summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2023-04-28 15:27:15 +0000
committertb <>2023-04-28 15:27:15 +0000
commit66d5d7d5b34bf542137abdb15c68ec1be3f500d7 (patch)
tree71cce4df52423594dfbf0db073e0b1c965f6415a
parent94f494cef30a7803f4fded9f2a5895a46c0b136b (diff)
downloadopenbsd-66d5d7d5b34bf542137abdb15c68ec1be3f500d7.tar.gz
openbsd-66d5d7d5b34bf542137abdb15c68ec1be3f500d7.tar.bz2
openbsd-66d5d7d5b34bf542137abdb15c68ec1be3f500d7.zip
Deassert X509_policy_check()
Instead of asserting that i == num_certs - 2, simply make that an error check. with beck ok jsing
-rw-r--r--src/lib/libcrypto/x509/x509_policy.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/libcrypto/x509/x509_policy.c b/src/lib/libcrypto/x509/x509_policy.c
index 0f60a11c77..c2ef47aa0f 100644
--- a/src/lib/libcrypto/x509/x509_policy.c
+++ b/src/lib/libcrypto/x509/x509_policy.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_policy.c,v 1.18 2023/04/28 15:21:22 tb Exp $ */ 1/* $OpenBSD: x509_policy.c,v 1.19 2023/04/28 15:27:15 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2022, Google Inc. 3 * Copyright (c) 2022, Google Inc.
4 * 4 *
@@ -899,7 +899,8 @@ X509_policy_check(const STACK_OF(X509) *certs,
899 is_self_issued = (cert->ex_flags & EXFLAG_SI) != 0; 899 is_self_issued = (cert->ex_flags & EXFLAG_SI) != 0;
900 900
901 if (level == NULL) { 901 if (level == NULL) {
902 assert(i == num_certs - 2); 902 if (i != num_certs - 2)
903 goto err;
903 level = x509_policy_level_new(); 904 level = x509_policy_level_new();
904 if (level == NULL) 905 if (level == NULL)
905 goto err; 906 goto err;