diff options
Diffstat (limited to 'src/lib/libcrypto/cms/cms_lib.c')
| -rw-r--r-- | src/lib/libcrypto/cms/cms_lib.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/src/lib/libcrypto/cms/cms_lib.c b/src/lib/libcrypto/cms/cms_lib.c index f8d950de03..fa62e61e96 100644 --- a/src/lib/libcrypto/cms/cms_lib.c +++ b/src/lib/libcrypto/cms/cms_lib.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: cms_lib.c,v 1.17 2023/06/11 05:35:43 tb Exp $ */ | 1 | /* $OpenBSD: cms_lib.c,v 1.18 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. |
| @@ -69,24 +69,28 @@ d2i_CMS_ContentInfo(CMS_ContentInfo **a, const unsigned char **in, long len) | |||
| 69 | return (CMS_ContentInfo *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 69 | return (CMS_ContentInfo *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
| 70 | &CMS_ContentInfo_it); | 70 | &CMS_ContentInfo_it); |
| 71 | } | 71 | } |
| 72 | LCRYPTO_ALIAS(d2i_CMS_ContentInfo); | ||
| 72 | 73 | ||
| 73 | int | 74 | int |
| 74 | i2d_CMS_ContentInfo(CMS_ContentInfo *a, unsigned char **out) | 75 | i2d_CMS_ContentInfo(CMS_ContentInfo *a, unsigned char **out) |
| 75 | { | 76 | { |
| 76 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &CMS_ContentInfo_it); | 77 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &CMS_ContentInfo_it); |
| 77 | } | 78 | } |
| 79 | LCRYPTO_ALIAS(i2d_CMS_ContentInfo); | ||
| 78 | 80 | ||
| 79 | CMS_ContentInfo * | 81 | CMS_ContentInfo * |
| 80 | CMS_ContentInfo_new(void) | 82 | CMS_ContentInfo_new(void) |
| 81 | { | 83 | { |
| 82 | return (CMS_ContentInfo *)ASN1_item_new(&CMS_ContentInfo_it); | 84 | return (CMS_ContentInfo *)ASN1_item_new(&CMS_ContentInfo_it); |
| 83 | } | 85 | } |
| 86 | LCRYPTO_ALIAS(CMS_ContentInfo_new); | ||
| 84 | 87 | ||
| 85 | void | 88 | void |
| 86 | CMS_ContentInfo_free(CMS_ContentInfo *a) | 89 | CMS_ContentInfo_free(CMS_ContentInfo *a) |
| 87 | { | 90 | { |
| 88 | ASN1_item_free((ASN1_VALUE *)a, &CMS_ContentInfo_it); | 91 | ASN1_item_free((ASN1_VALUE *)a, &CMS_ContentInfo_it); |
| 89 | } | 92 | } |
| 93 | LCRYPTO_ALIAS(CMS_ContentInfo_free); | ||
| 90 | 94 | ||
| 91 | int | 95 | int |
| 92 | CMS_ContentInfo_print_ctx(BIO *out, CMS_ContentInfo *x, int indent, const ASN1_PCTX *pctx) | 96 | CMS_ContentInfo_print_ctx(BIO *out, CMS_ContentInfo *x, int indent, const ASN1_PCTX *pctx) |
| @@ -94,12 +98,14 @@ CMS_ContentInfo_print_ctx(BIO *out, CMS_ContentInfo *x, int indent, const ASN1_P | |||
| 94 | return ASN1_item_print(out, (ASN1_VALUE *)x, indent, | 98 | return ASN1_item_print(out, (ASN1_VALUE *)x, indent, |
| 95 | &CMS_ContentInfo_it, pctx); | 99 | &CMS_ContentInfo_it, pctx); |
| 96 | } | 100 | } |
| 101 | LCRYPTO_ALIAS(CMS_ContentInfo_print_ctx); | ||
| 97 | 102 | ||
| 98 | const ASN1_OBJECT * | 103 | const ASN1_OBJECT * |
| 99 | CMS_get0_type(const CMS_ContentInfo *cms) | 104 | CMS_get0_type(const CMS_ContentInfo *cms) |
| 100 | { | 105 | { |
| 101 | return cms->contentType; | 106 | return cms->contentType; |
| 102 | } | 107 | } |
| 108 | LCRYPTO_ALIAS(CMS_get0_type); | ||
| 103 | 109 | ||
| 104 | CMS_ContentInfo * | 110 | CMS_ContentInfo * |
| 105 | cms_Data_create(void) | 111 | cms_Data_create(void) |
| @@ -182,6 +188,7 @@ CMS_dataInit(CMS_ContentInfo *cms, BIO *icont) | |||
| 182 | 188 | ||
| 183 | return NULL; | 189 | return NULL; |
| 184 | } | 190 | } |
| 191 | LCRYPTO_ALIAS(CMS_dataInit); | ||
| 185 | 192 | ||
| 186 | int | 193 | int |
| 187 | CMS_dataFinal(CMS_ContentInfo *cms, BIO *cmsbio) | 194 | CMS_dataFinal(CMS_ContentInfo *cms, BIO *cmsbio) |
| @@ -228,6 +235,7 @@ CMS_dataFinal(CMS_ContentInfo *cms, BIO *cmsbio) | |||
| 228 | return 0; | 235 | return 0; |
| 229 | } | 236 | } |
| 230 | } | 237 | } |
| 238 | LCRYPTO_ALIAS(CMS_dataFinal); | ||
| 231 | 239 | ||
| 232 | /* | 240 | /* |
| 233 | * Return an OCTET STRING pointer to content. This allows it to be accessed | 241 | * Return an OCTET STRING pointer to content. This allows it to be accessed |
| @@ -311,6 +319,7 @@ CMS_get0_eContentType(CMS_ContentInfo *cms) | |||
| 311 | 319 | ||
| 312 | return NULL; | 320 | return NULL; |
| 313 | } | 321 | } |
| 322 | LCRYPTO_ALIAS(CMS_get0_eContentType); | ||
| 314 | 323 | ||
| 315 | int | 324 | int |
| 316 | CMS_set1_eContentType(CMS_ContentInfo *cms, const ASN1_OBJECT *oid) | 325 | CMS_set1_eContentType(CMS_ContentInfo *cms, const ASN1_OBJECT *oid) |
| @@ -330,6 +339,7 @@ CMS_set1_eContentType(CMS_ContentInfo *cms, const ASN1_OBJECT *oid) | |||
| 330 | 339 | ||
| 331 | return 1; | 340 | return 1; |
| 332 | } | 341 | } |
| 342 | LCRYPTO_ALIAS(CMS_set1_eContentType); | ||
| 333 | 343 | ||
| 334 | int | 344 | int |
| 335 | CMS_is_detached(CMS_ContentInfo *cms) | 345 | CMS_is_detached(CMS_ContentInfo *cms) |
| @@ -344,6 +354,7 @@ CMS_is_detached(CMS_ContentInfo *cms) | |||
| 344 | 354 | ||
| 345 | return 1; | 355 | return 1; |
| 346 | } | 356 | } |
| 357 | LCRYPTO_ALIAS(CMS_is_detached); | ||
| 347 | 358 | ||
| 348 | int | 359 | int |
| 349 | CMS_set_detached(CMS_ContentInfo *cms, int detached) | 360 | CMS_set_detached(CMS_ContentInfo *cms, int detached) |
| @@ -371,6 +382,7 @@ CMS_set_detached(CMS_ContentInfo *cms, int detached) | |||
| 371 | 382 | ||
| 372 | return 0; | 383 | return 0; |
| 373 | } | 384 | } |
| 385 | LCRYPTO_ALIAS(CMS_set_detached); | ||
| 374 | 386 | ||
| 375 | /* Create a digest BIO from an X509_ALGOR structure */ | 387 | /* Create a digest BIO from an X509_ALGOR structure */ |
| 376 | 388 | ||
| @@ -471,6 +483,7 @@ CMS_add0_CertificateChoices(CMS_ContentInfo *cms) | |||
| 471 | 483 | ||
| 472 | return cch; | 484 | return cch; |
| 473 | } | 485 | } |
| 486 | LCRYPTO_ALIAS(CMS_add0_CertificateChoices); | ||
| 474 | 487 | ||
| 475 | int | 488 | int |
| 476 | CMS_add0_cert(CMS_ContentInfo *cms, X509 *cert) | 489 | CMS_add0_cert(CMS_ContentInfo *cms, X509 *cert) |
| @@ -499,6 +512,7 @@ CMS_add0_cert(CMS_ContentInfo *cms, X509 *cert) | |||
| 499 | 512 | ||
| 500 | return 1; | 513 | return 1; |
| 501 | } | 514 | } |
| 515 | LCRYPTO_ALIAS(CMS_add0_cert); | ||
| 502 | 516 | ||
| 503 | int | 517 | int |
| 504 | CMS_add1_cert(CMS_ContentInfo *cms, X509 *cert) | 518 | CMS_add1_cert(CMS_ContentInfo *cms, X509 *cert) |
| @@ -511,6 +525,7 @@ CMS_add1_cert(CMS_ContentInfo *cms, X509 *cert) | |||
| 511 | 525 | ||
| 512 | return r; | 526 | return r; |
| 513 | } | 527 | } |
| 528 | LCRYPTO_ALIAS(CMS_add1_cert); | ||
| 514 | 529 | ||
| 515 | static STACK_OF(CMS_RevocationInfoChoice) ** | 530 | static STACK_OF(CMS_RevocationInfoChoice) ** |
| 516 | cms_get0_revocation_choices(CMS_ContentInfo *cms) | 531 | cms_get0_revocation_choices(CMS_ContentInfo *cms) |
| @@ -553,6 +568,7 @@ CMS_add0_RevocationInfoChoice(CMS_ContentInfo *cms) | |||
| 553 | 568 | ||
| 554 | return rch; | 569 | return rch; |
| 555 | } | 570 | } |
| 571 | LCRYPTO_ALIAS(CMS_add0_RevocationInfoChoice); | ||
| 556 | 572 | ||
| 557 | int | 573 | int |
| 558 | CMS_add0_crl(CMS_ContentInfo *cms, X509_CRL *crl) | 574 | CMS_add0_crl(CMS_ContentInfo *cms, X509_CRL *crl) |
| @@ -567,6 +583,7 @@ CMS_add0_crl(CMS_ContentInfo *cms, X509_CRL *crl) | |||
| 567 | 583 | ||
| 568 | return 1; | 584 | return 1; |
| 569 | } | 585 | } |
| 586 | LCRYPTO_ALIAS(CMS_add0_crl); | ||
| 570 | 587 | ||
| 571 | int | 588 | int |
| 572 | CMS_add1_crl(CMS_ContentInfo *cms, X509_CRL *crl) | 589 | CMS_add1_crl(CMS_ContentInfo *cms, X509_CRL *crl) |
| @@ -579,6 +596,7 @@ CMS_add1_crl(CMS_ContentInfo *cms, X509_CRL *crl) | |||
| 579 | 596 | ||
| 580 | return r; | 597 | return r; |
| 581 | } | 598 | } |
| 599 | LCRYPTO_ALIAS(CMS_add1_crl); | ||
| 582 | 600 | ||
| 583 | STACK_OF(X509) * | 601 | STACK_OF(X509) * |
| 584 | CMS_get1_certs(CMS_ContentInfo *cms) | 602 | CMS_get1_certs(CMS_ContentInfo *cms) |
| @@ -608,6 +626,7 @@ CMS_get1_certs(CMS_ContentInfo *cms) | |||
| 608 | } | 626 | } |
| 609 | return certs; | 627 | return certs; |
| 610 | } | 628 | } |
| 629 | LCRYPTO_ALIAS(CMS_get1_certs); | ||
| 611 | 630 | ||
| 612 | STACK_OF(X509_CRL) * | 631 | STACK_OF(X509_CRL) * |
| 613 | CMS_get1_crls(CMS_ContentInfo *cms) | 632 | CMS_get1_crls(CMS_ContentInfo *cms) |
| @@ -637,6 +656,7 @@ CMS_get1_crls(CMS_ContentInfo *cms) | |||
| 637 | } | 656 | } |
| 638 | return crls; | 657 | return crls; |
| 639 | } | 658 | } |
| 659 | LCRYPTO_ALIAS(CMS_get1_crls); | ||
| 640 | 660 | ||
| 641 | static const ASN1_OCTET_STRING * | 661 | static const ASN1_OCTET_STRING * |
| 642 | cms_X509_get0_subject_key_id(X509 *x) | 662 | cms_X509_get0_subject_key_id(X509 *x) |
