diff options
Diffstat (limited to 'src/lib/libcrypto/pkcs7/pk7_asn1.c')
-rw-r--r-- | src/lib/libcrypto/pkcs7/pk7_asn1.c | 82 |
1 files changed, 81 insertions, 1 deletions
diff --git a/src/lib/libcrypto/pkcs7/pk7_asn1.c b/src/lib/libcrypto/pkcs7/pk7_asn1.c index 66659051a6..b0c4ee8016 100644 --- a/src/lib/libcrypto/pkcs7/pk7_asn1.c +++ b/src/lib/libcrypto/pkcs7/pk7_asn1.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: pk7_asn1.c,v 1.13 2022/01/14 08:16:13 tb Exp $ */ | 1 | /* $OpenBSD: pk7_asn1.c,v 1.14 2022/11/12 12:11:14 beck 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 2000. | 3 | * project 2000. |
4 | */ | 4 | */ |
@@ -221,36 +221,42 @@ d2i_PKCS7(PKCS7 **a, const unsigned char **in, long len) | |||
221 | return (PKCS7 *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 221 | return (PKCS7 *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
222 | &PKCS7_it); | 222 | &PKCS7_it); |
223 | } | 223 | } |
224 | LCRYPTO_ALIAS(d2i_PKCS7) | ||
224 | 225 | ||
225 | int | 226 | int |
226 | i2d_PKCS7(PKCS7 *a, unsigned char **out) | 227 | i2d_PKCS7(PKCS7 *a, unsigned char **out) |
227 | { | 228 | { |
228 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &PKCS7_it); | 229 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &PKCS7_it); |
229 | } | 230 | } |
231 | LCRYPTO_ALIAS(i2d_PKCS7) | ||
230 | 232 | ||
231 | PKCS7 * | 233 | PKCS7 * |
232 | PKCS7_new(void) | 234 | PKCS7_new(void) |
233 | { | 235 | { |
234 | return (PKCS7 *)ASN1_item_new(&PKCS7_it); | 236 | return (PKCS7 *)ASN1_item_new(&PKCS7_it); |
235 | } | 237 | } |
238 | LCRYPTO_ALIAS(PKCS7_new) | ||
236 | 239 | ||
237 | void | 240 | void |
238 | PKCS7_free(PKCS7 *a) | 241 | PKCS7_free(PKCS7 *a) |
239 | { | 242 | { |
240 | ASN1_item_free((ASN1_VALUE *)a, &PKCS7_it); | 243 | ASN1_item_free((ASN1_VALUE *)a, &PKCS7_it); |
241 | } | 244 | } |
245 | LCRYPTO_ALIAS(PKCS7_free) | ||
242 | 246 | ||
243 | int | 247 | int |
244 | i2d_PKCS7_NDEF(PKCS7 *a, unsigned char **out) | 248 | i2d_PKCS7_NDEF(PKCS7 *a, unsigned char **out) |
245 | { | 249 | { |
246 | return ASN1_item_ndef_i2d((ASN1_VALUE *)a, out, &PKCS7_it); | 250 | return ASN1_item_ndef_i2d((ASN1_VALUE *)a, out, &PKCS7_it); |
247 | } | 251 | } |
252 | LCRYPTO_ALIAS(i2d_PKCS7_NDEF) | ||
248 | 253 | ||
249 | PKCS7 * | 254 | PKCS7 * |
250 | PKCS7_dup(PKCS7 *x) | 255 | PKCS7_dup(PKCS7 *x) |
251 | { | 256 | { |
252 | return ASN1_item_dup(&PKCS7_it, x); | 257 | return ASN1_item_dup(&PKCS7_it, x); |
253 | } | 258 | } |
259 | LCRYPTO_ALIAS(PKCS7_dup) | ||
254 | 260 | ||
255 | static const ASN1_TEMPLATE PKCS7_SIGNED_seq_tt[] = { | 261 | static const ASN1_TEMPLATE PKCS7_SIGNED_seq_tt[] = { |
256 | { | 262 | { |
@@ -314,24 +320,28 @@ d2i_PKCS7_SIGNED(PKCS7_SIGNED **a, const unsigned char **in, long len) | |||
314 | return (PKCS7_SIGNED *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 320 | return (PKCS7_SIGNED *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
315 | &PKCS7_SIGNED_it); | 321 | &PKCS7_SIGNED_it); |
316 | } | 322 | } |
323 | LCRYPTO_ALIAS(d2i_PKCS7_SIGNED) | ||
317 | 324 | ||
318 | int | 325 | int |
319 | i2d_PKCS7_SIGNED(PKCS7_SIGNED *a, unsigned char **out) | 326 | i2d_PKCS7_SIGNED(PKCS7_SIGNED *a, unsigned char **out) |
320 | { | 327 | { |
321 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &PKCS7_SIGNED_it); | 328 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &PKCS7_SIGNED_it); |
322 | } | 329 | } |
330 | LCRYPTO_ALIAS(i2d_PKCS7_SIGNED) | ||
323 | 331 | ||
324 | PKCS7_SIGNED * | 332 | PKCS7_SIGNED * |
325 | PKCS7_SIGNED_new(void) | 333 | PKCS7_SIGNED_new(void) |
326 | { | 334 | { |
327 | return (PKCS7_SIGNED *)ASN1_item_new(&PKCS7_SIGNED_it); | 335 | return (PKCS7_SIGNED *)ASN1_item_new(&PKCS7_SIGNED_it); |
328 | } | 336 | } |
337 | LCRYPTO_ALIAS(PKCS7_SIGNED_new) | ||
329 | 338 | ||
330 | void | 339 | void |
331 | PKCS7_SIGNED_free(PKCS7_SIGNED *a) | 340 | PKCS7_SIGNED_free(PKCS7_SIGNED *a) |
332 | { | 341 | { |
333 | ASN1_item_free((ASN1_VALUE *)a, &PKCS7_SIGNED_it); | 342 | ASN1_item_free((ASN1_VALUE *)a, &PKCS7_SIGNED_it); |
334 | } | 343 | } |
344 | LCRYPTO_ALIAS(PKCS7_SIGNED_free) | ||
335 | 345 | ||
336 | /* Minor tweak to operation: free up EVP_PKEY */ | 346 | /* Minor tweak to operation: free up EVP_PKEY */ |
337 | static int | 347 | static int |
@@ -426,24 +436,28 @@ d2i_PKCS7_SIGNER_INFO(PKCS7_SIGNER_INFO **a, const unsigned char **in, long len) | |||
426 | return (PKCS7_SIGNER_INFO *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 436 | return (PKCS7_SIGNER_INFO *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
427 | &PKCS7_SIGNER_INFO_it); | 437 | &PKCS7_SIGNER_INFO_it); |
428 | } | 438 | } |
439 | LCRYPTO_ALIAS(d2i_PKCS7_SIGNER_INFO) | ||
429 | 440 | ||
430 | int | 441 | int |
431 | i2d_PKCS7_SIGNER_INFO(PKCS7_SIGNER_INFO *a, unsigned char **out) | 442 | i2d_PKCS7_SIGNER_INFO(PKCS7_SIGNER_INFO *a, unsigned char **out) |
432 | { | 443 | { |
433 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &PKCS7_SIGNER_INFO_it); | 444 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &PKCS7_SIGNER_INFO_it); |
434 | } | 445 | } |
446 | LCRYPTO_ALIAS(i2d_PKCS7_SIGNER_INFO) | ||
435 | 447 | ||
436 | PKCS7_SIGNER_INFO * | 448 | PKCS7_SIGNER_INFO * |
437 | PKCS7_SIGNER_INFO_new(void) | 449 | PKCS7_SIGNER_INFO_new(void) |
438 | { | 450 | { |
439 | return (PKCS7_SIGNER_INFO *)ASN1_item_new(&PKCS7_SIGNER_INFO_it); | 451 | return (PKCS7_SIGNER_INFO *)ASN1_item_new(&PKCS7_SIGNER_INFO_it); |
440 | } | 452 | } |
453 | LCRYPTO_ALIAS(PKCS7_SIGNER_INFO_new) | ||
441 | 454 | ||
442 | void | 455 | void |
443 | PKCS7_SIGNER_INFO_free(PKCS7_SIGNER_INFO *a) | 456 | PKCS7_SIGNER_INFO_free(PKCS7_SIGNER_INFO *a) |
444 | { | 457 | { |
445 | ASN1_item_free((ASN1_VALUE *)a, &PKCS7_SIGNER_INFO_it); | 458 | ASN1_item_free((ASN1_VALUE *)a, &PKCS7_SIGNER_INFO_it); |
446 | } | 459 | } |
460 | LCRYPTO_ALIAS(PKCS7_SIGNER_INFO_free) | ||
447 | 461 | ||
448 | static const ASN1_TEMPLATE PKCS7_ISSUER_AND_SERIAL_seq_tt[] = { | 462 | static const ASN1_TEMPLATE PKCS7_ISSUER_AND_SERIAL_seq_tt[] = { |
449 | { | 463 | { |
@@ -479,24 +493,28 @@ d2i_PKCS7_ISSUER_AND_SERIAL(PKCS7_ISSUER_AND_SERIAL **a, const unsigned char **i | |||
479 | return (PKCS7_ISSUER_AND_SERIAL *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 493 | return (PKCS7_ISSUER_AND_SERIAL *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
480 | &PKCS7_ISSUER_AND_SERIAL_it); | 494 | &PKCS7_ISSUER_AND_SERIAL_it); |
481 | } | 495 | } |
496 | LCRYPTO_ALIAS(d2i_PKCS7_ISSUER_AND_SERIAL) | ||
482 | 497 | ||
483 | int | 498 | int |
484 | i2d_PKCS7_ISSUER_AND_SERIAL(PKCS7_ISSUER_AND_SERIAL *a, unsigned char **out) | 499 | i2d_PKCS7_ISSUER_AND_SERIAL(PKCS7_ISSUER_AND_SERIAL *a, unsigned char **out) |
485 | { | 500 | { |
486 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &PKCS7_ISSUER_AND_SERIAL_it); | 501 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &PKCS7_ISSUER_AND_SERIAL_it); |
487 | } | 502 | } |
503 | LCRYPTO_ALIAS(i2d_PKCS7_ISSUER_AND_SERIAL) | ||
488 | 504 | ||
489 | PKCS7_ISSUER_AND_SERIAL * | 505 | PKCS7_ISSUER_AND_SERIAL * |
490 | PKCS7_ISSUER_AND_SERIAL_new(void) | 506 | PKCS7_ISSUER_AND_SERIAL_new(void) |
491 | { | 507 | { |
492 | return (PKCS7_ISSUER_AND_SERIAL *)ASN1_item_new(&PKCS7_ISSUER_AND_SERIAL_it); | 508 | return (PKCS7_ISSUER_AND_SERIAL *)ASN1_item_new(&PKCS7_ISSUER_AND_SERIAL_it); |
493 | } | 509 | } |
510 | LCRYPTO_ALIAS(PKCS7_ISSUER_AND_SERIAL_new) | ||
494 | 511 | ||
495 | void | 512 | void |
496 | PKCS7_ISSUER_AND_SERIAL_free(PKCS7_ISSUER_AND_SERIAL *a) | 513 | PKCS7_ISSUER_AND_SERIAL_free(PKCS7_ISSUER_AND_SERIAL *a) |
497 | { | 514 | { |
498 | ASN1_item_free((ASN1_VALUE *)a, &PKCS7_ISSUER_AND_SERIAL_it); | 515 | ASN1_item_free((ASN1_VALUE *)a, &PKCS7_ISSUER_AND_SERIAL_it); |
499 | } | 516 | } |
517 | LCRYPTO_ALIAS(PKCS7_ISSUER_AND_SERIAL_free) | ||
500 | 518 | ||
501 | static const ASN1_TEMPLATE PKCS7_ENVELOPE_seq_tt[] = { | 519 | static const ASN1_TEMPLATE PKCS7_ENVELOPE_seq_tt[] = { |
502 | { | 520 | { |
@@ -539,24 +557,28 @@ d2i_PKCS7_ENVELOPE(PKCS7_ENVELOPE **a, const unsigned char **in, long len) | |||
539 | return (PKCS7_ENVELOPE *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 557 | return (PKCS7_ENVELOPE *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
540 | &PKCS7_ENVELOPE_it); | 558 | &PKCS7_ENVELOPE_it); |
541 | } | 559 | } |
560 | LCRYPTO_ALIAS(d2i_PKCS7_ENVELOPE) | ||
542 | 561 | ||
543 | int | 562 | int |
544 | i2d_PKCS7_ENVELOPE(PKCS7_ENVELOPE *a, unsigned char **out) | 563 | i2d_PKCS7_ENVELOPE(PKCS7_ENVELOPE *a, unsigned char **out) |
545 | { | 564 | { |
546 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &PKCS7_ENVELOPE_it); | 565 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &PKCS7_ENVELOPE_it); |
547 | } | 566 | } |
567 | LCRYPTO_ALIAS(i2d_PKCS7_ENVELOPE) | ||
548 | 568 | ||
549 | PKCS7_ENVELOPE * | 569 | PKCS7_ENVELOPE * |
550 | PKCS7_ENVELOPE_new(void) | 570 | PKCS7_ENVELOPE_new(void) |
551 | { | 571 | { |
552 | return (PKCS7_ENVELOPE *)ASN1_item_new(&PKCS7_ENVELOPE_it); | 572 | return (PKCS7_ENVELOPE *)ASN1_item_new(&PKCS7_ENVELOPE_it); |
553 | } | 573 | } |
574 | LCRYPTO_ALIAS(PKCS7_ENVELOPE_new) | ||
554 | 575 | ||
555 | void | 576 | void |
556 | PKCS7_ENVELOPE_free(PKCS7_ENVELOPE *a) | 577 | PKCS7_ENVELOPE_free(PKCS7_ENVELOPE *a) |
557 | { | 578 | { |
558 | ASN1_item_free((ASN1_VALUE *)a, &PKCS7_ENVELOPE_it); | 579 | ASN1_item_free((ASN1_VALUE *)a, &PKCS7_ENVELOPE_it); |
559 | } | 580 | } |
581 | LCRYPTO_ALIAS(PKCS7_ENVELOPE_free) | ||
560 | 582 | ||
561 | /* Minor tweak to operation: free up X509 */ | 583 | /* Minor tweak to operation: free up X509 */ |
562 | static int | 584 | static int |
@@ -625,24 +647,28 @@ d2i_PKCS7_RECIP_INFO(PKCS7_RECIP_INFO **a, const unsigned char **in, long len) | |||
625 | return (PKCS7_RECIP_INFO *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 647 | return (PKCS7_RECIP_INFO *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
626 | &PKCS7_RECIP_INFO_it); | 648 | &PKCS7_RECIP_INFO_it); |
627 | } | 649 | } |
650 | LCRYPTO_ALIAS(d2i_PKCS7_RECIP_INFO) | ||
628 | 651 | ||
629 | int | 652 | int |
630 | i2d_PKCS7_RECIP_INFO(PKCS7_RECIP_INFO *a, unsigned char **out) | 653 | i2d_PKCS7_RECIP_INFO(PKCS7_RECIP_INFO *a, unsigned char **out) |
631 | { | 654 | { |
632 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &PKCS7_RECIP_INFO_it); | 655 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &PKCS7_RECIP_INFO_it); |
633 | } | 656 | } |
657 | LCRYPTO_ALIAS(i2d_PKCS7_RECIP_INFO) | ||
634 | 658 | ||
635 | PKCS7_RECIP_INFO * | 659 | PKCS7_RECIP_INFO * |
636 | PKCS7_RECIP_INFO_new(void) | 660 | PKCS7_RECIP_INFO_new(void) |
637 | { | 661 | { |
638 | return (PKCS7_RECIP_INFO *)ASN1_item_new(&PKCS7_RECIP_INFO_it); | 662 | return (PKCS7_RECIP_INFO *)ASN1_item_new(&PKCS7_RECIP_INFO_it); |
639 | } | 663 | } |
664 | LCRYPTO_ALIAS(PKCS7_RECIP_INFO_new) | ||
640 | 665 | ||
641 | void | 666 | void |
642 | PKCS7_RECIP_INFO_free(PKCS7_RECIP_INFO *a) | 667 | PKCS7_RECIP_INFO_free(PKCS7_RECIP_INFO *a) |
643 | { | 668 | { |
644 | ASN1_item_free((ASN1_VALUE *)a, &PKCS7_RECIP_INFO_it); | 669 | ASN1_item_free((ASN1_VALUE *)a, &PKCS7_RECIP_INFO_it); |
645 | } | 670 | } |
671 | LCRYPTO_ALIAS(PKCS7_RECIP_INFO_free) | ||
646 | 672 | ||
647 | static const ASN1_TEMPLATE PKCS7_ENC_CONTENT_seq_tt[] = { | 673 | static const ASN1_TEMPLATE PKCS7_ENC_CONTENT_seq_tt[] = { |
648 | { | 674 | { |
@@ -685,24 +711,28 @@ d2i_PKCS7_ENC_CONTENT(PKCS7_ENC_CONTENT **a, const unsigned char **in, long len) | |||
685 | return (PKCS7_ENC_CONTENT *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 711 | return (PKCS7_ENC_CONTENT *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
686 | &PKCS7_ENC_CONTENT_it); | 712 | &PKCS7_ENC_CONTENT_it); |
687 | } | 713 | } |
714 | LCRYPTO_ALIAS(d2i_PKCS7_ENC_CONTENT) | ||
688 | 715 | ||
689 | int | 716 | int |
690 | i2d_PKCS7_ENC_CONTENT(PKCS7_ENC_CONTENT *a, unsigned char **out) | 717 | i2d_PKCS7_ENC_CONTENT(PKCS7_ENC_CONTENT *a, unsigned char **out) |
691 | { | 718 | { |
692 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &PKCS7_ENC_CONTENT_it); | 719 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &PKCS7_ENC_CONTENT_it); |
693 | } | 720 | } |
721 | LCRYPTO_ALIAS(i2d_PKCS7_ENC_CONTENT) | ||
694 | 722 | ||
695 | PKCS7_ENC_CONTENT * | 723 | PKCS7_ENC_CONTENT * |
696 | PKCS7_ENC_CONTENT_new(void) | 724 | PKCS7_ENC_CONTENT_new(void) |
697 | { | 725 | { |
698 | return (PKCS7_ENC_CONTENT *)ASN1_item_new(&PKCS7_ENC_CONTENT_it); | 726 | return (PKCS7_ENC_CONTENT *)ASN1_item_new(&PKCS7_ENC_CONTENT_it); |
699 | } | 727 | } |
728 | LCRYPTO_ALIAS(PKCS7_ENC_CONTENT_new) | ||
700 | 729 | ||
701 | void | 730 | void |
702 | PKCS7_ENC_CONTENT_free(PKCS7_ENC_CONTENT *a) | 731 | PKCS7_ENC_CONTENT_free(PKCS7_ENC_CONTENT *a) |
703 | { | 732 | { |
704 | ASN1_item_free((ASN1_VALUE *)a, &PKCS7_ENC_CONTENT_it); | 733 | ASN1_item_free((ASN1_VALUE *)a, &PKCS7_ENC_CONTENT_it); |
705 | } | 734 | } |
735 | LCRYPTO_ALIAS(PKCS7_ENC_CONTENT_free) | ||
706 | 736 | ||
707 | static const ASN1_TEMPLATE PKCS7_SIGN_ENVELOPE_seq_tt[] = { | 737 | static const ASN1_TEMPLATE PKCS7_SIGN_ENVELOPE_seq_tt[] = { |
708 | { | 738 | { |
@@ -773,24 +803,28 @@ d2i_PKCS7_SIGN_ENVELOPE(PKCS7_SIGN_ENVELOPE **a, const unsigned char **in, long | |||
773 | return (PKCS7_SIGN_ENVELOPE *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 803 | return (PKCS7_SIGN_ENVELOPE *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
774 | &PKCS7_SIGN_ENVELOPE_it); | 804 | &PKCS7_SIGN_ENVELOPE_it); |
775 | } | 805 | } |
806 | LCRYPTO_ALIAS(d2i_PKCS7_SIGN_ENVELOPE) | ||
776 | 807 | ||
777 | int | 808 | int |
778 | i2d_PKCS7_SIGN_ENVELOPE(PKCS7_SIGN_ENVELOPE *a, unsigned char **out) | 809 | i2d_PKCS7_SIGN_ENVELOPE(PKCS7_SIGN_ENVELOPE *a, unsigned char **out) |
779 | { | 810 | { |
780 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &PKCS7_SIGN_ENVELOPE_it); | 811 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &PKCS7_SIGN_ENVELOPE_it); |
781 | } | 812 | } |
813 | LCRYPTO_ALIAS(i2d_PKCS7_SIGN_ENVELOPE) | ||
782 | 814 | ||
783 | PKCS7_SIGN_ENVELOPE * | 815 | PKCS7_SIGN_ENVELOPE * |
784 | PKCS7_SIGN_ENVELOPE_new(void) | 816 | PKCS7_SIGN_ENVELOPE_new(void) |
785 | { | 817 | { |
786 | return (PKCS7_SIGN_ENVELOPE *)ASN1_item_new(&PKCS7_SIGN_ENVELOPE_it); | 818 | return (PKCS7_SIGN_ENVELOPE *)ASN1_item_new(&PKCS7_SIGN_ENVELOPE_it); |
787 | } | 819 | } |
820 | LCRYPTO_ALIAS(PKCS7_SIGN_ENVELOPE_new) | ||
788 | 821 | ||
789 | void | 822 | void |
790 | PKCS7_SIGN_ENVELOPE_free(PKCS7_SIGN_ENVELOPE *a) | 823 | PKCS7_SIGN_ENVELOPE_free(PKCS7_SIGN_ENVELOPE *a) |
791 | { | 824 | { |
792 | ASN1_item_free((ASN1_VALUE *)a, &PKCS7_SIGN_ENVELOPE_it); | 825 | ASN1_item_free((ASN1_VALUE *)a, &PKCS7_SIGN_ENVELOPE_it); |
793 | } | 826 | } |
827 | LCRYPTO_ALIAS(PKCS7_SIGN_ENVELOPE_free) | ||
794 | 828 | ||
795 | static const ASN1_TEMPLATE PKCS7_ENCRYPT_seq_tt[] = { | 829 | static const ASN1_TEMPLATE PKCS7_ENCRYPT_seq_tt[] = { |
796 | { | 830 | { |
@@ -826,24 +860,28 @@ d2i_PKCS7_ENCRYPT(PKCS7_ENCRYPT **a, const unsigned char **in, long len) | |||
826 | return (PKCS7_ENCRYPT *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 860 | return (PKCS7_ENCRYPT *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
827 | &PKCS7_ENCRYPT_it); | 861 | &PKCS7_ENCRYPT_it); |
828 | } | 862 | } |
863 | LCRYPTO_ALIAS(d2i_PKCS7_ENCRYPT) | ||
829 | 864 | ||
830 | int | 865 | int |
831 | i2d_PKCS7_ENCRYPT(PKCS7_ENCRYPT *a, unsigned char **out) | 866 | i2d_PKCS7_ENCRYPT(PKCS7_ENCRYPT *a, unsigned char **out) |
832 | { | 867 | { |
833 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &PKCS7_ENCRYPT_it); | 868 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &PKCS7_ENCRYPT_it); |
834 | } | 869 | } |
870 | LCRYPTO_ALIAS(i2d_PKCS7_ENCRYPT) | ||
835 | 871 | ||
836 | PKCS7_ENCRYPT * | 872 | PKCS7_ENCRYPT * |
837 | PKCS7_ENCRYPT_new(void) | 873 | PKCS7_ENCRYPT_new(void) |
838 | { | 874 | { |
839 | return (PKCS7_ENCRYPT *)ASN1_item_new(&PKCS7_ENCRYPT_it); | 875 | return (PKCS7_ENCRYPT *)ASN1_item_new(&PKCS7_ENCRYPT_it); |
840 | } | 876 | } |
877 | LCRYPTO_ALIAS(PKCS7_ENCRYPT_new) | ||
841 | 878 | ||
842 | void | 879 | void |
843 | PKCS7_ENCRYPT_free(PKCS7_ENCRYPT *a) | 880 | PKCS7_ENCRYPT_free(PKCS7_ENCRYPT *a) |
844 | { | 881 | { |
845 | ASN1_item_free((ASN1_VALUE *)a, &PKCS7_ENCRYPT_it); | 882 | ASN1_item_free((ASN1_VALUE *)a, &PKCS7_ENCRYPT_it); |
846 | } | 883 | } |
884 | LCRYPTO_ALIAS(PKCS7_ENCRYPT_free) | ||
847 | 885 | ||
848 | static const ASN1_TEMPLATE PKCS7_DIGEST_seq_tt[] = { | 886 | static const ASN1_TEMPLATE PKCS7_DIGEST_seq_tt[] = { |
849 | { | 887 | { |
@@ -893,24 +931,28 @@ d2i_PKCS7_DIGEST(PKCS7_DIGEST **a, const unsigned char **in, long len) | |||
893 | return (PKCS7_DIGEST *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 931 | return (PKCS7_DIGEST *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
894 | &PKCS7_DIGEST_it); | 932 | &PKCS7_DIGEST_it); |
895 | } | 933 | } |
934 | LCRYPTO_ALIAS(d2i_PKCS7_DIGEST) | ||
896 | 935 | ||
897 | int | 936 | int |
898 | i2d_PKCS7_DIGEST(PKCS7_DIGEST *a, unsigned char **out) | 937 | i2d_PKCS7_DIGEST(PKCS7_DIGEST *a, unsigned char **out) |
899 | { | 938 | { |
900 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &PKCS7_DIGEST_it); | 939 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &PKCS7_DIGEST_it); |
901 | } | 940 | } |
941 | LCRYPTO_ALIAS(i2d_PKCS7_DIGEST) | ||
902 | 942 | ||
903 | PKCS7_DIGEST * | 943 | PKCS7_DIGEST * |
904 | PKCS7_DIGEST_new(void) | 944 | PKCS7_DIGEST_new(void) |
905 | { | 945 | { |
906 | return (PKCS7_DIGEST *)ASN1_item_new(&PKCS7_DIGEST_it); | 946 | return (PKCS7_DIGEST *)ASN1_item_new(&PKCS7_DIGEST_it); |
907 | } | 947 | } |
948 | LCRYPTO_ALIAS(PKCS7_DIGEST_new) | ||
908 | 949 | ||
909 | void | 950 | void |
910 | PKCS7_DIGEST_free(PKCS7_DIGEST *a) | 951 | PKCS7_DIGEST_free(PKCS7_DIGEST *a) |
911 | { | 952 | { |
912 | ASN1_item_free((ASN1_VALUE *)a, &PKCS7_DIGEST_it); | 953 | ASN1_item_free((ASN1_VALUE *)a, &PKCS7_DIGEST_it); |
913 | } | 954 | } |
955 | LCRYPTO_ALIAS(PKCS7_DIGEST_free) | ||
914 | 956 | ||
915 | /* Specials for authenticated attributes */ | 957 | /* Specials for authenticated attributes */ |
916 | 958 | ||
@@ -965,3 +1007,41 @@ PKCS7_print_ctx(BIO *out, PKCS7 *x, int indent, const ASN1_PCTX *pctx) | |||
965 | return ASN1_item_print(out, (ASN1_VALUE *)x, indent, | 1007 | return ASN1_item_print(out, (ASN1_VALUE *)x, indent, |
966 | &PKCS7_it, pctx); | 1008 | &PKCS7_it, pctx); |
967 | } | 1009 | } |
1010 | LCRYPTO_ALIAS(PKCS7_print_ctx) | ||
1011 | |||
1012 | PKCS7 * | ||
1013 | d2i_PKCS7_bio(BIO *bp, PKCS7 **p7) | ||
1014 | { | ||
1015 | return ASN1_item_d2i_bio(&PKCS7_it, bp, p7); | ||
1016 | } | ||
1017 | LCRYPTO_ALIAS(d2i_PKCS7_bio) | ||
1018 | |||
1019 | int | ||
1020 | i2d_PKCS7_bio(BIO *bp, PKCS7 *p7) | ||
1021 | { | ||
1022 | return ASN1_item_i2d_bio(&PKCS7_it, bp, p7); | ||
1023 | } | ||
1024 | LCRYPTO_ALIAS(i2d_PKCS7_bio) | ||
1025 | |||
1026 | PKCS7 * | ||
1027 | d2i_PKCS7_fp(FILE *fp, PKCS7 **p7) | ||
1028 | { | ||
1029 | return ASN1_item_d2i_fp(&PKCS7_it, fp, p7); | ||
1030 | } | ||
1031 | LCRYPTO_ALIAS(d2i_PKCS7_fp) | ||
1032 | |||
1033 | int | ||
1034 | i2d_PKCS7_fp(FILE *fp, PKCS7 *p7) | ||
1035 | { | ||
1036 | return ASN1_item_i2d_fp(&PKCS7_it, fp, p7); | ||
1037 | } | ||
1038 | LCRYPTO_ALIAS(i2d_PKCS7_fp) | ||
1039 | |||
1040 | int | ||
1041 | PKCS7_ISSUER_AND_SERIAL_digest(PKCS7_ISSUER_AND_SERIAL *data, | ||
1042 | const EVP_MD *type, unsigned char *md, unsigned int *len) | ||
1043 | { | ||
1044 | return(ASN1_item_digest(&PKCS7_ISSUER_AND_SERIAL_it, type, | ||
1045 | (char *)data, md, len)); | ||
1046 | } | ||
1047 | LCRYPTO_ALIAS(PKCS7_ISSUER_AND_SERIAL_digest) | ||