diff options
Diffstat (limited to 'src/lib/libcrypto/asn1/x_crl.c')
| -rw-r--r-- | src/lib/libcrypto/asn1/x_crl.c | 36 |
1 files changed, 1 insertions, 35 deletions
diff --git a/src/lib/libcrypto/asn1/x_crl.c b/src/lib/libcrypto/asn1/x_crl.c index 74e07da3b5..b33ae6e032 100644 --- a/src/lib/libcrypto/asn1/x_crl.c +++ b/src/lib/libcrypto/asn1/x_crl.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x_crl.c,v 1.40 2023/07/05 21:23:37 beck Exp $ */ | 1 | /* $OpenBSD: x_crl.c,v 1.41 2023/07/07 19:37:52 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 | * |
| @@ -442,35 +442,30 @@ d2i_X509_REVOKED(X509_REVOKED **a, const unsigned char **in, long len) | |||
| 442 | return (X509_REVOKED *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 442 | return (X509_REVOKED *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
| 443 | &X509_REVOKED_it); | 443 | &X509_REVOKED_it); |
| 444 | } | 444 | } |
| 445 | LCRYPTO_ALIAS(d2i_X509_REVOKED); | ||
| 446 | 445 | ||
| 447 | int | 446 | int |
| 448 | i2d_X509_REVOKED(X509_REVOKED *a, unsigned char **out) | 447 | i2d_X509_REVOKED(X509_REVOKED *a, unsigned char **out) |
| 449 | { | 448 | { |
| 450 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &X509_REVOKED_it); | 449 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &X509_REVOKED_it); |
| 451 | } | 450 | } |
| 452 | LCRYPTO_ALIAS(i2d_X509_REVOKED); | ||
| 453 | 451 | ||
| 454 | X509_REVOKED * | 452 | X509_REVOKED * |
| 455 | X509_REVOKED_new(void) | 453 | X509_REVOKED_new(void) |
| 456 | { | 454 | { |
| 457 | return (X509_REVOKED *)ASN1_item_new(&X509_REVOKED_it); | 455 | return (X509_REVOKED *)ASN1_item_new(&X509_REVOKED_it); |
| 458 | } | 456 | } |
| 459 | LCRYPTO_ALIAS(X509_REVOKED_new); | ||
| 460 | 457 | ||
| 461 | void | 458 | void |
| 462 | X509_REVOKED_free(X509_REVOKED *a) | 459 | X509_REVOKED_free(X509_REVOKED *a) |
| 463 | { | 460 | { |
| 464 | ASN1_item_free((ASN1_VALUE *)a, &X509_REVOKED_it); | 461 | ASN1_item_free((ASN1_VALUE *)a, &X509_REVOKED_it); |
| 465 | } | 462 | } |
| 466 | LCRYPTO_ALIAS(X509_REVOKED_free); | ||
| 467 | 463 | ||
| 468 | X509_REVOKED * | 464 | X509_REVOKED * |
| 469 | X509_REVOKED_dup(X509_REVOKED *a) | 465 | X509_REVOKED_dup(X509_REVOKED *a) |
| 470 | { | 466 | { |
| 471 | return ASN1_item_dup(&X509_REVOKED_it, a); | 467 | return ASN1_item_dup(&X509_REVOKED_it, a); |
| 472 | } | 468 | } |
| 473 | LCRYPTO_ALIAS(X509_REVOKED_dup); | ||
| 474 | 469 | ||
| 475 | X509_CRL_INFO * | 470 | X509_CRL_INFO * |
| 476 | d2i_X509_CRL_INFO(X509_CRL_INFO **a, const unsigned char **in, long len) | 471 | d2i_X509_CRL_INFO(X509_CRL_INFO **a, const unsigned char **in, long len) |
| @@ -478,28 +473,24 @@ d2i_X509_CRL_INFO(X509_CRL_INFO **a, const unsigned char **in, long len) | |||
| 478 | return (X509_CRL_INFO *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 473 | return (X509_CRL_INFO *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
| 479 | &X509_CRL_INFO_it); | 474 | &X509_CRL_INFO_it); |
| 480 | } | 475 | } |
| 481 | LCRYPTO_ALIAS(d2i_X509_CRL_INFO); | ||
| 482 | 476 | ||
| 483 | int | 477 | int |
| 484 | i2d_X509_CRL_INFO(X509_CRL_INFO *a, unsigned char **out) | 478 | i2d_X509_CRL_INFO(X509_CRL_INFO *a, unsigned char **out) |
| 485 | { | 479 | { |
| 486 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &X509_CRL_INFO_it); | 480 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &X509_CRL_INFO_it); |
| 487 | } | 481 | } |
| 488 | LCRYPTO_ALIAS(i2d_X509_CRL_INFO); | ||
| 489 | 482 | ||
| 490 | X509_CRL_INFO * | 483 | X509_CRL_INFO * |
| 491 | X509_CRL_INFO_new(void) | 484 | X509_CRL_INFO_new(void) |
| 492 | { | 485 | { |
| 493 | return (X509_CRL_INFO *)ASN1_item_new(&X509_CRL_INFO_it); | 486 | return (X509_CRL_INFO *)ASN1_item_new(&X509_CRL_INFO_it); |
| 494 | } | 487 | } |
| 495 | LCRYPTO_ALIAS(X509_CRL_INFO_new); | ||
| 496 | 488 | ||
| 497 | void | 489 | void |
| 498 | X509_CRL_INFO_free(X509_CRL_INFO *a) | 490 | X509_CRL_INFO_free(X509_CRL_INFO *a) |
| 499 | { | 491 | { |
| 500 | ASN1_item_free((ASN1_VALUE *)a, &X509_CRL_INFO_it); | 492 | ASN1_item_free((ASN1_VALUE *)a, &X509_CRL_INFO_it); |
| 501 | } | 493 | } |
| 502 | LCRYPTO_ALIAS(X509_CRL_INFO_free); | ||
| 503 | 494 | ||
| 504 | X509_CRL * | 495 | X509_CRL * |
| 505 | d2i_X509_CRL(X509_CRL **a, const unsigned char **in, long len) | 496 | d2i_X509_CRL(X509_CRL **a, const unsigned char **in, long len) |
| @@ -507,35 +498,30 @@ d2i_X509_CRL(X509_CRL **a, const unsigned char **in, long len) | |||
| 507 | return (X509_CRL *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 498 | return (X509_CRL *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
| 508 | &X509_CRL_it); | 499 | &X509_CRL_it); |
| 509 | } | 500 | } |
| 510 | LCRYPTO_ALIAS(d2i_X509_CRL); | ||
| 511 | 501 | ||
| 512 | int | 502 | int |
| 513 | i2d_X509_CRL(X509_CRL *a, unsigned char **out) | 503 | i2d_X509_CRL(X509_CRL *a, unsigned char **out) |
| 514 | { | 504 | { |
| 515 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &X509_CRL_it); | 505 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &X509_CRL_it); |
| 516 | } | 506 | } |
| 517 | LCRYPTO_ALIAS(i2d_X509_CRL); | ||
| 518 | 507 | ||
| 519 | X509_CRL * | 508 | X509_CRL * |
| 520 | X509_CRL_new(void) | 509 | X509_CRL_new(void) |
| 521 | { | 510 | { |
| 522 | return (X509_CRL *)ASN1_item_new(&X509_CRL_it); | 511 | return (X509_CRL *)ASN1_item_new(&X509_CRL_it); |
| 523 | } | 512 | } |
| 524 | LCRYPTO_ALIAS(X509_CRL_new); | ||
| 525 | 513 | ||
| 526 | void | 514 | void |
| 527 | X509_CRL_free(X509_CRL *a) | 515 | X509_CRL_free(X509_CRL *a) |
| 528 | { | 516 | { |
| 529 | ASN1_item_free((ASN1_VALUE *)a, &X509_CRL_it); | 517 | ASN1_item_free((ASN1_VALUE *)a, &X509_CRL_it); |
| 530 | } | 518 | } |
| 531 | LCRYPTO_ALIAS(X509_CRL_free); | ||
| 532 | 519 | ||
| 533 | X509_CRL * | 520 | X509_CRL * |
| 534 | X509_CRL_dup(X509_CRL *x) | 521 | X509_CRL_dup(X509_CRL *x) |
| 535 | { | 522 | { |
| 536 | return ASN1_item_dup(&X509_CRL_it, x); | 523 | return ASN1_item_dup(&X509_CRL_it, x); |
| 537 | } | 524 | } |
| 538 | LCRYPTO_ALIAS(X509_CRL_dup); | ||
| 539 | 525 | ||
| 540 | static int | 526 | static int |
| 541 | X509_REVOKED_cmp(const X509_REVOKED * const *a, const X509_REVOKED * const *b) | 527 | X509_REVOKED_cmp(const X509_REVOKED * const *a, const X509_REVOKED * const *b) |
| @@ -558,7 +544,6 @@ X509_CRL_add0_revoked(X509_CRL *crl, X509_REVOKED *rev) | |||
| 558 | inf->enc.modified = 1; | 544 | inf->enc.modified = 1; |
| 559 | return 1; | 545 | return 1; |
| 560 | } | 546 | } |
| 561 | LCRYPTO_ALIAS(X509_CRL_add0_revoked); | ||
| 562 | 547 | ||
| 563 | int | 548 | int |
| 564 | X509_CRL_verify(X509_CRL *crl, EVP_PKEY *r) | 549 | X509_CRL_verify(X509_CRL *crl, EVP_PKEY *r) |
| @@ -567,7 +552,6 @@ X509_CRL_verify(X509_CRL *crl, EVP_PKEY *r) | |||
| 567 | return crl->meth->crl_verify(crl, r); | 552 | return crl->meth->crl_verify(crl, r); |
| 568 | return 0; | 553 | return 0; |
| 569 | } | 554 | } |
| 570 | LCRYPTO_ALIAS(X509_CRL_verify); | ||
| 571 | 555 | ||
| 572 | int | 556 | int |
| 573 | X509_CRL_get0_by_serial(X509_CRL *crl, X509_REVOKED **ret, | 557 | X509_CRL_get0_by_serial(X509_CRL *crl, X509_REVOKED **ret, |
| @@ -577,7 +561,6 @@ X509_CRL_get0_by_serial(X509_CRL *crl, X509_REVOKED **ret, | |||
| 577 | return crl->meth->crl_lookup(crl, ret, serial, NULL); | 561 | return crl->meth->crl_lookup(crl, ret, serial, NULL); |
| 578 | return 0; | 562 | return 0; |
| 579 | } | 563 | } |
| 580 | LCRYPTO_ALIAS(X509_CRL_get0_by_serial); | ||
| 581 | 564 | ||
| 582 | int | 565 | int |
| 583 | X509_CRL_get0_by_cert(X509_CRL *crl, X509_REVOKED **ret, X509 *x) | 566 | X509_CRL_get0_by_cert(X509_CRL *crl, X509_REVOKED **ret, X509 *x) |
| @@ -587,7 +570,6 @@ X509_CRL_get0_by_cert(X509_CRL *crl, X509_REVOKED **ret, X509 *x) | |||
| 587 | X509_get_serialNumber(x), X509_get_issuer_name(x)); | 570 | X509_get_serialNumber(x), X509_get_issuer_name(x)); |
| 588 | return 0; | 571 | return 0; |
| 589 | } | 572 | } |
| 590 | LCRYPTO_ALIAS(X509_CRL_get0_by_cert); | ||
| 591 | 573 | ||
| 592 | static int | 574 | static int |
| 593 | def_crl_verify(X509_CRL *crl, EVP_PKEY *r) | 575 | def_crl_verify(X509_CRL *crl, EVP_PKEY *r) |
| @@ -666,7 +648,6 @@ X509_CRL_set_default_method(const X509_CRL_METHOD *meth) | |||
| 666 | else | 648 | else |
| 667 | default_crl_method = meth; | 649 | default_crl_method = meth; |
| 668 | } | 650 | } |
| 669 | LCRYPTO_ALIAS(X509_CRL_set_default_method); | ||
| 670 | 651 | ||
| 671 | X509_CRL_METHOD * | 652 | X509_CRL_METHOD * |
| 672 | X509_CRL_METHOD_new(int (*crl_init)(X509_CRL *crl), | 653 | X509_CRL_METHOD_new(int (*crl_init)(X509_CRL *crl), |
| @@ -688,7 +669,6 @@ X509_CRL_METHOD_new(int (*crl_init)(X509_CRL *crl), | |||
| 688 | 669 | ||
| 689 | return m; | 670 | return m; |
| 690 | } | 671 | } |
| 691 | LCRYPTO_ALIAS(X509_CRL_METHOD_new); | ||
| 692 | 672 | ||
| 693 | void | 673 | void |
| 694 | X509_CRL_METHOD_free(X509_CRL_METHOD *m) | 674 | X509_CRL_METHOD_free(X509_CRL_METHOD *m) |
| @@ -699,84 +679,72 @@ X509_CRL_METHOD_free(X509_CRL_METHOD *m) | |||
| 699 | return; | 679 | return; |
| 700 | free(m); | 680 | free(m); |
| 701 | } | 681 | } |
| 702 | LCRYPTO_ALIAS(X509_CRL_METHOD_free); | ||
| 703 | 682 | ||
| 704 | void | 683 | void |
| 705 | X509_CRL_set_meth_data(X509_CRL *crl, void *dat) | 684 | X509_CRL_set_meth_data(X509_CRL *crl, void *dat) |
| 706 | { | 685 | { |
| 707 | crl->meth_data = dat; | 686 | crl->meth_data = dat; |
| 708 | } | 687 | } |
| 709 | LCRYPTO_ALIAS(X509_CRL_set_meth_data); | ||
| 710 | 688 | ||
| 711 | void * | 689 | void * |
| 712 | X509_CRL_get_meth_data(X509_CRL *crl) | 690 | X509_CRL_get_meth_data(X509_CRL *crl) |
| 713 | { | 691 | { |
| 714 | return crl->meth_data; | 692 | return crl->meth_data; |
| 715 | } | 693 | } |
| 716 | LCRYPTO_ALIAS(X509_CRL_get_meth_data); | ||
| 717 | 694 | ||
| 718 | int | 695 | int |
| 719 | X509_CRL_get_signature_nid(const X509_CRL *crl) | 696 | X509_CRL_get_signature_nid(const X509_CRL *crl) |
| 720 | { | 697 | { |
| 721 | return OBJ_obj2nid(crl->sig_alg->algorithm); | 698 | return OBJ_obj2nid(crl->sig_alg->algorithm); |
| 722 | } | 699 | } |
| 723 | LCRYPTO_ALIAS(X509_CRL_get_signature_nid); | ||
| 724 | 700 | ||
| 725 | const STACK_OF(X509_EXTENSION) * | 701 | const STACK_OF(X509_EXTENSION) * |
| 726 | X509_CRL_get0_extensions(const X509_CRL *crl) | 702 | X509_CRL_get0_extensions(const X509_CRL *crl) |
| 727 | { | 703 | { |
| 728 | return crl->crl->extensions; | 704 | return crl->crl->extensions; |
| 729 | } | 705 | } |
| 730 | LCRYPTO_ALIAS(X509_CRL_get0_extensions); | ||
| 731 | 706 | ||
| 732 | long | 707 | long |
| 733 | X509_CRL_get_version(const X509_CRL *crl) | 708 | X509_CRL_get_version(const X509_CRL *crl) |
| 734 | { | 709 | { |
| 735 | return ASN1_INTEGER_get(crl->crl->version); | 710 | return ASN1_INTEGER_get(crl->crl->version); |
| 736 | } | 711 | } |
| 737 | LCRYPTO_ALIAS(X509_CRL_get_version); | ||
| 738 | 712 | ||
| 739 | const ASN1_TIME * | 713 | const ASN1_TIME * |
| 740 | X509_CRL_get0_lastUpdate(const X509_CRL *crl) | 714 | X509_CRL_get0_lastUpdate(const X509_CRL *crl) |
| 741 | { | 715 | { |
| 742 | return crl->crl->lastUpdate; | 716 | return crl->crl->lastUpdate; |
| 743 | } | 717 | } |
| 744 | LCRYPTO_ALIAS(X509_CRL_get0_lastUpdate); | ||
| 745 | 718 | ||
| 746 | ASN1_TIME * | 719 | ASN1_TIME * |
| 747 | X509_CRL_get_lastUpdate(X509_CRL *crl) | 720 | X509_CRL_get_lastUpdate(X509_CRL *crl) |
| 748 | { | 721 | { |
| 749 | return crl->crl->lastUpdate; | 722 | return crl->crl->lastUpdate; |
| 750 | } | 723 | } |
| 751 | LCRYPTO_ALIAS(X509_CRL_get_lastUpdate); | ||
| 752 | 724 | ||
| 753 | const ASN1_TIME * | 725 | const ASN1_TIME * |
| 754 | X509_CRL_get0_nextUpdate(const X509_CRL *crl) | 726 | X509_CRL_get0_nextUpdate(const X509_CRL *crl) |
| 755 | { | 727 | { |
| 756 | return crl->crl->nextUpdate; | 728 | return crl->crl->nextUpdate; |
| 757 | } | 729 | } |
| 758 | LCRYPTO_ALIAS(X509_CRL_get0_nextUpdate); | ||
| 759 | 730 | ||
| 760 | ASN1_TIME * | 731 | ASN1_TIME * |
| 761 | X509_CRL_get_nextUpdate(X509_CRL *crl) | 732 | X509_CRL_get_nextUpdate(X509_CRL *crl) |
| 762 | { | 733 | { |
| 763 | return crl->crl->nextUpdate; | 734 | return crl->crl->nextUpdate; |
| 764 | } | 735 | } |
| 765 | LCRYPTO_ALIAS(X509_CRL_get_nextUpdate); | ||
| 766 | 736 | ||
| 767 | X509_NAME * | 737 | X509_NAME * |
| 768 | X509_CRL_get_issuer(const X509_CRL *crl) | 738 | X509_CRL_get_issuer(const X509_CRL *crl) |
| 769 | { | 739 | { |
| 770 | return crl->crl->issuer; | 740 | return crl->crl->issuer; |
| 771 | } | 741 | } |
| 772 | LCRYPTO_ALIAS(X509_CRL_get_issuer); | ||
| 773 | 742 | ||
| 774 | STACK_OF(X509_REVOKED) * | 743 | STACK_OF(X509_REVOKED) * |
| 775 | X509_CRL_get_REVOKED(X509_CRL *crl) | 744 | X509_CRL_get_REVOKED(X509_CRL *crl) |
| 776 | { | 745 | { |
| 777 | return crl->crl->revoked; | 746 | return crl->crl->revoked; |
| 778 | } | 747 | } |
| 779 | LCRYPTO_ALIAS(X509_CRL_get_REVOKED); | ||
| 780 | 748 | ||
| 781 | void | 749 | void |
| 782 | X509_CRL_get0_signature(const X509_CRL *crl, const ASN1_BIT_STRING **psig, | 750 | X509_CRL_get0_signature(const X509_CRL *crl, const ASN1_BIT_STRING **psig, |
| @@ -787,11 +755,9 @@ X509_CRL_get0_signature(const X509_CRL *crl, const ASN1_BIT_STRING **psig, | |||
| 787 | if (palg != NULL) | 755 | if (palg != NULL) |
| 788 | *palg = crl->sig_alg; | 756 | *palg = crl->sig_alg; |
| 789 | } | 757 | } |
| 790 | LCRYPTO_ALIAS(X509_CRL_get0_signature); | ||
| 791 | 758 | ||
| 792 | const X509_ALGOR * | 759 | const X509_ALGOR * |
| 793 | X509_CRL_get0_tbs_sigalg(const X509_CRL *crl) | 760 | X509_CRL_get0_tbs_sigalg(const X509_CRL *crl) |
| 794 | { | 761 | { |
| 795 | return crl->crl->sig_alg; | 762 | return crl->crl->sig_alg; |
| 796 | } | 763 | } |
| 797 | LCRYPTO_ALIAS(X509_CRL_get0_tbs_sigalg); | ||
