diff options
Diffstat (limited to 'src/lib/libcrypto/x509/x509_genn.c')
| -rw-r--r-- | src/lib/libcrypto/x509/x509_genn.c | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/src/lib/libcrypto/x509/x509_genn.c b/src/lib/libcrypto/x509/x509_genn.c index dadf6f1e40..ce1fb6cc02 100644 --- a/src/lib/libcrypto/x509/x509_genn.c +++ b/src/lib/libcrypto/x509/x509_genn.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509_genn.c,v 1.2 2020/12/08 15:06:42 tb Exp $ */ | 1 | /* $OpenBSD: x509_genn.c,v 1.3 2022/11/14 17:48:50 beck Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 1999. | 3 | * project 1999. |
| 4 | */ | 4 | */ |
| @@ -98,24 +98,28 @@ d2i_OTHERNAME(OTHERNAME **a, const unsigned char **in, long len) | |||
| 98 | return (OTHERNAME *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 98 | return (OTHERNAME *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
| 99 | &OTHERNAME_it); | 99 | &OTHERNAME_it); |
| 100 | } | 100 | } |
| 101 | LCRYPTO_ALIAS(d2i_OTHERNAME) | ||
| 101 | 102 | ||
| 102 | int | 103 | int |
| 103 | i2d_OTHERNAME(OTHERNAME *a, unsigned char **out) | 104 | i2d_OTHERNAME(OTHERNAME *a, unsigned char **out) |
| 104 | { | 105 | { |
| 105 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &OTHERNAME_it); | 106 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &OTHERNAME_it); |
| 106 | } | 107 | } |
| 108 | LCRYPTO_ALIAS(i2d_OTHERNAME) | ||
| 107 | 109 | ||
| 108 | OTHERNAME * | 110 | OTHERNAME * |
| 109 | OTHERNAME_new(void) | 111 | OTHERNAME_new(void) |
| 110 | { | 112 | { |
| 111 | return (OTHERNAME *)ASN1_item_new(&OTHERNAME_it); | 113 | return (OTHERNAME *)ASN1_item_new(&OTHERNAME_it); |
| 112 | } | 114 | } |
| 115 | LCRYPTO_ALIAS(OTHERNAME_new) | ||
| 113 | 116 | ||
| 114 | void | 117 | void |
| 115 | OTHERNAME_free(OTHERNAME *a) | 118 | OTHERNAME_free(OTHERNAME *a) |
| 116 | { | 119 | { |
| 117 | ASN1_item_free((ASN1_VALUE *)a, &OTHERNAME_it); | 120 | ASN1_item_free((ASN1_VALUE *)a, &OTHERNAME_it); |
| 118 | } | 121 | } |
| 122 | LCRYPTO_ALIAS(OTHERNAME_free) | ||
| 119 | 123 | ||
| 120 | /* Uses explicit tagging since DIRECTORYSTRING is a CHOICE type */ | 124 | /* Uses explicit tagging since DIRECTORYSTRING is a CHOICE type */ |
| 121 | static const ASN1_TEMPLATE EDIPARTYNAME_seq_tt[] = { | 125 | static const ASN1_TEMPLATE EDIPARTYNAME_seq_tt[] = { |
| @@ -152,24 +156,28 @@ d2i_EDIPARTYNAME(EDIPARTYNAME **a, const unsigned char **in, long len) | |||
| 152 | return (EDIPARTYNAME *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 156 | return (EDIPARTYNAME *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
| 153 | &EDIPARTYNAME_it); | 157 | &EDIPARTYNAME_it); |
| 154 | } | 158 | } |
| 159 | LCRYPTO_ALIAS(d2i_EDIPARTYNAME) | ||
| 155 | 160 | ||
| 156 | int | 161 | int |
| 157 | i2d_EDIPARTYNAME(EDIPARTYNAME *a, unsigned char **out) | 162 | i2d_EDIPARTYNAME(EDIPARTYNAME *a, unsigned char **out) |
| 158 | { | 163 | { |
| 159 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &EDIPARTYNAME_it); | 164 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &EDIPARTYNAME_it); |
| 160 | } | 165 | } |
| 166 | LCRYPTO_ALIAS(i2d_EDIPARTYNAME) | ||
| 161 | 167 | ||
| 162 | EDIPARTYNAME * | 168 | EDIPARTYNAME * |
| 163 | EDIPARTYNAME_new(void) | 169 | EDIPARTYNAME_new(void) |
| 164 | { | 170 | { |
| 165 | return (EDIPARTYNAME *)ASN1_item_new(&EDIPARTYNAME_it); | 171 | return (EDIPARTYNAME *)ASN1_item_new(&EDIPARTYNAME_it); |
| 166 | } | 172 | } |
| 173 | LCRYPTO_ALIAS(EDIPARTYNAME_new) | ||
| 167 | 174 | ||
| 168 | void | 175 | void |
| 169 | EDIPARTYNAME_free(EDIPARTYNAME *a) | 176 | EDIPARTYNAME_free(EDIPARTYNAME *a) |
| 170 | { | 177 | { |
| 171 | ASN1_item_free((ASN1_VALUE *)a, &EDIPARTYNAME_it); | 178 | ASN1_item_free((ASN1_VALUE *)a, &EDIPARTYNAME_it); |
| 172 | } | 179 | } |
| 180 | LCRYPTO_ALIAS(EDIPARTYNAME_free) | ||
| 173 | 181 | ||
| 174 | static const ASN1_TEMPLATE GENERAL_NAME_ch_tt[] = { | 182 | static const ASN1_TEMPLATE GENERAL_NAME_ch_tt[] = { |
| 175 | { | 183 | { |
| @@ -256,24 +264,28 @@ d2i_GENERAL_NAME(GENERAL_NAME **a, const unsigned char **in, long len) | |||
| 256 | return (GENERAL_NAME *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 264 | return (GENERAL_NAME *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
| 257 | &GENERAL_NAME_it); | 265 | &GENERAL_NAME_it); |
| 258 | } | 266 | } |
| 267 | LCRYPTO_ALIAS(d2i_GENERAL_NAME) | ||
| 259 | 268 | ||
| 260 | int | 269 | int |
| 261 | i2d_GENERAL_NAME(GENERAL_NAME *a, unsigned char **out) | 270 | i2d_GENERAL_NAME(GENERAL_NAME *a, unsigned char **out) |
| 262 | { | 271 | { |
| 263 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &GENERAL_NAME_it); | 272 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &GENERAL_NAME_it); |
| 264 | } | 273 | } |
| 274 | LCRYPTO_ALIAS(i2d_GENERAL_NAME) | ||
| 265 | 275 | ||
| 266 | GENERAL_NAME * | 276 | GENERAL_NAME * |
| 267 | GENERAL_NAME_new(void) | 277 | GENERAL_NAME_new(void) |
| 268 | { | 278 | { |
| 269 | return (GENERAL_NAME *)ASN1_item_new(&GENERAL_NAME_it); | 279 | return (GENERAL_NAME *)ASN1_item_new(&GENERAL_NAME_it); |
| 270 | } | 280 | } |
| 281 | LCRYPTO_ALIAS(GENERAL_NAME_new) | ||
| 271 | 282 | ||
| 272 | void | 283 | void |
| 273 | GENERAL_NAME_free(GENERAL_NAME *a) | 284 | GENERAL_NAME_free(GENERAL_NAME *a) |
| 274 | { | 285 | { |
| 275 | ASN1_item_free((ASN1_VALUE *)a, &GENERAL_NAME_it); | 286 | ASN1_item_free((ASN1_VALUE *)a, &GENERAL_NAME_it); |
| 276 | } | 287 | } |
| 288 | LCRYPTO_ALIAS(GENERAL_NAME_free) | ||
| 277 | 289 | ||
| 278 | static const ASN1_TEMPLATE GENERAL_NAMES_item_tt = { | 290 | static const ASN1_TEMPLATE GENERAL_NAMES_item_tt = { |
| 279 | .flags = ASN1_TFLG_SEQUENCE_OF, | 291 | .flags = ASN1_TFLG_SEQUENCE_OF, |
| @@ -300,30 +312,35 @@ d2i_GENERAL_NAMES(GENERAL_NAMES **a, const unsigned char **in, long len) | |||
| 300 | return (GENERAL_NAMES *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 312 | return (GENERAL_NAMES *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
| 301 | &GENERAL_NAMES_it); | 313 | &GENERAL_NAMES_it); |
| 302 | } | 314 | } |
| 315 | LCRYPTO_ALIAS(d2i_GENERAL_NAMES) | ||
| 303 | 316 | ||
| 304 | int | 317 | int |
| 305 | i2d_GENERAL_NAMES(GENERAL_NAMES *a, unsigned char **out) | 318 | i2d_GENERAL_NAMES(GENERAL_NAMES *a, unsigned char **out) |
| 306 | { | 319 | { |
| 307 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &GENERAL_NAMES_it); | 320 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &GENERAL_NAMES_it); |
| 308 | } | 321 | } |
| 322 | LCRYPTO_ALIAS(i2d_GENERAL_NAMES) | ||
| 309 | 323 | ||
| 310 | GENERAL_NAMES * | 324 | GENERAL_NAMES * |
| 311 | GENERAL_NAMES_new(void) | 325 | GENERAL_NAMES_new(void) |
| 312 | { | 326 | { |
| 313 | return (GENERAL_NAMES *)ASN1_item_new(&GENERAL_NAMES_it); | 327 | return (GENERAL_NAMES *)ASN1_item_new(&GENERAL_NAMES_it); |
| 314 | } | 328 | } |
| 329 | LCRYPTO_ALIAS(GENERAL_NAMES_new) | ||
| 315 | 330 | ||
| 316 | void | 331 | void |
| 317 | GENERAL_NAMES_free(GENERAL_NAMES *a) | 332 | GENERAL_NAMES_free(GENERAL_NAMES *a) |
| 318 | { | 333 | { |
| 319 | ASN1_item_free((ASN1_VALUE *)a, &GENERAL_NAMES_it); | 334 | ASN1_item_free((ASN1_VALUE *)a, &GENERAL_NAMES_it); |
| 320 | } | 335 | } |
| 336 | LCRYPTO_ALIAS(GENERAL_NAMES_free) | ||
| 321 | 337 | ||
| 322 | GENERAL_NAME * | 338 | GENERAL_NAME * |
| 323 | GENERAL_NAME_dup(GENERAL_NAME *a) | 339 | GENERAL_NAME_dup(GENERAL_NAME *a) |
| 324 | { | 340 | { |
| 325 | return ASN1_item_dup(&GENERAL_NAME_it, a); | 341 | return ASN1_item_dup(&GENERAL_NAME_it, a); |
| 326 | } | 342 | } |
| 343 | LCRYPTO_ALIAS(GENERAL_NAME_dup) | ||
| 327 | 344 | ||
| 328 | static int | 345 | static int |
| 329 | EDIPARTYNAME_cmp(const EDIPARTYNAME *a, const EDIPARTYNAME *b) | 346 | EDIPARTYNAME_cmp(const EDIPARTYNAME *a, const EDIPARTYNAME *b) |
| @@ -397,6 +414,7 @@ GENERAL_NAME_cmp(GENERAL_NAME *a, GENERAL_NAME *b) | |||
| 397 | } | 414 | } |
| 398 | return result; | 415 | return result; |
| 399 | } | 416 | } |
| 417 | LCRYPTO_ALIAS(GENERAL_NAME_cmp) | ||
| 400 | 418 | ||
| 401 | /* Returns 0 if they are equal, != 0 otherwise. */ | 419 | /* Returns 0 if they are equal, != 0 otherwise. */ |
| 402 | int | 420 | int |
| @@ -413,6 +431,7 @@ OTHERNAME_cmp(OTHERNAME *a, OTHERNAME *b) | |||
| 413 | result = ASN1_TYPE_cmp(a->value, b->value); | 431 | result = ASN1_TYPE_cmp(a->value, b->value); |
| 414 | return result; | 432 | return result; |
| 415 | } | 433 | } |
| 434 | LCRYPTO_ALIAS(OTHERNAME_cmp) | ||
| 416 | 435 | ||
| 417 | void | 436 | void |
| 418 | GENERAL_NAME_set0_value(GENERAL_NAME *a, int type, void *value) | 437 | GENERAL_NAME_set0_value(GENERAL_NAME *a, int type, void *value) |
| @@ -450,6 +469,7 @@ GENERAL_NAME_set0_value(GENERAL_NAME *a, int type, void *value) | |||
| 450 | } | 469 | } |
| 451 | a->type = type; | 470 | a->type = type; |
| 452 | } | 471 | } |
| 472 | LCRYPTO_ALIAS(GENERAL_NAME_set0_value) | ||
| 453 | 473 | ||
| 454 | void * | 474 | void * |
| 455 | GENERAL_NAME_get0_value(GENERAL_NAME *a, int *ptype) | 475 | GENERAL_NAME_get0_value(GENERAL_NAME *a, int *ptype) |
| @@ -484,6 +504,7 @@ GENERAL_NAME_get0_value(GENERAL_NAME *a, int *ptype) | |||
| 484 | return NULL; | 504 | return NULL; |
| 485 | } | 505 | } |
| 486 | } | 506 | } |
| 507 | LCRYPTO_ALIAS(GENERAL_NAME_get0_value) | ||
| 487 | 508 | ||
| 488 | int | 509 | int |
| 489 | GENERAL_NAME_set0_othername(GENERAL_NAME *gen, ASN1_OBJECT *oid, | 510 | GENERAL_NAME_set0_othername(GENERAL_NAME *gen, ASN1_OBJECT *oid, |
| @@ -499,6 +520,7 @@ GENERAL_NAME_set0_othername(GENERAL_NAME *gen, ASN1_OBJECT *oid, | |||
| 499 | GENERAL_NAME_set0_value(gen, GEN_OTHERNAME, oth); | 520 | GENERAL_NAME_set0_value(gen, GEN_OTHERNAME, oth); |
| 500 | return 1; | 521 | return 1; |
| 501 | } | 522 | } |
| 523 | LCRYPTO_ALIAS(GENERAL_NAME_set0_othername) | ||
| 502 | 524 | ||
| 503 | int | 525 | int |
| 504 | GENERAL_NAME_get0_otherName(GENERAL_NAME *gen, ASN1_OBJECT **poid, | 526 | GENERAL_NAME_get0_otherName(GENERAL_NAME *gen, ASN1_OBJECT **poid, |
| @@ -512,3 +534,4 @@ GENERAL_NAME_get0_otherName(GENERAL_NAME *gen, ASN1_OBJECT **poid, | |||
| 512 | *pvalue = gen->d.otherName->value; | 534 | *pvalue = gen->d.otherName->value; |
| 513 | return 1; | 535 | return 1; |
| 514 | } | 536 | } |
| 537 | LCRYPTO_ALIAS(GENERAL_NAME_get0_otherName) | ||
