diff options
author | jsing <> | 2018-02-20 17:04:58 +0000 |
---|---|---|
committer | jsing <> | 2018-02-20 17:04:58 +0000 |
commit | cc1f0bce1bf038cad010ba68450bb20f3fd0c6eb (patch) | |
tree | 70bd1e62d1474d96275fe17c8618067056f83bc6 | |
parent | 5bf183e39d6cd514bbf349bc1c1b2deb8620ea79 (diff) | |
download | openbsd-cc1f0bce1bf038cad010ba68450bb20f3fd0c6eb.tar.gz openbsd-cc1f0bce1bf038cad010ba68450bb20f3fd0c6eb.tar.bz2 openbsd-cc1f0bce1bf038cad010ba68450bb20f3fd0c6eb.zip |
Provide X509_CRL_get0_{last,next}Update() and X509_CRL_get0_signature().
-rw-r--r-- | src/lib/libcrypto/Symbols.list | 3 | ||||
-rw-r--r-- | src/lib/libcrypto/asn1/x_crl.c | 24 | ||||
-rw-r--r-- | src/lib/libcrypto/x509/x509.h | 7 |
3 files changed, 32 insertions, 2 deletions
diff --git a/src/lib/libcrypto/Symbols.list b/src/lib/libcrypto/Symbols.list index a2957cf4ac..f57513291e 100644 --- a/src/lib/libcrypto/Symbols.list +++ b/src/lib/libcrypto/Symbols.list | |||
@@ -2620,6 +2620,9 @@ X509_CRL_dup | |||
2620 | X509_CRL_free | 2620 | X509_CRL_free |
2621 | X509_CRL_get0_by_cert | 2621 | X509_CRL_get0_by_cert |
2622 | X509_CRL_get0_by_serial | 2622 | X509_CRL_get0_by_serial |
2623 | X509_CRL_get0_lastUpdate | ||
2624 | X509_CRL_get0_nextUpdate | ||
2625 | X509_CRL_get0_signature | ||
2623 | X509_CRL_get_ext | 2626 | X509_CRL_get_ext |
2624 | X509_CRL_get_ext_by_NID | 2627 | X509_CRL_get_ext_by_NID |
2625 | X509_CRL_get_ext_by_OBJ | 2628 | X509_CRL_get_ext_by_OBJ |
diff --git a/src/lib/libcrypto/asn1/x_crl.c b/src/lib/libcrypto/asn1/x_crl.c index d8f24ca10b..0da2e9572b 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.27 2017/01/29 17:49:22 beck Exp $ */ | 1 | /* $OpenBSD: x_crl.c,v 1.28 2018/02/20 17:04:58 jsing 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 | * |
@@ -685,3 +685,25 @@ X509_CRL_get_meth_data(X509_CRL *crl) | |||
685 | { | 685 | { |
686 | return crl->meth_data; | 686 | return crl->meth_data; |
687 | } | 687 | } |
688 | |||
689 | const ASN1_TIME * | ||
690 | X509_CRL_get0_lastUpdate(const X509_CRL *crl) | ||
691 | { | ||
692 | return crl->crl->lastUpdate; | ||
693 | } | ||
694 | |||
695 | const ASN1_TIME * | ||
696 | X509_CRL_get0_nextUpdate(const X509_CRL *crl) | ||
697 | { | ||
698 | return crl->crl->nextUpdate; | ||
699 | } | ||
700 | |||
701 | void | ||
702 | X509_CRL_get0_signature(const X509_CRL *crl, const ASN1_BIT_STRING **psig, | ||
703 | const X509_ALGOR **palg) | ||
704 | { | ||
705 | if (psig != NULL) | ||
706 | *psig = crl->signature; | ||
707 | if (palg != NULL) | ||
708 | *palg = crl->sig_alg; | ||
709 | } | ||
diff --git a/src/lib/libcrypto/x509/x509.h b/src/lib/libcrypto/x509/x509.h index 6d6451171c..9d02e319aa 100644 --- a/src/lib/libcrypto/x509/x509.h +++ b/src/lib/libcrypto/x509/x509.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x509.h,v 1.29 2018/02/17 15:50:42 jsing Exp $ */ | 1 | /* $OpenBSD: x509.h,v 1.30 2018/02/20 17:04:58 jsing 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 | * |
@@ -606,6 +606,11 @@ extern "C" { | |||
606 | #define X509_CRL_get_issuer(x) ((x)->crl->issuer) | 606 | #define X509_CRL_get_issuer(x) ((x)->crl->issuer) |
607 | #define X509_CRL_get_REVOKED(x) ((x)->crl->revoked) | 607 | #define X509_CRL_get_REVOKED(x) ((x)->crl->revoked) |
608 | 608 | ||
609 | const ASN1_TIME *X509_CRL_get0_lastUpdate(const X509_CRL *crl); | ||
610 | const ASN1_TIME *X509_CRL_get0_nextUpdate(const X509_CRL *crl); | ||
611 | void X509_CRL_get0_signature(const X509_CRL *crl, const ASN1_BIT_STRING **psig, | ||
612 | const X509_ALGOR **palg); | ||
613 | |||
609 | void X509_CRL_set_default_method(const X509_CRL_METHOD *meth); | 614 | void X509_CRL_set_default_method(const X509_CRL_METHOD *meth); |
610 | X509_CRL_METHOD *X509_CRL_METHOD_new( | 615 | X509_CRL_METHOD *X509_CRL_METHOD_new( |
611 | int (*crl_init)(X509_CRL *crl), | 616 | int (*crl_init)(X509_CRL *crl), |