summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2022-01-06 14:08:15 +0000
committertb <>2022-01-06 14:08:15 +0000
commit473510cd8b577e6b1d32cfec4196726f563886fa (patch)
tree6130f681b61be0661417746c4fa7d0f907113904
parent071d82ace81fc5bb90a51a7ee58a2c9e62a61a0a (diff)
downloadopenbsd-473510cd8b577e6b1d32cfec4196726f563886fa.tar.gz
openbsd-473510cd8b577e6b1d32cfec4196726f563886fa.tar.bz2
openbsd-473510cd8b577e6b1d32cfec4196726f563886fa.zip
minor tweaks, no code change
Adjust a comment to reality, zap a stray empty line and fix whitespace before comment after #endif
-rw-r--r--src/lib/libcrypto/x509/x509_addr.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/libcrypto/x509/x509_addr.c b/src/lib/libcrypto/x509/x509_addr.c
index 8794180535..cc77f92509 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.75 2022/01/05 18:01:27 tb Exp $ */ 1/* $OpenBSD: x509_addr.c,v 1.76 2022/01/06 14:08: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").
@@ -1690,7 +1690,7 @@ addr_contains(IPAddressOrRanges *parent, IPAddressOrRanges *child, int length)
1690} 1690}
1691 1691
1692/* 1692/*
1693 * Test whether a is a subset of b. 1693 * Test whether |child| is a subset of |parent|.
1694 */ 1694 */
1695int 1695int
1696X509v3_addr_subset(IPAddrBlocks *child, IPAddrBlocks *parent) 1696X509v3_addr_subset(IPAddrBlocks *child, IPAddrBlocks *parent)
@@ -1710,7 +1710,6 @@ X509v3_addr_subset(IPAddrBlocks *child, IPAddrBlocks *parent)
1710 for (i = 0; i < sk_IPAddressFamily_num(child); i++) { 1710 for (i = 0; i < sk_IPAddressFamily_num(child); i++) {
1711 child_af = sk_IPAddressFamily_value(child, i); 1711 child_af = sk_IPAddressFamily_value(child, i);
1712 1712
1713
1714 parent_af = IPAddressFamily_find_in_parent(parent, child_af); 1713 parent_af = IPAddressFamily_find_in_parent(parent, child_af);
1715 if (parent_af == NULL) 1714 if (parent_af == NULL)
1716 return 0; 1715 return 0;
@@ -1952,4 +1951,4 @@ X509v3_addr_validate_resource_set(STACK_OF(X509) *chain, IPAddrBlocks *ext,
1952 return addr_validate_path_internal(NULL, chain, ext); 1951 return addr_validate_path_internal(NULL, chain, ext);
1953} 1952}
1954 1953
1955#endif /* OPENSSL_NO_RFC3779 */ 1954#endif /* OPENSSL_NO_RFC3779 */