diff options
Diffstat (limited to 'src/lib/libcrypto/cms/cms_env.c')
-rw-r--r-- | src/lib/libcrypto/cms/cms_env.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/lib/libcrypto/cms/cms_env.c b/src/lib/libcrypto/cms/cms_env.c index 1d534e3da5..7bb8f613a8 100644 --- a/src/lib/libcrypto/cms/cms_env.c +++ b/src/lib/libcrypto/cms/cms_env.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: cms_env.c,v 1.25 2022/11/26 16:08:51 tb Exp $ */ | 1 | /* $OpenBSD: cms_env.c,v 1.26 2023/07/08 08:26:26 beck Exp $ */ |
2 | /* | 2 | /* |
3 | * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 3 | * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
4 | * project. | 4 | * project. |
@@ -139,12 +139,14 @@ CMS_get0_RecipientInfos(CMS_ContentInfo *cms) | |||
139 | 139 | ||
140 | return env->recipientInfos; | 140 | return env->recipientInfos; |
141 | } | 141 | } |
142 | LCRYPTO_ALIAS(CMS_get0_RecipientInfos); | ||
142 | 143 | ||
143 | int | 144 | int |
144 | CMS_RecipientInfo_type(CMS_RecipientInfo *ri) | 145 | CMS_RecipientInfo_type(CMS_RecipientInfo *ri) |
145 | { | 146 | { |
146 | return ri->type; | 147 | return ri->type; |
147 | } | 148 | } |
149 | LCRYPTO_ALIAS(CMS_RecipientInfo_type); | ||
148 | 150 | ||
149 | EVP_PKEY_CTX * | 151 | EVP_PKEY_CTX * |
150 | CMS_RecipientInfo_get0_pkey_ctx(CMS_RecipientInfo *ri) | 152 | CMS_RecipientInfo_get0_pkey_ctx(CMS_RecipientInfo *ri) |
@@ -156,6 +158,7 @@ CMS_RecipientInfo_get0_pkey_ctx(CMS_RecipientInfo *ri) | |||
156 | 158 | ||
157 | return NULL; | 159 | return NULL; |
158 | } | 160 | } |
161 | LCRYPTO_ALIAS(CMS_RecipientInfo_get0_pkey_ctx); | ||
159 | 162 | ||
160 | CMS_ContentInfo * | 163 | CMS_ContentInfo * |
161 | CMS_EnvelopedData_create(const EVP_CIPHER *cipher) | 164 | CMS_EnvelopedData_create(const EVP_CIPHER *cipher) |
@@ -180,6 +183,7 @@ CMS_EnvelopedData_create(const EVP_CIPHER *cipher) | |||
180 | CMSerror(ERR_R_MALLOC_FAILURE); | 183 | CMSerror(ERR_R_MALLOC_FAILURE); |
181 | return NULL; | 184 | return NULL; |
182 | } | 185 | } |
186 | LCRYPTO_ALIAS(CMS_EnvelopedData_create); | ||
183 | 187 | ||
184 | /* Key Transport Recipient Info (KTRI) routines */ | 188 | /* Key Transport Recipient Info (KTRI) routines */ |
185 | 189 | ||
@@ -288,6 +292,7 @@ CMS_add1_recipient_cert(CMS_ContentInfo *cms, X509 *recip, unsigned int flags) | |||
288 | ASN1_item_free((ASN1_VALUE *)ri, &CMS_RecipientInfo_it); | 292 | ASN1_item_free((ASN1_VALUE *)ri, &CMS_RecipientInfo_it); |
289 | return NULL; | 293 | return NULL; |
290 | } | 294 | } |
295 | LCRYPTO_ALIAS(CMS_add1_recipient_cert); | ||
291 | 296 | ||
292 | int | 297 | int |
293 | CMS_RecipientInfo_ktri_get0_algs(CMS_RecipientInfo *ri, EVP_PKEY **pk, | 298 | CMS_RecipientInfo_ktri_get0_algs(CMS_RecipientInfo *ri, EVP_PKEY **pk, |
@@ -311,6 +316,7 @@ CMS_RecipientInfo_ktri_get0_algs(CMS_RecipientInfo *ri, EVP_PKEY **pk, | |||
311 | 316 | ||
312 | return 1; | 317 | return 1; |
313 | } | 318 | } |
319 | LCRYPTO_ALIAS(CMS_RecipientInfo_ktri_get0_algs); | ||
314 | 320 | ||
315 | int | 321 | int |
316 | CMS_RecipientInfo_ktri_get0_signer_id(CMS_RecipientInfo *ri, | 322 | CMS_RecipientInfo_ktri_get0_signer_id(CMS_RecipientInfo *ri, |
@@ -326,6 +332,7 @@ CMS_RecipientInfo_ktri_get0_signer_id(CMS_RecipientInfo *ri, | |||
326 | 332 | ||
327 | return cms_SignerIdentifier_get0_signer_id(ktri->rid, keyid, issuer, sno); | 333 | return cms_SignerIdentifier_get0_signer_id(ktri->rid, keyid, issuer, sno); |
328 | } | 334 | } |
335 | LCRYPTO_ALIAS(CMS_RecipientInfo_ktri_get0_signer_id); | ||
329 | 336 | ||
330 | int | 337 | int |
331 | CMS_RecipientInfo_ktri_cert_cmp(CMS_RecipientInfo *ri, X509 *cert) | 338 | CMS_RecipientInfo_ktri_cert_cmp(CMS_RecipientInfo *ri, X509 *cert) |
@@ -337,6 +344,7 @@ CMS_RecipientInfo_ktri_cert_cmp(CMS_RecipientInfo *ri, X509 *cert) | |||
337 | 344 | ||
338 | return cms_SignerIdentifier_cert_cmp(ri->d.ktri->rid, cert); | 345 | return cms_SignerIdentifier_cert_cmp(ri->d.ktri->rid, cert); |
339 | } | 346 | } |
347 | LCRYPTO_ALIAS(CMS_RecipientInfo_ktri_cert_cmp); | ||
340 | 348 | ||
341 | int | 349 | int |
342 | CMS_RecipientInfo_set0_pkey(CMS_RecipientInfo *ri, EVP_PKEY *pkey) | 350 | CMS_RecipientInfo_set0_pkey(CMS_RecipientInfo *ri, EVP_PKEY *pkey) |
@@ -350,6 +358,7 @@ CMS_RecipientInfo_set0_pkey(CMS_RecipientInfo *ri, EVP_PKEY *pkey) | |||
350 | 358 | ||
351 | return 1; | 359 | return 1; |
352 | } | 360 | } |
361 | LCRYPTO_ALIAS(CMS_RecipientInfo_set0_pkey); | ||
353 | 362 | ||
354 | /* Encrypt content key in key transport recipient info */ | 363 | /* Encrypt content key in key transport recipient info */ |
355 | 364 | ||
@@ -522,6 +531,7 @@ CMS_RecipientInfo_kekri_id_cmp(CMS_RecipientInfo *ri, const unsigned char *id, | |||
522 | 531 | ||
523 | return ASN1_OCTET_STRING_cmp(&tmp_os, kekri->kekid->keyIdentifier); | 532 | return ASN1_OCTET_STRING_cmp(&tmp_os, kekri->kekid->keyIdentifier); |
524 | } | 533 | } |
534 | LCRYPTO_ALIAS(CMS_RecipientInfo_kekri_id_cmp); | ||
525 | 535 | ||
526 | /* For now hard code AES key wrap info */ | 536 | /* For now hard code AES key wrap info */ |
527 | 537 | ||
@@ -639,6 +649,7 @@ CMS_add0_recipient_key(CMS_ContentInfo *cms, int nid, unsigned char *key, | |||
639 | ASN1_item_free((ASN1_VALUE *)ri, &CMS_RecipientInfo_it); | 649 | ASN1_item_free((ASN1_VALUE *)ri, &CMS_RecipientInfo_it); |
640 | return NULL; | 650 | return NULL; |
641 | } | 651 | } |
652 | LCRYPTO_ALIAS(CMS_add0_recipient_key); | ||
642 | 653 | ||
643 | int | 654 | int |
644 | CMS_RecipientInfo_kekri_get0_id(CMS_RecipientInfo *ri, X509_ALGOR **palg, | 655 | CMS_RecipientInfo_kekri_get0_id(CMS_RecipientInfo *ri, X509_ALGOR **palg, |
@@ -673,6 +684,7 @@ CMS_RecipientInfo_kekri_get0_id(CMS_RecipientInfo *ri, X509_ALGOR **palg, | |||
673 | 684 | ||
674 | return 1; | 685 | return 1; |
675 | } | 686 | } |
687 | LCRYPTO_ALIAS(CMS_RecipientInfo_kekri_get0_id); | ||
676 | 688 | ||
677 | int | 689 | int |
678 | CMS_RecipientInfo_set0_key(CMS_RecipientInfo *ri, unsigned char *key, | 690 | CMS_RecipientInfo_set0_key(CMS_RecipientInfo *ri, unsigned char *key, |
@@ -690,6 +702,7 @@ CMS_RecipientInfo_set0_key(CMS_RecipientInfo *ri, unsigned char *key, | |||
690 | kekri->keylen = keylen; | 702 | kekri->keylen = keylen; |
691 | return 1; | 703 | return 1; |
692 | } | 704 | } |
705 | LCRYPTO_ALIAS(CMS_RecipientInfo_set0_key); | ||
693 | 706 | ||
694 | /* Encrypt content key in KEK recipient info */ | 707 | /* Encrypt content key in KEK recipient info */ |
695 | 708 | ||
@@ -825,6 +838,7 @@ CMS_RecipientInfo_decrypt(CMS_ContentInfo *cms, CMS_RecipientInfo *ri) | |||
825 | return 0; | 838 | return 0; |
826 | } | 839 | } |
827 | } | 840 | } |
841 | LCRYPTO_ALIAS(CMS_RecipientInfo_decrypt); | ||
828 | 842 | ||
829 | int | 843 | int |
830 | CMS_RecipientInfo_encrypt(CMS_ContentInfo *cms, CMS_RecipientInfo *ri) | 844 | CMS_RecipientInfo_encrypt(CMS_ContentInfo *cms, CMS_RecipientInfo *ri) |
@@ -847,6 +861,7 @@ CMS_RecipientInfo_encrypt(CMS_ContentInfo *cms, CMS_RecipientInfo *ri) | |||
847 | return 0; | 861 | return 0; |
848 | } | 862 | } |
849 | } | 863 | } |
864 | LCRYPTO_ALIAS(CMS_RecipientInfo_encrypt); | ||
850 | 865 | ||
851 | /* Check structures and fixup version numbers (if necessary) */ | 866 | /* Check structures and fixup version numbers (if necessary) */ |
852 | 867 | ||