summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/pkcs7/pk7_lib.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/pkcs7/pk7_lib.c')
-rw-r--r--src/lib/libcrypto/pkcs7/pk7_lib.c22
1 files changed, 21 insertions, 1 deletions
diff --git a/src/lib/libcrypto/pkcs7/pk7_lib.c b/src/lib/libcrypto/pkcs7/pk7_lib.c
index 7e92df1e9f..82268f6ad7 100644
--- a/src/lib/libcrypto/pkcs7/pk7_lib.c
+++ b/src/lib/libcrypto/pkcs7/pk7_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pk7_lib.c,v 1.23 2021/12/12 21:30:14 tb Exp $ */ 1/* $OpenBSD: pk7_lib.c,v 1.24 2022/11/12 12:11:14 beck Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -109,6 +109,7 @@ PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, char *parg)
109 } 109 }
110 return (ret); 110 return (ret);
111} 111}
112LCRYPTO_ALIAS(PKCS7_ctrl)
112 113
113int 114int
114PKCS7_content_new(PKCS7 *p7, int type) 115PKCS7_content_new(PKCS7 *p7, int type)
@@ -128,6 +129,7 @@ err:
128 PKCS7_free(ret); 129 PKCS7_free(ret);
129 return (0); 130 return (0);
130} 131}
132LCRYPTO_ALIAS(PKCS7_content_new)
131 133
132int 134int
133PKCS7_set_content(PKCS7 *p7, PKCS7 *p7_data) 135PKCS7_set_content(PKCS7 *p7, PKCS7 *p7_data)
@@ -158,6 +160,7 @@ PKCS7_set_content(PKCS7 *p7, PKCS7 *p7_data)
158err: 160err:
159 return (0); 161 return (0);
160} 162}
163LCRYPTO_ALIAS(PKCS7_set_content)
161 164
162int 165int
163PKCS7_set_type(PKCS7 *p7, int type) 166PKCS7_set_type(PKCS7 *p7, int type)
@@ -227,6 +230,7 @@ PKCS7_set_type(PKCS7 *p7, int type)
227err: 230err:
228 return (0); 231 return (0);
229} 232}
233LCRYPTO_ALIAS(PKCS7_set_type)
230 234
231int 235int
232PKCS7_set0_type_other(PKCS7 *p7, int type, ASN1_TYPE *other) 236PKCS7_set0_type_other(PKCS7 *p7, int type, ASN1_TYPE *other)
@@ -235,6 +239,7 @@ PKCS7_set0_type_other(PKCS7 *p7, int type, ASN1_TYPE *other)
235 p7->d.other = other; 239 p7->d.other = other;
236 return 1; 240 return 1;
237} 241}
242LCRYPTO_ALIAS(PKCS7_set0_type_other)
238 243
239int 244int
240PKCS7_add_signer(PKCS7 *p7, PKCS7_SIGNER_INFO *psi) 245PKCS7_add_signer(PKCS7 *p7, PKCS7_SIGNER_INFO *psi)
@@ -290,6 +295,7 @@ PKCS7_add_signer(PKCS7 *p7, PKCS7_SIGNER_INFO *psi)
290 return 0; 295 return 0;
291 return (1); 296 return (1);
292} 297}
298LCRYPTO_ALIAS(PKCS7_add_signer)
293 299
294int 300int
295PKCS7_add_certificate(PKCS7 *p7, X509 *x509) 301PKCS7_add_certificate(PKCS7 *p7, X509 *x509)
@@ -323,6 +329,7 @@ PKCS7_add_certificate(PKCS7 *p7, X509 *x509)
323 } 329 }
324 return (1); 330 return (1);
325} 331}
332LCRYPTO_ALIAS(PKCS7_add_certificate)
326 333
327int 334int
328PKCS7_add_crl(PKCS7 *p7, X509_CRL *crl) 335PKCS7_add_crl(PKCS7 *p7, X509_CRL *crl)
@@ -357,6 +364,7 @@ PKCS7_add_crl(PKCS7 *p7, X509_CRL *crl)
357 } 364 }
358 return (1); 365 return (1);
359} 366}
367LCRYPTO_ALIAS(PKCS7_add_crl)
360 368
361int 369int
362PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey, 370PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey,
@@ -401,6 +409,7 @@ PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey,
401err: 409err:
402 return 0; 410 return 0;
403} 411}
412LCRYPTO_ALIAS(PKCS7_SIGNER_INFO_set)
404 413
405PKCS7_SIGNER_INFO * 414PKCS7_SIGNER_INFO *
406PKCS7_add_signature(PKCS7 *p7, X509 *x509, EVP_PKEY *pkey, const EVP_MD *dgst) 415PKCS7_add_signature(PKCS7 *p7, X509 *x509, EVP_PKEY *pkey, const EVP_MD *dgst)
@@ -430,6 +439,7 @@ err:
430 PKCS7_SIGNER_INFO_free(si); 439 PKCS7_SIGNER_INFO_free(si);
431 return (NULL); 440 return (NULL);
432} 441}
442LCRYPTO_ALIAS(PKCS7_add_signature)
433 443
434int 444int
435PKCS7_set_digest(PKCS7 *p7, const EVP_MD *md) 445PKCS7_set_digest(PKCS7 *p7, const EVP_MD *md)
@@ -447,6 +457,7 @@ PKCS7_set_digest(PKCS7 *p7, const EVP_MD *md)
447 PKCS7error(PKCS7_R_WRONG_CONTENT_TYPE); 457 PKCS7error(PKCS7_R_WRONG_CONTENT_TYPE);
448 return 1; 458 return 1;
449} 459}
460LCRYPTO_ALIAS(PKCS7_set_digest)
450 461
451STACK_OF(PKCS7_SIGNER_INFO) * 462STACK_OF(PKCS7_SIGNER_INFO) *
452PKCS7_get_signer_info(PKCS7 *p7) 463PKCS7_get_signer_info(PKCS7 *p7)
@@ -460,6 +471,7 @@ PKCS7_get_signer_info(PKCS7 *p7)
460 } else 471 } else
461 return (NULL); 472 return (NULL);
462} 473}
474LCRYPTO_ALIAS(PKCS7_get_signer_info)
463 475
464void 476void
465PKCS7_SIGNER_INFO_get0_algs(PKCS7_SIGNER_INFO *si, EVP_PKEY **pk, 477PKCS7_SIGNER_INFO_get0_algs(PKCS7_SIGNER_INFO *si, EVP_PKEY **pk,
@@ -472,6 +484,7 @@ PKCS7_SIGNER_INFO_get0_algs(PKCS7_SIGNER_INFO *si, EVP_PKEY **pk,
472 if (psig) 484 if (psig)
473 *psig = si->digest_enc_alg; 485 *psig = si->digest_enc_alg;
474} 486}
487LCRYPTO_ALIAS(PKCS7_SIGNER_INFO_get0_algs)
475 488
476void 489void
477PKCS7_RECIP_INFO_get0_alg(PKCS7_RECIP_INFO *ri, X509_ALGOR **penc) 490PKCS7_RECIP_INFO_get0_alg(PKCS7_RECIP_INFO *ri, X509_ALGOR **penc)
@@ -479,6 +492,7 @@ PKCS7_RECIP_INFO_get0_alg(PKCS7_RECIP_INFO *ri, X509_ALGOR **penc)
479 if (penc) 492 if (penc)
480 *penc = ri->key_enc_algor; 493 *penc = ri->key_enc_algor;
481} 494}
495LCRYPTO_ALIAS(PKCS7_RECIP_INFO_get0_alg)
482 496
483PKCS7_RECIP_INFO * 497PKCS7_RECIP_INFO *
484PKCS7_add_recipient(PKCS7 *p7, X509 *x509) 498PKCS7_add_recipient(PKCS7 *p7, X509 *x509)
@@ -497,6 +511,7 @@ err:
497 PKCS7_RECIP_INFO_free(ri); 511 PKCS7_RECIP_INFO_free(ri);
498 return NULL; 512 return NULL;
499} 513}
514LCRYPTO_ALIAS(PKCS7_add_recipient)
500 515
501int 516int
502PKCS7_add_recipient_info(PKCS7 *p7, PKCS7_RECIP_INFO *ri) 517PKCS7_add_recipient_info(PKCS7 *p7, PKCS7_RECIP_INFO *ri)
@@ -521,6 +536,7 @@ PKCS7_add_recipient_info(PKCS7 *p7, PKCS7_RECIP_INFO *ri)
521 return 0; 536 return 0;
522 return (1); 537 return (1);
523} 538}
539LCRYPTO_ALIAS(PKCS7_add_recipient_info)
524 540
525int 541int
526PKCS7_RECIP_INFO_set(PKCS7_RECIP_INFO *p7i, X509 *x509) 542PKCS7_RECIP_INFO_set(PKCS7_RECIP_INFO *p7i, X509 *x509)
@@ -567,6 +583,7 @@ err:
567 EVP_PKEY_free(pkey); 583 EVP_PKEY_free(pkey);
568 return 0; 584 return 0;
569} 585}
586LCRYPTO_ALIAS(PKCS7_RECIP_INFO_set)
570 587
571X509 * 588X509 *
572PKCS7_cert_from_signer_info(PKCS7 *p7, PKCS7_SIGNER_INFO *si) 589PKCS7_cert_from_signer_info(PKCS7 *p7, PKCS7_SIGNER_INFO *si)
@@ -578,6 +595,7 @@ PKCS7_cert_from_signer_info(PKCS7 *p7, PKCS7_SIGNER_INFO *si)
578 else 595 else
579 return (NULL); 596 return (NULL);
580} 597}
598LCRYPTO_ALIAS(PKCS7_cert_from_signer_info)
581 599
582int 600int
583PKCS7_set_cipher(PKCS7 *p7, const EVP_CIPHER *cipher) 601PKCS7_set_cipher(PKCS7 *p7, const EVP_CIPHER *cipher)
@@ -608,6 +626,7 @@ PKCS7_set_cipher(PKCS7 *p7, const EVP_CIPHER *cipher)
608 ec->cipher = cipher; 626 ec->cipher = cipher;
609 return 1; 627 return 1;
610} 628}
629LCRYPTO_ALIAS(PKCS7_set_cipher)
611 630
612int 631int
613PKCS7_stream(unsigned char ***boundary, PKCS7 *p7) 632PKCS7_stream(unsigned char ***boundary, PKCS7 *p7)
@@ -652,3 +671,4 @@ PKCS7_stream(unsigned char ***boundary, PKCS7 *p7)
652 671
653 return 1; 672 return 1;
654} 673}
674LCRYPTO_ALIAS(PKCS7_stream)