summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authortb <>2022-01-04 20:23:05 +0000
committertb <>2022-01-04 20:23:05 +0000
commit54d9eac5c87b49e6b2fa7b089f4fc8722c8d69cf (patch)
tree6b341802a8df5f55f5cbcd17a00c9f2a0d9fc448 /src/lib
parent02d012a7f7c2102d9adcd13a330765989172924e (diff)
downloadopenbsd-54d9eac5c87b49e6b2fa7b089f4fc8722c8d69cf.tar.gz
openbsd-54d9eac5c87b49e6b2fa7b089f4fc8722c8d69cf.tar.bz2
openbsd-54d9eac5c87b49e6b2fa7b089f4fc8722c8d69cf.zip
Remove checks that are duplicated in extract_min_max()
The NULL checks and the checks that aor->type is reasonable are already performed in extract_min_max(), so it is unnecessary to repeat them in X509v3_addr_get_range() ok inoguchi jsing
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libcrypto/x509/x509_addr.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/lib/libcrypto/x509/x509_addr.c b/src/lib/libcrypto/x509/x509_addr.c
index f6dbb3a9c1..d3cdebba25 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.53 2022/01/04 20:21:04 tb Exp $ */ 1/* $OpenBSD: x509_addr.c,v 1.54 2022/01/04 20:23:05 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").
@@ -1090,19 +1090,12 @@ X509v3_addr_get_range(IPAddressOrRange *aor, const unsigned afi,
1090{ 1090{
1091 int afi_length; 1091 int afi_length;
1092 1092
1093 if (aor == NULL || min == NULL || max == NULL)
1094 return 0;
1095
1096 if ((afi_length = length_from_afi(afi)) == 0) 1093 if ((afi_length = length_from_afi(afi)) == 0)
1097 return 0; 1094 return 0;
1098 1095
1099 if (length < afi_length) 1096 if (length < afi_length)
1100 return 0; 1097 return 0;
1101 1098
1102 if (aor->type != IPAddressOrRange_addressPrefix &&
1103 aor->type != IPAddressOrRange_addressRange)
1104 return 0;
1105
1106 if (!extract_min_max(aor, min, max, afi_length)) 1099 if (!extract_min_max(aor, min, max, afi_length))
1107 return 0; 1100 return 0;
1108 1101