diff options
Diffstat (limited to 'src/lib/libcrypto/pkcs12/p12_asn.c')
-rw-r--r-- | src/lib/libcrypto/pkcs12/p12_asn.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_asn.c b/src/lib/libcrypto/pkcs12/p12_asn.c index c45482d5f1..a9decccb5b 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.13 2022/11/12 13:03:28 beck Exp $ */ | 1 | /* $OpenBSD: p12_asn.c,v 1.14 2023/02/16 08:38:17 tb 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,28 +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 | LCRYPTO_ALIAS(d2i_PKCS12); |
110 | 110 | ||
111 | int | 111 | int |
112 | i2d_PKCS12(PKCS12 *a, unsigned char **out) | 112 | i2d_PKCS12(PKCS12 *a, unsigned char **out) |
113 | { | 113 | { |
114 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &PKCS12_it); | 114 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &PKCS12_it); |
115 | } | 115 | } |
116 | LCRYPTO_ALIAS(i2d_PKCS12) | 116 | LCRYPTO_ALIAS(i2d_PKCS12); |
117 | 117 | ||
118 | PKCS12 * | 118 | PKCS12 * |
119 | PKCS12_new(void) | 119 | PKCS12_new(void) |
120 | { | 120 | { |
121 | return (PKCS12 *)ASN1_item_new(&PKCS12_it); | 121 | return (PKCS12 *)ASN1_item_new(&PKCS12_it); |
122 | } | 122 | } |
123 | LCRYPTO_ALIAS(PKCS12_new) | 123 | LCRYPTO_ALIAS(PKCS12_new); |
124 | 124 | ||
125 | void | 125 | void |
126 | PKCS12_free(PKCS12 *a) | 126 | PKCS12_free(PKCS12 *a) |
127 | { | 127 | { |
128 | ASN1_item_free((ASN1_VALUE *)a, &PKCS12_it); | 128 | ASN1_item_free((ASN1_VALUE *)a, &PKCS12_it); |
129 | } | 129 | } |
130 | LCRYPTO_ALIAS(PKCS12_free) | 130 | LCRYPTO_ALIAS(PKCS12_free); |
131 | 131 | ||
132 | static const ASN1_TEMPLATE PKCS12_MAC_DATA_seq_tt[] = { | 132 | static const ASN1_TEMPLATE PKCS12_MAC_DATA_seq_tt[] = { |
133 | { | 133 | { |
@@ -170,28 +170,28 @@ d2i_PKCS12_MAC_DATA(PKCS12_MAC_DATA **a, const unsigned char **in, long len) | |||
170 | 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, |
171 | &PKCS12_MAC_DATA_it); | 171 | &PKCS12_MAC_DATA_it); |
172 | } | 172 | } |
173 | LCRYPTO_ALIAS(d2i_PKCS12_MAC_DATA) | 173 | LCRYPTO_ALIAS(d2i_PKCS12_MAC_DATA); |
174 | 174 | ||
175 | int | 175 | int |
176 | i2d_PKCS12_MAC_DATA(PKCS12_MAC_DATA *a, unsigned char **out) | 176 | i2d_PKCS12_MAC_DATA(PKCS12_MAC_DATA *a, unsigned char **out) |
177 | { | 177 | { |
178 | 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); |
179 | } | 179 | } |
180 | LCRYPTO_ALIAS(i2d_PKCS12_MAC_DATA) | 180 | LCRYPTO_ALIAS(i2d_PKCS12_MAC_DATA); |
181 | 181 | ||
182 | PKCS12_MAC_DATA * | 182 | PKCS12_MAC_DATA * |
183 | PKCS12_MAC_DATA_new(void) | 183 | PKCS12_MAC_DATA_new(void) |
184 | { | 184 | { |
185 | return (PKCS12_MAC_DATA *)ASN1_item_new(&PKCS12_MAC_DATA_it); | 185 | return (PKCS12_MAC_DATA *)ASN1_item_new(&PKCS12_MAC_DATA_it); |
186 | } | 186 | } |
187 | LCRYPTO_ALIAS(PKCS12_MAC_DATA_new) | 187 | LCRYPTO_ALIAS(PKCS12_MAC_DATA_new); |
188 | 188 | ||
189 | void | 189 | void |
190 | PKCS12_MAC_DATA_free(PKCS12_MAC_DATA *a) | 190 | PKCS12_MAC_DATA_free(PKCS12_MAC_DATA *a) |
191 | { | 191 | { |
192 | ASN1_item_free((ASN1_VALUE *)a, &PKCS12_MAC_DATA_it); | 192 | ASN1_item_free((ASN1_VALUE *)a, &PKCS12_MAC_DATA_it); |
193 | } | 193 | } |
194 | LCRYPTO_ALIAS(PKCS12_MAC_DATA_free) | 194 | LCRYPTO_ALIAS(PKCS12_MAC_DATA_free); |
195 | 195 | ||
196 | static const ASN1_TEMPLATE bag_default_tt = { | 196 | static const ASN1_TEMPLATE bag_default_tt = { |
197 | .flags = ASN1_TFLG_EXPLICIT, | 197 | .flags = ASN1_TFLG_EXPLICIT, |
@@ -280,28 +280,28 @@ d2i_PKCS12_BAGS(PKCS12_BAGS **a, const unsigned char **in, long len) | |||
280 | return (PKCS12_BAGS *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 280 | return (PKCS12_BAGS *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
281 | &PKCS12_BAGS_it); | 281 | &PKCS12_BAGS_it); |
282 | } | 282 | } |
283 | LCRYPTO_ALIAS(d2i_PKCS12_BAGS) | 283 | LCRYPTO_ALIAS(d2i_PKCS12_BAGS); |
284 | 284 | ||
285 | int | 285 | int |
286 | i2d_PKCS12_BAGS(PKCS12_BAGS *a, unsigned char **out) | 286 | i2d_PKCS12_BAGS(PKCS12_BAGS *a, unsigned char **out) |
287 | { | 287 | { |
288 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &PKCS12_BAGS_it); | 288 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &PKCS12_BAGS_it); |
289 | } | 289 | } |
290 | LCRYPTO_ALIAS(i2d_PKCS12_BAGS) | 290 | LCRYPTO_ALIAS(i2d_PKCS12_BAGS); |
291 | 291 | ||
292 | PKCS12_BAGS * | 292 | PKCS12_BAGS * |
293 | PKCS12_BAGS_new(void) | 293 | PKCS12_BAGS_new(void) |
294 | { | 294 | { |
295 | return (PKCS12_BAGS *)ASN1_item_new(&PKCS12_BAGS_it); | 295 | return (PKCS12_BAGS *)ASN1_item_new(&PKCS12_BAGS_it); |
296 | } | 296 | } |
297 | LCRYPTO_ALIAS(PKCS12_BAGS_new) | 297 | LCRYPTO_ALIAS(PKCS12_BAGS_new); |
298 | 298 | ||
299 | void | 299 | void |
300 | PKCS12_BAGS_free(PKCS12_BAGS *a) | 300 | PKCS12_BAGS_free(PKCS12_BAGS *a) |
301 | { | 301 | { |
302 | ASN1_item_free((ASN1_VALUE *)a, &PKCS12_BAGS_it); | 302 | ASN1_item_free((ASN1_VALUE *)a, &PKCS12_BAGS_it); |
303 | } | 303 | } |
304 | LCRYPTO_ALIAS(PKCS12_BAGS_free) | 304 | LCRYPTO_ALIAS(PKCS12_BAGS_free); |
305 | 305 | ||
306 | static const ASN1_TEMPLATE safebag_default_tt = { | 306 | static const ASN1_TEMPLATE safebag_default_tt = { |
307 | .flags = ASN1_TFLG_EXPLICIT, | 307 | .flags = ASN1_TFLG_EXPLICIT, |
@@ -429,28 +429,28 @@ d2i_PKCS12_SAFEBAG(PKCS12_SAFEBAG **a, const unsigned char **in, long len) | |||
429 | return (PKCS12_SAFEBAG *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 429 | return (PKCS12_SAFEBAG *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
430 | &PKCS12_SAFEBAG_it); | 430 | &PKCS12_SAFEBAG_it); |
431 | } | 431 | } |
432 | LCRYPTO_ALIAS(d2i_PKCS12_SAFEBAG) | 432 | LCRYPTO_ALIAS(d2i_PKCS12_SAFEBAG); |
433 | 433 | ||
434 | int | 434 | int |
435 | i2d_PKCS12_SAFEBAG(PKCS12_SAFEBAG *a, unsigned char **out) | 435 | i2d_PKCS12_SAFEBAG(PKCS12_SAFEBAG *a, unsigned char **out) |
436 | { | 436 | { |
437 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &PKCS12_SAFEBAG_it); | 437 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &PKCS12_SAFEBAG_it); |
438 | } | 438 | } |
439 | LCRYPTO_ALIAS(i2d_PKCS12_SAFEBAG) | 439 | LCRYPTO_ALIAS(i2d_PKCS12_SAFEBAG); |
440 | 440 | ||
441 | PKCS12_SAFEBAG * | 441 | PKCS12_SAFEBAG * |
442 | PKCS12_SAFEBAG_new(void) | 442 | PKCS12_SAFEBAG_new(void) |
443 | { | 443 | { |
444 | return (PKCS12_SAFEBAG *)ASN1_item_new(&PKCS12_SAFEBAG_it); | 444 | return (PKCS12_SAFEBAG *)ASN1_item_new(&PKCS12_SAFEBAG_it); |
445 | } | 445 | } |
446 | LCRYPTO_ALIAS(PKCS12_SAFEBAG_new) | 446 | LCRYPTO_ALIAS(PKCS12_SAFEBAG_new); |
447 | 447 | ||
448 | void | 448 | void |
449 | PKCS12_SAFEBAG_free(PKCS12_SAFEBAG *a) | 449 | PKCS12_SAFEBAG_free(PKCS12_SAFEBAG *a) |
450 | { | 450 | { |
451 | ASN1_item_free((ASN1_VALUE *)a, &PKCS12_SAFEBAG_it); | 451 | ASN1_item_free((ASN1_VALUE *)a, &PKCS12_SAFEBAG_it); |
452 | } | 452 | } |
453 | LCRYPTO_ALIAS(PKCS12_SAFEBAG_free) | 453 | LCRYPTO_ALIAS(PKCS12_SAFEBAG_free); |
454 | 454 | ||
455 | /* SEQUENCE OF SafeBag */ | 455 | /* SEQUENCE OF SafeBag */ |
456 | static const ASN1_TEMPLATE PKCS12_SAFEBAGS_item_tt = { | 456 | static const ASN1_TEMPLATE PKCS12_SAFEBAGS_item_tt = { |