summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/asn1/x_crl.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/asn1/x_crl.c')
-rw-r--r--src/lib/libcrypto/asn1/x_crl.c36
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}
445LCRYPTO_ALIAS(d2i_X509_REVOKED);
446 445
447int 446int
448i2d_X509_REVOKED(X509_REVOKED *a, unsigned char **out) 447i2d_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}
452LCRYPTO_ALIAS(i2d_X509_REVOKED);
453 451
454X509_REVOKED * 452X509_REVOKED *
455X509_REVOKED_new(void) 453X509_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}
459LCRYPTO_ALIAS(X509_REVOKED_new);
460 457
461void 458void
462X509_REVOKED_free(X509_REVOKED *a) 459X509_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}
466LCRYPTO_ALIAS(X509_REVOKED_free);
467 463
468X509_REVOKED * 464X509_REVOKED *
469X509_REVOKED_dup(X509_REVOKED *a) 465X509_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}
473LCRYPTO_ALIAS(X509_REVOKED_dup);
474 469
475X509_CRL_INFO * 470X509_CRL_INFO *
476d2i_X509_CRL_INFO(X509_CRL_INFO **a, const unsigned char **in, long len) 471d2i_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}
481LCRYPTO_ALIAS(d2i_X509_CRL_INFO);
482 476
483int 477int
484i2d_X509_CRL_INFO(X509_CRL_INFO *a, unsigned char **out) 478i2d_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}
488LCRYPTO_ALIAS(i2d_X509_CRL_INFO);
489 482
490X509_CRL_INFO * 483X509_CRL_INFO *
491X509_CRL_INFO_new(void) 484X509_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}
495LCRYPTO_ALIAS(X509_CRL_INFO_new);
496 488
497void 489void
498X509_CRL_INFO_free(X509_CRL_INFO *a) 490X509_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}
502LCRYPTO_ALIAS(X509_CRL_INFO_free);
503 494
504X509_CRL * 495X509_CRL *
505d2i_X509_CRL(X509_CRL **a, const unsigned char **in, long len) 496d2i_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}
510LCRYPTO_ALIAS(d2i_X509_CRL);
511 501
512int 502int
513i2d_X509_CRL(X509_CRL *a, unsigned char **out) 503i2d_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}
517LCRYPTO_ALIAS(i2d_X509_CRL);
518 507
519X509_CRL * 508X509_CRL *
520X509_CRL_new(void) 509X509_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}
524LCRYPTO_ALIAS(X509_CRL_new);
525 513
526void 514void
527X509_CRL_free(X509_CRL *a) 515X509_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}
531LCRYPTO_ALIAS(X509_CRL_free);
532 519
533X509_CRL * 520X509_CRL *
534X509_CRL_dup(X509_CRL *x) 521X509_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}
538LCRYPTO_ALIAS(X509_CRL_dup);
539 525
540static int 526static int
541X509_REVOKED_cmp(const X509_REVOKED * const *a, const X509_REVOKED * const *b) 527X509_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}
561LCRYPTO_ALIAS(X509_CRL_add0_revoked);
562 547
563int 548int
564X509_CRL_verify(X509_CRL *crl, EVP_PKEY *r) 549X509_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}
570LCRYPTO_ALIAS(X509_CRL_verify);
571 555
572int 556int
573X509_CRL_get0_by_serial(X509_CRL *crl, X509_REVOKED **ret, 557X509_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}
580LCRYPTO_ALIAS(X509_CRL_get0_by_serial);
581 564
582int 565int
583X509_CRL_get0_by_cert(X509_CRL *crl, X509_REVOKED **ret, X509 *x) 566X509_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}
590LCRYPTO_ALIAS(X509_CRL_get0_by_cert);
591 573
592static int 574static int
593def_crl_verify(X509_CRL *crl, EVP_PKEY *r) 575def_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}
669LCRYPTO_ALIAS(X509_CRL_set_default_method);
670 651
671X509_CRL_METHOD * 652X509_CRL_METHOD *
672X509_CRL_METHOD_new(int (*crl_init)(X509_CRL *crl), 653X509_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}
691LCRYPTO_ALIAS(X509_CRL_METHOD_new);
692 672
693void 673void
694X509_CRL_METHOD_free(X509_CRL_METHOD *m) 674X509_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}
702LCRYPTO_ALIAS(X509_CRL_METHOD_free);
703 682
704void 683void
705X509_CRL_set_meth_data(X509_CRL *crl, void *dat) 684X509_CRL_set_meth_data(X509_CRL *crl, void *dat)
706{ 685{
707 crl->meth_data = dat; 686 crl->meth_data = dat;
708} 687}
709LCRYPTO_ALIAS(X509_CRL_set_meth_data);
710 688
711void * 689void *
712X509_CRL_get_meth_data(X509_CRL *crl) 690X509_CRL_get_meth_data(X509_CRL *crl)
713{ 691{
714 return crl->meth_data; 692 return crl->meth_data;
715} 693}
716LCRYPTO_ALIAS(X509_CRL_get_meth_data);
717 694
718int 695int
719X509_CRL_get_signature_nid(const X509_CRL *crl) 696X509_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}
723LCRYPTO_ALIAS(X509_CRL_get_signature_nid);
724 700
725const STACK_OF(X509_EXTENSION) * 701const STACK_OF(X509_EXTENSION) *
726X509_CRL_get0_extensions(const X509_CRL *crl) 702X509_CRL_get0_extensions(const X509_CRL *crl)
727{ 703{
728 return crl->crl->extensions; 704 return crl->crl->extensions;
729} 705}
730LCRYPTO_ALIAS(X509_CRL_get0_extensions);
731 706
732long 707long
733X509_CRL_get_version(const X509_CRL *crl) 708X509_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}
737LCRYPTO_ALIAS(X509_CRL_get_version);
738 712
739const ASN1_TIME * 713const ASN1_TIME *
740X509_CRL_get0_lastUpdate(const X509_CRL *crl) 714X509_CRL_get0_lastUpdate(const X509_CRL *crl)
741{ 715{
742 return crl->crl->lastUpdate; 716 return crl->crl->lastUpdate;
743} 717}
744LCRYPTO_ALIAS(X509_CRL_get0_lastUpdate);
745 718
746ASN1_TIME * 719ASN1_TIME *
747X509_CRL_get_lastUpdate(X509_CRL *crl) 720X509_CRL_get_lastUpdate(X509_CRL *crl)
748{ 721{
749 return crl->crl->lastUpdate; 722 return crl->crl->lastUpdate;
750} 723}
751LCRYPTO_ALIAS(X509_CRL_get_lastUpdate);
752 724
753const ASN1_TIME * 725const ASN1_TIME *
754X509_CRL_get0_nextUpdate(const X509_CRL *crl) 726X509_CRL_get0_nextUpdate(const X509_CRL *crl)
755{ 727{
756 return crl->crl->nextUpdate; 728 return crl->crl->nextUpdate;
757} 729}
758LCRYPTO_ALIAS(X509_CRL_get0_nextUpdate);
759 730
760ASN1_TIME * 731ASN1_TIME *
761X509_CRL_get_nextUpdate(X509_CRL *crl) 732X509_CRL_get_nextUpdate(X509_CRL *crl)
762{ 733{
763 return crl->crl->nextUpdate; 734 return crl->crl->nextUpdate;
764} 735}
765LCRYPTO_ALIAS(X509_CRL_get_nextUpdate);
766 736
767X509_NAME * 737X509_NAME *
768X509_CRL_get_issuer(const X509_CRL *crl) 738X509_CRL_get_issuer(const X509_CRL *crl)
769{ 739{
770 return crl->crl->issuer; 740 return crl->crl->issuer;
771} 741}
772LCRYPTO_ALIAS(X509_CRL_get_issuer);
773 742
774STACK_OF(X509_REVOKED) * 743STACK_OF(X509_REVOKED) *
775X509_CRL_get_REVOKED(X509_CRL *crl) 744X509_CRL_get_REVOKED(X509_CRL *crl)
776{ 745{
777 return crl->crl->revoked; 746 return crl->crl->revoked;
778} 747}
779LCRYPTO_ALIAS(X509_CRL_get_REVOKED);
780 748
781void 749void
782X509_CRL_get0_signature(const X509_CRL *crl, const ASN1_BIT_STRING **psig, 750X509_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}
790LCRYPTO_ALIAS(X509_CRL_get0_signature);
791 758
792const X509_ALGOR * 759const X509_ALGOR *
793X509_CRL_get0_tbs_sigalg(const X509_CRL *crl) 760X509_CRL_get0_tbs_sigalg(const X509_CRL *crl)
794{ 761{
795 return crl->crl->sig_alg; 762 return crl->crl->sig_alg;
796} 763}
797LCRYPTO_ALIAS(X509_CRL_get0_tbs_sigalg);