summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2022-02-04 16:34:15 +0000
committertb <>2022-02-04 16:34:15 +0000
commit71167f8b1c800e07ea68636abbb3428d1f1589df (patch)
tree4a6a453e5e9c7ba86117604d1dced2357d0c240a
parent73cd197971bbb4f1ca8aa8c36ca700b165ccea35 (diff)
downloadopenbsd-71167f8b1c800e07ea68636abbb3428d1f1589df.tar.gz
openbsd-71167f8b1c800e07ea68636abbb3428d1f1589df.tar.bz2
openbsd-71167f8b1c800e07ea68636abbb3428d1f1589df.zip
Remove a strange inheritance check from addr_validate_path_internal()
The trust anchor can't inherit, but the code says that it can inherit just not if the leaf tries to inherit from that. This makes no sense and doesn't match what is done on the asid side. ok jsing
-rw-r--r--src/lib/libcrypto/x509/x509_addr.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/lib/libcrypto/x509/x509_addr.c b/src/lib/libcrypto/x509/x509_addr.c
index cc77f92509..209c5cf397 100644
--- a/src/lib/libcrypto/x509/x509_addr.c
+++ b/src/lib/libcrypto/x509/x509_addr.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_addr.c,v 1.76 2022/01/06 14:08:15 tb Exp $ */ 1/* $OpenBSD: x509_addr.c,v 1.77 2022/02/04 16:34:15 tb Exp $ */
2/* 2/*
3 * Contributed to the OpenSSL Project by the American Registry for 3 * Contributed to the OpenSSL Project by the American Registry for
4 * Internet Numbers ("ARIN"). 4 * Internet Numbers ("ARIN").
@@ -1899,9 +1899,6 @@ addr_validate_path_internal(X509_STORE_CTX *ctx, STACK_OF(X509) *chain,
1899 if (IPAddressFamily_inheritance(parent_af) == NULL) 1899 if (IPAddressFamily_inheritance(parent_af) == NULL)
1900 continue; 1900 continue;
1901 1901
1902 if (sk_IPAddressFamily_find(child, parent_af) < 0)
1903 continue;
1904
1905 if ((ret = verify_error(ctx, cert, 1902 if ((ret = verify_error(ctx, cert,
1906 X509_V_ERR_UNNESTED_RESOURCE, depth)) == 0) 1903 X509_V_ERR_UNNESTED_RESOURCE, depth)) == 0)
1907 goto done; 1904 goto done;