diff options
Diffstat (limited to 'src/lib/libcrypto/x509/x509_asid.c')
| -rw-r--r-- | src/lib/libcrypto/x509/x509_asid.c | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/src/lib/libcrypto/x509/x509_asid.c b/src/lib/libcrypto/x509/x509_asid.c index e9db8bdabd..c95816da04 100644 --- a/src/lib/libcrypto/x509/x509_asid.c +++ b/src/lib/libcrypto/x509/x509_asid.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509_asid.c,v 1.36 2022/11/13 23:38:42 tb Exp $ */ | 1 | /* $OpenBSD: x509_asid.c,v 1.37 2022/11/14 17:48:50 beck 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"). |
| @@ -191,24 +191,28 @@ d2i_ASRange(ASRange **a, const unsigned char **in, long len) | |||
| 191 | return (ASRange *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 191 | return (ASRange *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
| 192 | &ASRange_it); | 192 | &ASRange_it); |
| 193 | } | 193 | } |
| 194 | LCRYPTO_ALIAS(d2i_ASRange) | ||
| 194 | 195 | ||
| 195 | int | 196 | int |
| 196 | i2d_ASRange(ASRange *a, unsigned char **out) | 197 | i2d_ASRange(ASRange *a, unsigned char **out) |
| 197 | { | 198 | { |
| 198 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &ASRange_it); | 199 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &ASRange_it); |
| 199 | } | 200 | } |
| 201 | LCRYPTO_ALIAS(i2d_ASRange) | ||
| 200 | 202 | ||
| 201 | ASRange * | 203 | ASRange * |
| 202 | ASRange_new(void) | 204 | ASRange_new(void) |
| 203 | { | 205 | { |
| 204 | return (ASRange *)ASN1_item_new(&ASRange_it); | 206 | return (ASRange *)ASN1_item_new(&ASRange_it); |
| 205 | } | 207 | } |
| 208 | LCRYPTO_ALIAS(ASRange_new) | ||
| 206 | 209 | ||
| 207 | void | 210 | void |
| 208 | ASRange_free(ASRange *a) | 211 | ASRange_free(ASRange *a) |
| 209 | { | 212 | { |
| 210 | ASN1_item_free((ASN1_VALUE *)a, &ASRange_it); | 213 | ASN1_item_free((ASN1_VALUE *)a, &ASRange_it); |
| 211 | } | 214 | } |
| 215 | LCRYPTO_ALIAS(ASRange_free) | ||
| 212 | 216 | ||
| 213 | ASIdOrRange * | 217 | ASIdOrRange * |
| 214 | d2i_ASIdOrRange(ASIdOrRange **a, const unsigned char **in, long len) | 218 | d2i_ASIdOrRange(ASIdOrRange **a, const unsigned char **in, long len) |
| @@ -216,24 +220,28 @@ d2i_ASIdOrRange(ASIdOrRange **a, const unsigned char **in, long len) | |||
| 216 | return (ASIdOrRange *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 220 | return (ASIdOrRange *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
| 217 | &ASIdOrRange_it); | 221 | &ASIdOrRange_it); |
| 218 | } | 222 | } |
| 223 | LCRYPTO_ALIAS(d2i_ASIdOrRange) | ||
| 219 | 224 | ||
| 220 | int | 225 | int |
| 221 | i2d_ASIdOrRange(ASIdOrRange *a, unsigned char **out) | 226 | i2d_ASIdOrRange(ASIdOrRange *a, unsigned char **out) |
| 222 | { | 227 | { |
| 223 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &ASIdOrRange_it); | 228 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &ASIdOrRange_it); |
| 224 | } | 229 | } |
| 230 | LCRYPTO_ALIAS(i2d_ASIdOrRange) | ||
| 225 | 231 | ||
| 226 | ASIdOrRange * | 232 | ASIdOrRange * |
| 227 | ASIdOrRange_new(void) | 233 | ASIdOrRange_new(void) |
| 228 | { | 234 | { |
| 229 | return (ASIdOrRange *)ASN1_item_new(&ASIdOrRange_it); | 235 | return (ASIdOrRange *)ASN1_item_new(&ASIdOrRange_it); |
| 230 | } | 236 | } |
| 237 | LCRYPTO_ALIAS(ASIdOrRange_new) | ||
| 231 | 238 | ||
| 232 | void | 239 | void |
| 233 | ASIdOrRange_free(ASIdOrRange *a) | 240 | ASIdOrRange_free(ASIdOrRange *a) |
| 234 | { | 241 | { |
| 235 | ASN1_item_free((ASN1_VALUE *)a, &ASIdOrRange_it); | 242 | ASN1_item_free((ASN1_VALUE *)a, &ASIdOrRange_it); |
| 236 | } | 243 | } |
| 244 | LCRYPTO_ALIAS(ASIdOrRange_free) | ||
| 237 | 245 | ||
| 238 | ASIdentifierChoice * | 246 | ASIdentifierChoice * |
| 239 | d2i_ASIdentifierChoice(ASIdentifierChoice **a, const unsigned char **in, | 247 | d2i_ASIdentifierChoice(ASIdentifierChoice **a, const unsigned char **in, |
| @@ -242,24 +250,28 @@ d2i_ASIdentifierChoice(ASIdentifierChoice **a, const unsigned char **in, | |||
| 242 | return (ASIdentifierChoice *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 250 | return (ASIdentifierChoice *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
| 243 | &ASIdentifierChoice_it); | 251 | &ASIdentifierChoice_it); |
| 244 | } | 252 | } |
| 253 | LCRYPTO_ALIAS(d2i_ASIdentifierChoice) | ||
| 245 | 254 | ||
| 246 | int | 255 | int |
| 247 | i2d_ASIdentifierChoice(ASIdentifierChoice *a, unsigned char **out) | 256 | i2d_ASIdentifierChoice(ASIdentifierChoice *a, unsigned char **out) |
| 248 | { | 257 | { |
| 249 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &ASIdentifierChoice_it); | 258 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &ASIdentifierChoice_it); |
| 250 | } | 259 | } |
| 260 | LCRYPTO_ALIAS(i2d_ASIdentifierChoice) | ||
| 251 | 261 | ||
| 252 | ASIdentifierChoice * | 262 | ASIdentifierChoice * |
| 253 | ASIdentifierChoice_new(void) | 263 | ASIdentifierChoice_new(void) |
| 254 | { | 264 | { |
| 255 | return (ASIdentifierChoice *)ASN1_item_new(&ASIdentifierChoice_it); | 265 | return (ASIdentifierChoice *)ASN1_item_new(&ASIdentifierChoice_it); |
| 256 | } | 266 | } |
| 267 | LCRYPTO_ALIAS(ASIdentifierChoice_new) | ||
| 257 | 268 | ||
| 258 | void | 269 | void |
| 259 | ASIdentifierChoice_free(ASIdentifierChoice *a) | 270 | ASIdentifierChoice_free(ASIdentifierChoice *a) |
| 260 | { | 271 | { |
| 261 | ASN1_item_free((ASN1_VALUE *)a, &ASIdentifierChoice_it); | 272 | ASN1_item_free((ASN1_VALUE *)a, &ASIdentifierChoice_it); |
| 262 | } | 273 | } |
| 274 | LCRYPTO_ALIAS(ASIdentifierChoice_free) | ||
| 263 | 275 | ||
| 264 | ASIdentifiers * | 276 | ASIdentifiers * |
| 265 | d2i_ASIdentifiers(ASIdentifiers **a, const unsigned char **in, long len) | 277 | d2i_ASIdentifiers(ASIdentifiers **a, const unsigned char **in, long len) |
| @@ -267,24 +279,28 @@ d2i_ASIdentifiers(ASIdentifiers **a, const unsigned char **in, long len) | |||
| 267 | return (ASIdentifiers *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 279 | return (ASIdentifiers *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
| 268 | &ASIdentifiers_it); | 280 | &ASIdentifiers_it); |
| 269 | } | 281 | } |
| 282 | LCRYPTO_ALIAS(d2i_ASIdentifiers) | ||
| 270 | 283 | ||
| 271 | int | 284 | int |
| 272 | i2d_ASIdentifiers(ASIdentifiers *a, unsigned char **out) | 285 | i2d_ASIdentifiers(ASIdentifiers *a, unsigned char **out) |
| 273 | { | 286 | { |
| 274 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &ASIdentifiers_it); | 287 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &ASIdentifiers_it); |
| 275 | } | 288 | } |
| 289 | LCRYPTO_ALIAS(i2d_ASIdentifiers) | ||
| 276 | 290 | ||
| 277 | ASIdentifiers * | 291 | ASIdentifiers * |
| 278 | ASIdentifiers_new(void) | 292 | ASIdentifiers_new(void) |
| 279 | { | 293 | { |
| 280 | return (ASIdentifiers *)ASN1_item_new(&ASIdentifiers_it); | 294 | return (ASIdentifiers *)ASN1_item_new(&ASIdentifiers_it); |
| 281 | } | 295 | } |
| 296 | LCRYPTO_ALIAS(ASIdentifiers_new) | ||
| 282 | 297 | ||
| 283 | void | 298 | void |
| 284 | ASIdentifiers_free(ASIdentifiers *a) | 299 | ASIdentifiers_free(ASIdentifiers *a) |
| 285 | { | 300 | { |
| 286 | ASN1_item_free((ASN1_VALUE *)a, &ASIdentifiers_it); | 301 | ASN1_item_free((ASN1_VALUE *)a, &ASIdentifiers_it); |
| 287 | } | 302 | } |
| 303 | LCRYPTO_ALIAS(ASIdentifiers_free) | ||
| 288 | 304 | ||
| 289 | /* | 305 | /* |
| 290 | * i2r method for an ASIdentifierChoice. | 306 | * i2r method for an ASIdentifierChoice. |
| @@ -412,6 +428,7 @@ X509v3_asid_add_inherit(ASIdentifiers *asid, int which) | |||
| 412 | } | 428 | } |
| 413 | return (*choice)->type == ASIdentifierChoice_inherit; | 429 | return (*choice)->type == ASIdentifierChoice_inherit; |
| 414 | } | 430 | } |
| 431 | LCRYPTO_ALIAS(X509v3_asid_add_inherit) | ||
| 415 | 432 | ||
| 416 | /* | 433 | /* |
| 417 | * Add an ID or range to an ASIdentifierChoice. | 434 | * Add an ID or range to an ASIdentifierChoice. |
| @@ -466,6 +483,7 @@ X509v3_asid_add_id_or_range(ASIdentifiers *asid, int which, ASN1_INTEGER *min, | |||
| 466 | ASIdOrRange_free(aor); | 483 | ASIdOrRange_free(aor); |
| 467 | return 0; | 484 | return 0; |
| 468 | } | 485 | } |
| 486 | LCRYPTO_ALIAS(X509v3_asid_add_id_or_range) | ||
| 469 | 487 | ||
| 470 | /* | 488 | /* |
| 471 | * Extract min and max values from an ASIdOrRange. | 489 | * Extract min and max values from an ASIdOrRange. |
| @@ -594,6 +612,7 @@ X509v3_asid_is_canonical(ASIdentifiers *asid) | |||
| 594 | (ASIdentifierChoice_is_canonical(asid->asnum) && | 612 | (ASIdentifierChoice_is_canonical(asid->asnum) && |
| 595 | ASIdentifierChoice_is_canonical(asid->rdi))); | 613 | ASIdentifierChoice_is_canonical(asid->rdi))); |
| 596 | } | 614 | } |
| 615 | LCRYPTO_ALIAS(X509v3_asid_is_canonical) | ||
| 597 | 616 | ||
| 598 | /* | 617 | /* |
| 599 | * Whack an ASIdentifierChoice into canonical form. | 618 | * Whack an ASIdentifierChoice into canonical form. |
| @@ -761,6 +780,7 @@ X509v3_asid_canonize(ASIdentifiers *asid) | |||
| 761 | 780 | ||
| 762 | return ASIdentifierChoice_canonize(asid->rdi); | 781 | return ASIdentifierChoice_canonize(asid->rdi); |
| 763 | } | 782 | } |
| 783 | LCRYPTO_ALIAS(X509v3_asid_canonize) | ||
| 764 | 784 | ||
| 765 | /* | 785 | /* |
| 766 | * v2i method for an ASIdentifier extension. | 786 | * v2i method for an ASIdentifier extension. |
| @@ -919,6 +939,7 @@ X509v3_asid_inherits(ASIdentifiers *asid) | |||
| 919 | 939 | ||
| 920 | return 0; | 940 | return 0; |
| 921 | } | 941 | } |
| 942 | LCRYPTO_ALIAS(X509v3_asid_inherits) | ||
| 922 | 943 | ||
| 923 | /* | 944 | /* |
| 924 | * Figure out whether parent contains child. | 945 | * Figure out whether parent contains child. |
| @@ -992,6 +1013,7 @@ X509v3_asid_subset(ASIdentifiers *child, ASIdentifiers *parent) | |||
| 992 | 1013 | ||
| 993 | return 1; | 1014 | return 1; |
| 994 | } | 1015 | } |
| 1016 | LCRYPTO_ALIAS(X509v3_asid_subset) | ||
| 995 | 1017 | ||
| 996 | /* | 1018 | /* |
| 997 | * Validation error handling via callback. | 1019 | * Validation error handling via callback. |
| @@ -1159,6 +1181,7 @@ X509v3_asid_validate_path(X509_STORE_CTX *ctx) | |||
| 1159 | } | 1181 | } |
| 1160 | return asid_validate_path_internal(ctx, ctx->chain, NULL); | 1182 | return asid_validate_path_internal(ctx, ctx->chain, NULL); |
| 1161 | } | 1183 | } |
| 1184 | LCRYPTO_ALIAS(X509v3_asid_validate_path) | ||
| 1162 | 1185 | ||
| 1163 | /* | 1186 | /* |
| 1164 | * RFC 3779 3.3 path validation of an extension. | 1187 | * RFC 3779 3.3 path validation of an extension. |
| @@ -1176,5 +1199,6 @@ X509v3_asid_validate_resource_set(STACK_OF(X509) *chain, ASIdentifiers *ext, | |||
| 1176 | return 0; | 1199 | return 0; |
| 1177 | return asid_validate_path_internal(NULL, chain, ext); | 1200 | return asid_validate_path_internal(NULL, chain, ext); |
| 1178 | } | 1201 | } |
| 1202 | LCRYPTO_ALIAS(X509v3_asid_validate_resource_set) | ||
| 1179 | 1203 | ||
| 1180 | #endif /* OPENSSL_NO_RFC3779 */ | 1204 | #endif /* OPENSSL_NO_RFC3779 */ |
