diff options
Diffstat (limited to 'src/lib/libcrypto/pkcs12/p12_asn.c')
| -rw-r--r-- | src/lib/libcrypto/pkcs12/p12_asn.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_asn.c b/src/lib/libcrypto/pkcs12/p12_asn.c index f8239eac62..c45482d5f1 100644 --- a/src/lib/libcrypto/pkcs12/p12_asn.c +++ b/src/lib/libcrypto/pkcs12/p12_asn.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: p12_asn.c,v 1.12 2022/08/20 09:16:18 tb Exp $ */ | 1 | /* $OpenBSD: p12_asn.c,v 1.13 2022/11/12 13:03:28 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 | */ |
| @@ -106,24 +106,28 @@ d2i_PKCS12(PKCS12 **a, const unsigned char **in, long len) | |||
| 106 | return (PKCS12 *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 106 | return (PKCS12 *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
| 107 | &PKCS12_it); | 107 | &PKCS12_it); |
| 108 | } | 108 | } |
| 109 | LCRYPTO_ALIAS(d2i_PKCS12) | ||
| 109 | 110 | ||
| 110 | int | 111 | int |
| 111 | i2d_PKCS12(PKCS12 *a, unsigned char **out) | 112 | i2d_PKCS12(PKCS12 *a, unsigned char **out) |
| 112 | { | 113 | { |
| 113 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &PKCS12_it); | 114 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &PKCS12_it); |
| 114 | } | 115 | } |
| 116 | LCRYPTO_ALIAS(i2d_PKCS12) | ||
| 115 | 117 | ||
| 116 | PKCS12 * | 118 | PKCS12 * |
| 117 | PKCS12_new(void) | 119 | PKCS12_new(void) |
| 118 | { | 120 | { |
| 119 | return (PKCS12 *)ASN1_item_new(&PKCS12_it); | 121 | return (PKCS12 *)ASN1_item_new(&PKCS12_it); |
| 120 | } | 122 | } |
| 123 | LCRYPTO_ALIAS(PKCS12_new) | ||
| 121 | 124 | ||
| 122 | void | 125 | void |
| 123 | PKCS12_free(PKCS12 *a) | 126 | PKCS12_free(PKCS12 *a) |
| 124 | { | 127 | { |
| 125 | ASN1_item_free((ASN1_VALUE *)a, &PKCS12_it); | 128 | ASN1_item_free((ASN1_VALUE *)a, &PKCS12_it); |
| 126 | } | 129 | } |
| 130 | LCRYPTO_ALIAS(PKCS12_free) | ||
| 127 | 131 | ||
| 128 | static const ASN1_TEMPLATE PKCS12_MAC_DATA_seq_tt[] = { | 132 | static const ASN1_TEMPLATE PKCS12_MAC_DATA_seq_tt[] = { |
| 129 | { | 133 | { |
| @@ -166,24 +170,28 @@ d2i_PKCS12_MAC_DATA(PKCS12_MAC_DATA **a, const unsigned char **in, long len) | |||
| 166 | return (PKCS12_MAC_DATA *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 170 | return (PKCS12_MAC_DATA *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
| 167 | &PKCS12_MAC_DATA_it); | 171 | &PKCS12_MAC_DATA_it); |
| 168 | } | 172 | } |
| 173 | LCRYPTO_ALIAS(d2i_PKCS12_MAC_DATA) | ||
| 169 | 174 | ||
| 170 | int | 175 | int |
| 171 | i2d_PKCS12_MAC_DATA(PKCS12_MAC_DATA *a, unsigned char **out) | 176 | i2d_PKCS12_MAC_DATA(PKCS12_MAC_DATA *a, unsigned char **out) |
| 172 | { | 177 | { |
| 173 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &PKCS12_MAC_DATA_it); | 178 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &PKCS12_MAC_DATA_it); |
| 174 | } | 179 | } |
| 180 | LCRYPTO_ALIAS(i2d_PKCS12_MAC_DATA) | ||
| 175 | 181 | ||
| 176 | PKCS12_MAC_DATA * | 182 | PKCS12_MAC_DATA * |
| 177 | PKCS12_MAC_DATA_new(void) | 183 | PKCS12_MAC_DATA_new(void) |
| 178 | { | 184 | { |
| 179 | return (PKCS12_MAC_DATA *)ASN1_item_new(&PKCS12_MAC_DATA_it); | 185 | return (PKCS12_MAC_DATA *)ASN1_item_new(&PKCS12_MAC_DATA_it); |
| 180 | } | 186 | } |
| 187 | LCRYPTO_ALIAS(PKCS12_MAC_DATA_new) | ||
| 181 | 188 | ||
| 182 | void | 189 | void |
| 183 | PKCS12_MAC_DATA_free(PKCS12_MAC_DATA *a) | 190 | PKCS12_MAC_DATA_free(PKCS12_MAC_DATA *a) |
| 184 | { | 191 | { |
| 185 | ASN1_item_free((ASN1_VALUE *)a, &PKCS12_MAC_DATA_it); | 192 | ASN1_item_free((ASN1_VALUE *)a, &PKCS12_MAC_DATA_it); |
| 186 | } | 193 | } |
| 194 | LCRYPTO_ALIAS(PKCS12_MAC_DATA_free) | ||
| 187 | 195 | ||
| 188 | static const ASN1_TEMPLATE bag_default_tt = { | 196 | static const ASN1_TEMPLATE bag_default_tt = { |
| 189 | .flags = ASN1_TFLG_EXPLICIT, | 197 | .flags = ASN1_TFLG_EXPLICIT, |
| @@ -272,24 +280,28 @@ d2i_PKCS12_BAGS(PKCS12_BAGS **a, const unsigned char **in, long len) | |||
| 272 | return (PKCS12_BAGS *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 280 | return (PKCS12_BAGS *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
| 273 | &PKCS12_BAGS_it); | 281 | &PKCS12_BAGS_it); |
| 274 | } | 282 | } |
| 283 | LCRYPTO_ALIAS(d2i_PKCS12_BAGS) | ||
| 275 | 284 | ||
| 276 | int | 285 | int |
| 277 | i2d_PKCS12_BAGS(PKCS12_BAGS *a, unsigned char **out) | 286 | i2d_PKCS12_BAGS(PKCS12_BAGS *a, unsigned char **out) |
| 278 | { | 287 | { |
| 279 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &PKCS12_BAGS_it); | 288 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &PKCS12_BAGS_it); |
| 280 | } | 289 | } |
| 290 | LCRYPTO_ALIAS(i2d_PKCS12_BAGS) | ||
| 281 | 291 | ||
| 282 | PKCS12_BAGS * | 292 | PKCS12_BAGS * |
| 283 | PKCS12_BAGS_new(void) | 293 | PKCS12_BAGS_new(void) |
| 284 | { | 294 | { |
| 285 | return (PKCS12_BAGS *)ASN1_item_new(&PKCS12_BAGS_it); | 295 | return (PKCS12_BAGS *)ASN1_item_new(&PKCS12_BAGS_it); |
| 286 | } | 296 | } |
| 297 | LCRYPTO_ALIAS(PKCS12_BAGS_new) | ||
| 287 | 298 | ||
| 288 | void | 299 | void |
| 289 | PKCS12_BAGS_free(PKCS12_BAGS *a) | 300 | PKCS12_BAGS_free(PKCS12_BAGS *a) |
| 290 | { | 301 | { |
| 291 | ASN1_item_free((ASN1_VALUE *)a, &PKCS12_BAGS_it); | 302 | ASN1_item_free((ASN1_VALUE *)a, &PKCS12_BAGS_it); |
| 292 | } | 303 | } |
| 304 | LCRYPTO_ALIAS(PKCS12_BAGS_free) | ||
| 293 | 305 | ||
| 294 | static const ASN1_TEMPLATE safebag_default_tt = { | 306 | static const ASN1_TEMPLATE safebag_default_tt = { |
| 295 | .flags = ASN1_TFLG_EXPLICIT, | 307 | .flags = ASN1_TFLG_EXPLICIT, |
| @@ -417,24 +429,28 @@ d2i_PKCS12_SAFEBAG(PKCS12_SAFEBAG **a, const unsigned char **in, long len) | |||
| 417 | return (PKCS12_SAFEBAG *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 429 | return (PKCS12_SAFEBAG *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
| 418 | &PKCS12_SAFEBAG_it); | 430 | &PKCS12_SAFEBAG_it); |
| 419 | } | 431 | } |
| 432 | LCRYPTO_ALIAS(d2i_PKCS12_SAFEBAG) | ||
| 420 | 433 | ||
| 421 | int | 434 | int |
| 422 | i2d_PKCS12_SAFEBAG(PKCS12_SAFEBAG *a, unsigned char **out) | 435 | i2d_PKCS12_SAFEBAG(PKCS12_SAFEBAG *a, unsigned char **out) |
| 423 | { | 436 | { |
| 424 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &PKCS12_SAFEBAG_it); | 437 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &PKCS12_SAFEBAG_it); |
| 425 | } | 438 | } |
| 439 | LCRYPTO_ALIAS(i2d_PKCS12_SAFEBAG) | ||
| 426 | 440 | ||
| 427 | PKCS12_SAFEBAG * | 441 | PKCS12_SAFEBAG * |
| 428 | PKCS12_SAFEBAG_new(void) | 442 | PKCS12_SAFEBAG_new(void) |
| 429 | { | 443 | { |
| 430 | return (PKCS12_SAFEBAG *)ASN1_item_new(&PKCS12_SAFEBAG_it); | 444 | return (PKCS12_SAFEBAG *)ASN1_item_new(&PKCS12_SAFEBAG_it); |
| 431 | } | 445 | } |
| 446 | LCRYPTO_ALIAS(PKCS12_SAFEBAG_new) | ||
| 432 | 447 | ||
| 433 | void | 448 | void |
| 434 | PKCS12_SAFEBAG_free(PKCS12_SAFEBAG *a) | 449 | PKCS12_SAFEBAG_free(PKCS12_SAFEBAG *a) |
| 435 | { | 450 | { |
| 436 | ASN1_item_free((ASN1_VALUE *)a, &PKCS12_SAFEBAG_it); | 451 | ASN1_item_free((ASN1_VALUE *)a, &PKCS12_SAFEBAG_it); |
| 437 | } | 452 | } |
| 453 | LCRYPTO_ALIAS(PKCS12_SAFEBAG_free) | ||
| 438 | 454 | ||
| 439 | /* SEQUENCE OF SafeBag */ | 455 | /* SEQUENCE OF SafeBag */ |
| 440 | static const ASN1_TEMPLATE PKCS12_SAFEBAGS_item_tt = { | 456 | static const ASN1_TEMPLATE PKCS12_SAFEBAGS_item_tt = { |
| @@ -473,4 +489,3 @@ const ASN1_ITEM PKCS12_AUTHSAFES_it = { | |||
| 473 | .size = 0, | 489 | .size = 0, |
| 474 | .sname = "PKCS12_AUTHSAFES", | 490 | .sname = "PKCS12_AUTHSAFES", |
| 475 | }; | 491 | }; |
| 476 | |||
