summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/x509/x509_addr.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/x509/x509_addr.c')
-rw-r--r--src/lib/libcrypto/x509/x509_addr.c56
1 files changed, 28 insertions, 28 deletions
diff --git a/src/lib/libcrypto/x509/x509_addr.c b/src/lib/libcrypto/x509/x509_addr.c
index 510ea4e697..2d8cc0b318 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.85 2022/11/26 16:08:54 tb Exp $ */ 1/* $OpenBSD: x509_addr.c,v 1.86 2023/02/16 08:38:17 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").
@@ -215,28 +215,28 @@ d2i_IPAddressRange(IPAddressRange **a, const unsigned char **in, long len)
215 return (IPAddressRange *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, 215 return (IPAddressRange *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
216 &IPAddressRange_it); 216 &IPAddressRange_it);
217} 217}
218LCRYPTO_ALIAS(d2i_IPAddressRange) 218LCRYPTO_ALIAS(d2i_IPAddressRange);
219 219
220int 220int
221i2d_IPAddressRange(IPAddressRange *a, unsigned char **out) 221i2d_IPAddressRange(IPAddressRange *a, unsigned char **out)
222{ 222{
223 return ASN1_item_i2d((ASN1_VALUE *)a, out, &IPAddressRange_it); 223 return ASN1_item_i2d((ASN1_VALUE *)a, out, &IPAddressRange_it);
224} 224}
225LCRYPTO_ALIAS(i2d_IPAddressRange) 225LCRYPTO_ALIAS(i2d_IPAddressRange);
226 226
227IPAddressRange * 227IPAddressRange *
228IPAddressRange_new(void) 228IPAddressRange_new(void)
229{ 229{
230 return (IPAddressRange *)ASN1_item_new(&IPAddressRange_it); 230 return (IPAddressRange *)ASN1_item_new(&IPAddressRange_it);
231} 231}
232LCRYPTO_ALIAS(IPAddressRange_new) 232LCRYPTO_ALIAS(IPAddressRange_new);
233 233
234void 234void
235IPAddressRange_free(IPAddressRange *a) 235IPAddressRange_free(IPAddressRange *a)
236{ 236{
237 ASN1_item_free((ASN1_VALUE *)a, &IPAddressRange_it); 237 ASN1_item_free((ASN1_VALUE *)a, &IPAddressRange_it);
238} 238}
239LCRYPTO_ALIAS(IPAddressRange_free) 239LCRYPTO_ALIAS(IPAddressRange_free);
240 240
241IPAddressOrRange * 241IPAddressOrRange *
242d2i_IPAddressOrRange(IPAddressOrRange **a, const unsigned char **in, long len) 242d2i_IPAddressOrRange(IPAddressOrRange **a, const unsigned char **in, long len)
@@ -244,28 +244,28 @@ d2i_IPAddressOrRange(IPAddressOrRange **a, const unsigned char **in, long len)
244 return (IPAddressOrRange *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, 244 return (IPAddressOrRange *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
245 &IPAddressOrRange_it); 245 &IPAddressOrRange_it);
246} 246}
247LCRYPTO_ALIAS(d2i_IPAddressOrRange) 247LCRYPTO_ALIAS(d2i_IPAddressOrRange);
248 248
249int 249int
250i2d_IPAddressOrRange(IPAddressOrRange *a, unsigned char **out) 250i2d_IPAddressOrRange(IPAddressOrRange *a, unsigned char **out)
251{ 251{
252 return ASN1_item_i2d((ASN1_VALUE *)a, out, &IPAddressOrRange_it); 252 return ASN1_item_i2d((ASN1_VALUE *)a, out, &IPAddressOrRange_it);
253} 253}
254LCRYPTO_ALIAS(i2d_IPAddressOrRange) 254LCRYPTO_ALIAS(i2d_IPAddressOrRange);
255 255
256IPAddressOrRange * 256IPAddressOrRange *
257IPAddressOrRange_new(void) 257IPAddressOrRange_new(void)
258{ 258{
259 return (IPAddressOrRange *)ASN1_item_new(&IPAddressOrRange_it); 259 return (IPAddressOrRange *)ASN1_item_new(&IPAddressOrRange_it);
260} 260}
261LCRYPTO_ALIAS(IPAddressOrRange_new) 261LCRYPTO_ALIAS(IPAddressOrRange_new);
262 262
263void 263void
264IPAddressOrRange_free(IPAddressOrRange *a) 264IPAddressOrRange_free(IPAddressOrRange *a)
265{ 265{
266 ASN1_item_free((ASN1_VALUE *)a, &IPAddressOrRange_it); 266 ASN1_item_free((ASN1_VALUE *)a, &IPAddressOrRange_it);
267} 267}
268LCRYPTO_ALIAS(IPAddressOrRange_free) 268LCRYPTO_ALIAS(IPAddressOrRange_free);
269 269
270IPAddressChoice * 270IPAddressChoice *
271d2i_IPAddressChoice(IPAddressChoice **a, const unsigned char **in, long len) 271d2i_IPAddressChoice(IPAddressChoice **a, const unsigned char **in, long len)
@@ -273,28 +273,28 @@ d2i_IPAddressChoice(IPAddressChoice **a, const unsigned char **in, long len)
273 return (IPAddressChoice *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, 273 return (IPAddressChoice *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
274 &IPAddressChoice_it); 274 &IPAddressChoice_it);
275} 275}
276LCRYPTO_ALIAS(d2i_IPAddressChoice) 276LCRYPTO_ALIAS(d2i_IPAddressChoice);
277 277
278int 278int
279i2d_IPAddressChoice(IPAddressChoice *a, unsigned char **out) 279i2d_IPAddressChoice(IPAddressChoice *a, unsigned char **out)
280{ 280{
281 return ASN1_item_i2d((ASN1_VALUE *)a, out, &IPAddressChoice_it); 281 return ASN1_item_i2d((ASN1_VALUE *)a, out, &IPAddressChoice_it);
282} 282}
283LCRYPTO_ALIAS(i2d_IPAddressChoice) 283LCRYPTO_ALIAS(i2d_IPAddressChoice);
284 284
285IPAddressChoice * 285IPAddressChoice *
286IPAddressChoice_new(void) 286IPAddressChoice_new(void)
287{ 287{
288 return (IPAddressChoice *)ASN1_item_new(&IPAddressChoice_it); 288 return (IPAddressChoice *)ASN1_item_new(&IPAddressChoice_it);
289} 289}
290LCRYPTO_ALIAS(IPAddressChoice_new) 290LCRYPTO_ALIAS(IPAddressChoice_new);
291 291
292void 292void
293IPAddressChoice_free(IPAddressChoice *a) 293IPAddressChoice_free(IPAddressChoice *a)
294{ 294{
295 ASN1_item_free((ASN1_VALUE *)a, &IPAddressChoice_it); 295 ASN1_item_free((ASN1_VALUE *)a, &IPAddressChoice_it);
296} 296}
297LCRYPTO_ALIAS(IPAddressChoice_free) 297LCRYPTO_ALIAS(IPAddressChoice_free);
298 298
299IPAddressFamily * 299IPAddressFamily *
300d2i_IPAddressFamily(IPAddressFamily **a, const unsigned char **in, long len) 300d2i_IPAddressFamily(IPAddressFamily **a, const unsigned char **in, long len)
@@ -302,28 +302,28 @@ d2i_IPAddressFamily(IPAddressFamily **a, const unsigned char **in, long len)
302 return (IPAddressFamily *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, 302 return (IPAddressFamily *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
303 &IPAddressFamily_it); 303 &IPAddressFamily_it);
304} 304}
305LCRYPTO_ALIAS(d2i_IPAddressFamily) 305LCRYPTO_ALIAS(d2i_IPAddressFamily);
306 306
307int 307int
308i2d_IPAddressFamily(IPAddressFamily *a, unsigned char **out) 308i2d_IPAddressFamily(IPAddressFamily *a, unsigned char **out)
309{ 309{
310 return ASN1_item_i2d((ASN1_VALUE *)a, out, &IPAddressFamily_it); 310 return ASN1_item_i2d((ASN1_VALUE *)a, out, &IPAddressFamily_it);
311} 311}
312LCRYPTO_ALIAS(i2d_IPAddressFamily) 312LCRYPTO_ALIAS(i2d_IPAddressFamily);
313 313
314IPAddressFamily * 314IPAddressFamily *
315IPAddressFamily_new(void) 315IPAddressFamily_new(void)
316{ 316{
317 return (IPAddressFamily *)ASN1_item_new(&IPAddressFamily_it); 317 return (IPAddressFamily *)ASN1_item_new(&IPAddressFamily_it);
318} 318}
319LCRYPTO_ALIAS(IPAddressFamily_new) 319LCRYPTO_ALIAS(IPAddressFamily_new);
320 320
321void 321void
322IPAddressFamily_free(IPAddressFamily *a) 322IPAddressFamily_free(IPAddressFamily *a)
323{ 323{
324 ASN1_item_free((ASN1_VALUE *)a, &IPAddressFamily_it); 324 ASN1_item_free((ASN1_VALUE *)a, &IPAddressFamily_it);
325} 325}
326LCRYPTO_ALIAS(IPAddressFamily_free) 326LCRYPTO_ALIAS(IPAddressFamily_free);
327 327
328/* 328/*
329 * Convenience accessors for IPAddressFamily. 329 * Convenience accessors for IPAddressFamily.
@@ -534,7 +534,7 @@ X509v3_addr_get_afi(const IPAddressFamily *af)
534 534
535 return afi; 535 return afi;
536} 536}
537LCRYPTO_ALIAS(X509v3_addr_get_afi) 537LCRYPTO_ALIAS(X509v3_addr_get_afi);
538 538
539/* 539/*
540 * Expand the bitstring form (RFC 3779, section 2.1.2) of an address into 540 * Expand the bitstring form (RFC 3779, section 2.1.2) of an address into
@@ -1110,7 +1110,7 @@ X509v3_addr_add_inherit(IPAddrBlocks *addr, const unsigned afi,
1110 1110
1111 return IPAddressFamily_set_inheritance(af); 1111 return IPAddressFamily_set_inheritance(af);
1112} 1112}
1113LCRYPTO_ALIAS(X509v3_addr_add_inherit) 1113LCRYPTO_ALIAS(X509v3_addr_add_inherit);
1114 1114
1115/* 1115/*
1116 * Construct an IPAddressOrRange sequence, or return an existing one. 1116 * Construct an IPAddressOrRange sequence, or return an existing one.
@@ -1174,7 +1174,7 @@ X509v3_addr_add_prefix(IPAddrBlocks *addr, const unsigned afi,
1174 1174
1175 return 1; 1175 return 1;
1176} 1176}
1177LCRYPTO_ALIAS(X509v3_addr_add_prefix) 1177LCRYPTO_ALIAS(X509v3_addr_add_prefix);
1178 1178
1179/* 1179/*
1180 * Add a range. 1180 * Add a range.
@@ -1202,7 +1202,7 @@ X509v3_addr_add_range(IPAddrBlocks *addr, const unsigned afi,
1202 1202
1203 return 1; 1203 return 1;
1204} 1204}
1205LCRYPTO_ALIAS(X509v3_addr_add_range) 1205LCRYPTO_ALIAS(X509v3_addr_add_range);
1206 1206
1207static int 1207static int
1208extract_min_max_bitstr(IPAddressOrRange *aor, ASN1_BIT_STRING **out_min, 1208extract_min_max_bitstr(IPAddressOrRange *aor, ASN1_BIT_STRING **out_min,
@@ -1262,7 +1262,7 @@ X509v3_addr_get_range(IPAddressOrRange *aor, const unsigned afi,
1262 1262
1263 return afi_len; 1263 return afi_len;
1264} 1264}
1265LCRYPTO_ALIAS(X509v3_addr_get_range) 1265LCRYPTO_ALIAS(X509v3_addr_get_range);
1266 1266
1267/* 1267/*
1268 * Check whether an IPAddrBLocks is in canonical form. 1268 * Check whether an IPAddrBLocks is in canonical form.
@@ -1381,7 +1381,7 @@ X509v3_addr_is_canonical(IPAddrBlocks *addr)
1381 */ 1381 */
1382 return 1; 1382 return 1;
1383} 1383}
1384LCRYPTO_ALIAS(X509v3_addr_is_canonical) 1384LCRYPTO_ALIAS(X509v3_addr_is_canonical);
1385 1385
1386/* 1386/*
1387 * Whack an IPAddressOrRanges into canonical form. 1387 * Whack an IPAddressOrRanges into canonical form.
@@ -1488,7 +1488,7 @@ X509v3_addr_canonize(IPAddrBlocks *addr)
1488 1488
1489 return X509v3_addr_is_canonical(addr); 1489 return X509v3_addr_is_canonical(addr);
1490} 1490}
1491LCRYPTO_ALIAS(X509v3_addr_canonize) 1491LCRYPTO_ALIAS(X509v3_addr_canonize);
1492 1492
1493/* 1493/*
1494 * v2i handler for the IPAddrBlocks extension. 1494 * v2i handler for the IPAddrBlocks extension.
@@ -1732,7 +1732,7 @@ X509v3_addr_inherits(IPAddrBlocks *addr)
1732 1732
1733 return 0; 1733 return 0;
1734} 1734}
1735LCRYPTO_ALIAS(X509v3_addr_inherits) 1735LCRYPTO_ALIAS(X509v3_addr_inherits);
1736 1736
1737/* 1737/*
1738 * Figure out whether parent contains child. 1738 * Figure out whether parent contains child.
@@ -1816,7 +1816,7 @@ X509v3_addr_subset(IPAddrBlocks *child, IPAddrBlocks *parent)
1816 } 1816 }
1817 return 1; 1817 return 1;
1818} 1818}
1819LCRYPTO_ALIAS(X509v3_addr_subset) 1819LCRYPTO_ALIAS(X509v3_addr_subset);
1820 1820
1821static int 1821static int
1822verify_error(X509_STORE_CTX *ctx, X509 *cert, int error, int depth) 1822verify_error(X509_STORE_CTX *ctx, X509 *cert, int error, int depth)
@@ -2022,7 +2022,7 @@ X509v3_addr_validate_path(X509_STORE_CTX *ctx)
2022 } 2022 }
2023 return addr_validate_path_internal(ctx, ctx->chain, NULL); 2023 return addr_validate_path_internal(ctx, ctx->chain, NULL);
2024} 2024}
2025LCRYPTO_ALIAS(X509v3_addr_validate_path) 2025LCRYPTO_ALIAS(X509v3_addr_validate_path);
2026 2026
2027/* 2027/*
2028 * RFC 3779 2.3 path validation of an extension. 2028 * RFC 3779 2.3 path validation of an extension.
@@ -2040,6 +2040,6 @@ X509v3_addr_validate_resource_set(STACK_OF(X509) *chain, IPAddrBlocks *ext,
2040 return 0; 2040 return 0;
2041 return addr_validate_path_internal(NULL, chain, ext); 2041 return addr_validate_path_internal(NULL, chain, ext);
2042} 2042}
2043LCRYPTO_ALIAS(X509v3_addr_validate_resource_set) 2043LCRYPTO_ALIAS(X509v3_addr_validate_resource_set);
2044 2044
2045#endif /* OPENSSL_NO_RFC3779 */ 2045#endif /* OPENSSL_NO_RFC3779 */