diff options
author | tb <> | 2022-01-05 17:53:42 +0000 |
---|---|---|
committer | tb <> | 2022-01-05 17:53:42 +0000 |
commit | ce97d0bcba2cdb5c45f4a68454b480ddf879d193 (patch) | |
tree | ba8b16f651b55f776b6bb477a8691c8c55f4f151 | |
parent | a74f168e4069884b563dffaca44558e6c6115329 (diff) | |
download | openbsd-ce97d0bcba2cdb5c45f4a68454b480ddf879d193.tar.gz openbsd-ce97d0bcba2cdb5c45f4a68454b480ddf879d193.tar.bz2 openbsd-ce97d0bcba2cdb5c45f4a68454b480ddf879d193.zip |
Two minor KNF tweaks
-rw-r--r-- | src/lib/libcrypto/x509/x509_addr.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libcrypto/x509/x509_addr.c b/src/lib/libcrypto/x509/x509_addr.c index 65d2b2deb6..2a102e13ac 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.72 2022/01/05 17:52:28 tb Exp $ */ | 1 | /* $OpenBSD: x509_addr.c,v 1.73 2022/01/05 17:53:42 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"). |
@@ -1840,9 +1840,8 @@ addr_validate_path_internal(X509_STORE_CTX *ctx, STACK_OF(X509) *chain, | |||
1840 | for (i = 0; i < sk_IPAddressFamily_num(child); i++) { | 1840 | for (i = 0; i < sk_IPAddressFamily_num(child); i++) { |
1841 | child_af = sk_IPAddressFamily_value(child, i); | 1841 | child_af = sk_IPAddressFamily_value(child, i); |
1842 | 1842 | ||
1843 | parent_af = IPAddressFamily_find_in_parent(parent, | 1843 | if ((parent_af = IPAddressFamily_find_in_parent(parent, |
1844 | child_af); | 1844 | child_af)) == NULL) { |
1845 | if (parent_af == NULL) { | ||
1846 | /* | 1845 | /* |
1847 | * If we have no match in the parent and the | 1846 | * If we have no match in the parent and the |
1848 | * child inherits, that's fine. | 1847 | * child inherits, that's fine. |
@@ -1869,7 +1868,8 @@ addr_validate_path_internal(X509_STORE_CTX *ctx, STACK_OF(X509) *chain, | |||
1869 | } | 1868 | } |
1870 | 1869 | ||
1871 | child_aor = IPAddressFamily_addressesOrRanges(child_af); | 1870 | child_aor = IPAddressFamily_addressesOrRanges(child_af); |
1872 | parent_aor = IPAddressFamily_addressesOrRanges(parent_af); | 1871 | parent_aor = |
1872 | IPAddressFamily_addressesOrRanges(parent_af); | ||
1873 | 1873 | ||
1874 | /* | 1874 | /* |
1875 | * Child and parent are canonical and neither inherits. | 1875 | * Child and parent are canonical and neither inherits. |