summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/pkcs12/p12_asn.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/pkcs12/p12_asn.c')
-rw-r--r--src/lib/libcrypto/pkcs12/p12_asn.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_asn.c b/src/lib/libcrypto/pkcs12/p12_asn.c
index a9decccb5b..e6078050be 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.14 2023/02/16 08:38:17 tb Exp $ */ 1/* $OpenBSD: p12_asn.c,v 1.15 2024/03/02 10:15:16 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 */
@@ -170,28 +170,24 @@ 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}
173LCRYPTO_ALIAS(d2i_PKCS12_MAC_DATA);
174 173
175int 174int
176i2d_PKCS12_MAC_DATA(PKCS12_MAC_DATA *a, unsigned char **out) 175i2d_PKCS12_MAC_DATA(PKCS12_MAC_DATA *a, unsigned char **out)
177{ 176{
178 return ASN1_item_i2d((ASN1_VALUE *)a, out, &PKCS12_MAC_DATA_it); 177 return ASN1_item_i2d((ASN1_VALUE *)a, out, &PKCS12_MAC_DATA_it);
179} 178}
180LCRYPTO_ALIAS(i2d_PKCS12_MAC_DATA);
181 179
182PKCS12_MAC_DATA * 180PKCS12_MAC_DATA *
183PKCS12_MAC_DATA_new(void) 181PKCS12_MAC_DATA_new(void)
184{ 182{
185 return (PKCS12_MAC_DATA *)ASN1_item_new(&PKCS12_MAC_DATA_it); 183 return (PKCS12_MAC_DATA *)ASN1_item_new(&PKCS12_MAC_DATA_it);
186} 184}
187LCRYPTO_ALIAS(PKCS12_MAC_DATA_new);
188 185
189void 186void
190PKCS12_MAC_DATA_free(PKCS12_MAC_DATA *a) 187PKCS12_MAC_DATA_free(PKCS12_MAC_DATA *a)
191{ 188{
192 ASN1_item_free((ASN1_VALUE *)a, &PKCS12_MAC_DATA_it); 189 ASN1_item_free((ASN1_VALUE *)a, &PKCS12_MAC_DATA_it);
193} 190}
194LCRYPTO_ALIAS(PKCS12_MAC_DATA_free);
195 191
196static const ASN1_TEMPLATE bag_default_tt = { 192static const ASN1_TEMPLATE bag_default_tt = {
197 .flags = ASN1_TFLG_EXPLICIT, 193 .flags = ASN1_TFLG_EXPLICIT,
@@ -280,28 +276,24 @@ d2i_PKCS12_BAGS(PKCS12_BAGS **a, const unsigned char **in, long len)
280 return (PKCS12_BAGS *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, 276 return (PKCS12_BAGS *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
281 &PKCS12_BAGS_it); 277 &PKCS12_BAGS_it);
282} 278}
283LCRYPTO_ALIAS(d2i_PKCS12_BAGS);
284 279
285int 280int
286i2d_PKCS12_BAGS(PKCS12_BAGS *a, unsigned char **out) 281i2d_PKCS12_BAGS(PKCS12_BAGS *a, unsigned char **out)
287{ 282{
288 return ASN1_item_i2d((ASN1_VALUE *)a, out, &PKCS12_BAGS_it); 283 return ASN1_item_i2d((ASN1_VALUE *)a, out, &PKCS12_BAGS_it);
289} 284}
290LCRYPTO_ALIAS(i2d_PKCS12_BAGS);
291 285
292PKCS12_BAGS * 286PKCS12_BAGS *
293PKCS12_BAGS_new(void) 287PKCS12_BAGS_new(void)
294{ 288{
295 return (PKCS12_BAGS *)ASN1_item_new(&PKCS12_BAGS_it); 289 return (PKCS12_BAGS *)ASN1_item_new(&PKCS12_BAGS_it);
296} 290}
297LCRYPTO_ALIAS(PKCS12_BAGS_new);
298 291
299void 292void
300PKCS12_BAGS_free(PKCS12_BAGS *a) 293PKCS12_BAGS_free(PKCS12_BAGS *a)
301{ 294{
302 ASN1_item_free((ASN1_VALUE *)a, &PKCS12_BAGS_it); 295 ASN1_item_free((ASN1_VALUE *)a, &PKCS12_BAGS_it);
303} 296}
304LCRYPTO_ALIAS(PKCS12_BAGS_free);
305 297
306static const ASN1_TEMPLATE safebag_default_tt = { 298static const ASN1_TEMPLATE safebag_default_tt = {
307 .flags = ASN1_TFLG_EXPLICIT, 299 .flags = ASN1_TFLG_EXPLICIT,