diff options
Diffstat (limited to 'src/lib/libcrypto/x509/x509_addr.c')
| -rw-r--r-- | src/lib/libcrypto/x509/x509_addr.c | 56 |
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 | } |
| 218 | LCRYPTO_ALIAS(d2i_IPAddressRange) | 218 | LCRYPTO_ALIAS(d2i_IPAddressRange); |
| 219 | 219 | ||
| 220 | int | 220 | int |
| 221 | i2d_IPAddressRange(IPAddressRange *a, unsigned char **out) | 221 | i2d_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 | } |
| 225 | LCRYPTO_ALIAS(i2d_IPAddressRange) | 225 | LCRYPTO_ALIAS(i2d_IPAddressRange); |
| 226 | 226 | ||
| 227 | IPAddressRange * | 227 | IPAddressRange * |
| 228 | IPAddressRange_new(void) | 228 | IPAddressRange_new(void) |
| 229 | { | 229 | { |
| 230 | return (IPAddressRange *)ASN1_item_new(&IPAddressRange_it); | 230 | return (IPAddressRange *)ASN1_item_new(&IPAddressRange_it); |
| 231 | } | 231 | } |
| 232 | LCRYPTO_ALIAS(IPAddressRange_new) | 232 | LCRYPTO_ALIAS(IPAddressRange_new); |
| 233 | 233 | ||
| 234 | void | 234 | void |
| 235 | IPAddressRange_free(IPAddressRange *a) | 235 | IPAddressRange_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 | } |
| 239 | LCRYPTO_ALIAS(IPAddressRange_free) | 239 | LCRYPTO_ALIAS(IPAddressRange_free); |
| 240 | 240 | ||
| 241 | IPAddressOrRange * | 241 | IPAddressOrRange * |
| 242 | d2i_IPAddressOrRange(IPAddressOrRange **a, const unsigned char **in, long len) | 242 | d2i_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 | } |
| 247 | LCRYPTO_ALIAS(d2i_IPAddressOrRange) | 247 | LCRYPTO_ALIAS(d2i_IPAddressOrRange); |
| 248 | 248 | ||
| 249 | int | 249 | int |
| 250 | i2d_IPAddressOrRange(IPAddressOrRange *a, unsigned char **out) | 250 | i2d_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 | } |
| 254 | LCRYPTO_ALIAS(i2d_IPAddressOrRange) | 254 | LCRYPTO_ALIAS(i2d_IPAddressOrRange); |
| 255 | 255 | ||
| 256 | IPAddressOrRange * | 256 | IPAddressOrRange * |
| 257 | IPAddressOrRange_new(void) | 257 | IPAddressOrRange_new(void) |
| 258 | { | 258 | { |
| 259 | return (IPAddressOrRange *)ASN1_item_new(&IPAddressOrRange_it); | 259 | return (IPAddressOrRange *)ASN1_item_new(&IPAddressOrRange_it); |
| 260 | } | 260 | } |
| 261 | LCRYPTO_ALIAS(IPAddressOrRange_new) | 261 | LCRYPTO_ALIAS(IPAddressOrRange_new); |
| 262 | 262 | ||
| 263 | void | 263 | void |
| 264 | IPAddressOrRange_free(IPAddressOrRange *a) | 264 | IPAddressOrRange_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 | } |
| 268 | LCRYPTO_ALIAS(IPAddressOrRange_free) | 268 | LCRYPTO_ALIAS(IPAddressOrRange_free); |
| 269 | 269 | ||
| 270 | IPAddressChoice * | 270 | IPAddressChoice * |
| 271 | d2i_IPAddressChoice(IPAddressChoice **a, const unsigned char **in, long len) | 271 | d2i_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 | } |
| 276 | LCRYPTO_ALIAS(d2i_IPAddressChoice) | 276 | LCRYPTO_ALIAS(d2i_IPAddressChoice); |
| 277 | 277 | ||
| 278 | int | 278 | int |
| 279 | i2d_IPAddressChoice(IPAddressChoice *a, unsigned char **out) | 279 | i2d_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 | } |
| 283 | LCRYPTO_ALIAS(i2d_IPAddressChoice) | 283 | LCRYPTO_ALIAS(i2d_IPAddressChoice); |
| 284 | 284 | ||
| 285 | IPAddressChoice * | 285 | IPAddressChoice * |
| 286 | IPAddressChoice_new(void) | 286 | IPAddressChoice_new(void) |
| 287 | { | 287 | { |
| 288 | return (IPAddressChoice *)ASN1_item_new(&IPAddressChoice_it); | 288 | return (IPAddressChoice *)ASN1_item_new(&IPAddressChoice_it); |
| 289 | } | 289 | } |
| 290 | LCRYPTO_ALIAS(IPAddressChoice_new) | 290 | LCRYPTO_ALIAS(IPAddressChoice_new); |
| 291 | 291 | ||
| 292 | void | 292 | void |
| 293 | IPAddressChoice_free(IPAddressChoice *a) | 293 | IPAddressChoice_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 | } |
| 297 | LCRYPTO_ALIAS(IPAddressChoice_free) | 297 | LCRYPTO_ALIAS(IPAddressChoice_free); |
| 298 | 298 | ||
| 299 | IPAddressFamily * | 299 | IPAddressFamily * |
| 300 | d2i_IPAddressFamily(IPAddressFamily **a, const unsigned char **in, long len) | 300 | d2i_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 | } |
| 305 | LCRYPTO_ALIAS(d2i_IPAddressFamily) | 305 | LCRYPTO_ALIAS(d2i_IPAddressFamily); |
| 306 | 306 | ||
| 307 | int | 307 | int |
| 308 | i2d_IPAddressFamily(IPAddressFamily *a, unsigned char **out) | 308 | i2d_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 | } |
| 312 | LCRYPTO_ALIAS(i2d_IPAddressFamily) | 312 | LCRYPTO_ALIAS(i2d_IPAddressFamily); |
| 313 | 313 | ||
| 314 | IPAddressFamily * | 314 | IPAddressFamily * |
| 315 | IPAddressFamily_new(void) | 315 | IPAddressFamily_new(void) |
| 316 | { | 316 | { |
| 317 | return (IPAddressFamily *)ASN1_item_new(&IPAddressFamily_it); | 317 | return (IPAddressFamily *)ASN1_item_new(&IPAddressFamily_it); |
| 318 | } | 318 | } |
| 319 | LCRYPTO_ALIAS(IPAddressFamily_new) | 319 | LCRYPTO_ALIAS(IPAddressFamily_new); |
| 320 | 320 | ||
| 321 | void | 321 | void |
| 322 | IPAddressFamily_free(IPAddressFamily *a) | 322 | IPAddressFamily_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 | } |
| 326 | LCRYPTO_ALIAS(IPAddressFamily_free) | 326 | LCRYPTO_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 | } |
| 537 | LCRYPTO_ALIAS(X509v3_addr_get_afi) | 537 | LCRYPTO_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 | } |
| 1113 | LCRYPTO_ALIAS(X509v3_addr_add_inherit) | 1113 | LCRYPTO_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 | } |
| 1177 | LCRYPTO_ALIAS(X509v3_addr_add_prefix) | 1177 | LCRYPTO_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 | } |
| 1205 | LCRYPTO_ALIAS(X509v3_addr_add_range) | 1205 | LCRYPTO_ALIAS(X509v3_addr_add_range); |
| 1206 | 1206 | ||
| 1207 | static int | 1207 | static int |
| 1208 | extract_min_max_bitstr(IPAddressOrRange *aor, ASN1_BIT_STRING **out_min, | 1208 | extract_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 | } |
| 1265 | LCRYPTO_ALIAS(X509v3_addr_get_range) | 1265 | LCRYPTO_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 | } |
| 1384 | LCRYPTO_ALIAS(X509v3_addr_is_canonical) | 1384 | LCRYPTO_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 | } |
| 1491 | LCRYPTO_ALIAS(X509v3_addr_canonize) | 1491 | LCRYPTO_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 | } |
| 1735 | LCRYPTO_ALIAS(X509v3_addr_inherits) | 1735 | LCRYPTO_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 | } |
| 1819 | LCRYPTO_ALIAS(X509v3_addr_subset) | 1819 | LCRYPTO_ALIAS(X509v3_addr_subset); |
| 1820 | 1820 | ||
| 1821 | static int | 1821 | static int |
| 1822 | verify_error(X509_STORE_CTX *ctx, X509 *cert, int error, int depth) | 1822 | verify_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 | } |
| 2025 | LCRYPTO_ALIAS(X509v3_addr_validate_path) | 2025 | LCRYPTO_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 | } |
| 2043 | LCRYPTO_ALIAS(X509v3_addr_validate_resource_set) | 2043 | LCRYPTO_ALIAS(X509v3_addr_validate_resource_set); |
| 2044 | 2044 | ||
| 2045 | #endif /* OPENSSL_NO_RFC3779 */ | 2045 | #endif /* OPENSSL_NO_RFC3779 */ |
