diff options
Diffstat (limited to 'src/lib/libcrypto')
| -rw-r--r-- | src/lib/libcrypto/Symbols.list | 2 | ||||
| -rw-r--r-- | src/lib/libcrypto/asn1/x_crl.c | 14 | ||||
| -rw-r--r-- | src/lib/libcrypto/x509/x509.h | 6 |
3 files changed, 20 insertions, 2 deletions
diff --git a/src/lib/libcrypto/Symbols.list b/src/lib/libcrypto/Symbols.list index 3b4cbc386f..a6404766db 100644 --- a/src/lib/libcrypto/Symbols.list +++ b/src/lib/libcrypto/Symbols.list | |||
| @@ -2651,6 +2651,7 @@ X509_CRL_dup | |||
| 2651 | X509_CRL_free | 2651 | X509_CRL_free |
| 2652 | X509_CRL_get0_by_cert | 2652 | X509_CRL_get0_by_cert |
| 2653 | X509_CRL_get0_by_serial | 2653 | X509_CRL_get0_by_serial |
| 2654 | X509_CRL_get0_extensions | ||
| 2654 | X509_CRL_get0_lastUpdate | 2655 | X509_CRL_get0_lastUpdate |
| 2655 | X509_CRL_get0_nextUpdate | 2656 | X509_CRL_get0_nextUpdate |
| 2656 | X509_CRL_get0_signature | 2657 | X509_CRL_get0_signature |
| @@ -2661,6 +2662,7 @@ X509_CRL_get_ext_by_critical | |||
| 2661 | X509_CRL_get_ext_count | 2662 | X509_CRL_get_ext_count |
| 2662 | X509_CRL_get_ext_d2i | 2663 | X509_CRL_get_ext_d2i |
| 2663 | X509_CRL_get_meth_data | 2664 | X509_CRL_get_meth_data |
| 2665 | X509_CRL_get_signature_nid | ||
| 2664 | X509_CRL_it | 2666 | X509_CRL_it |
| 2665 | X509_CRL_match | 2667 | X509_CRL_match |
| 2666 | X509_CRL_new | 2668 | X509_CRL_new |
diff --git a/src/lib/libcrypto/asn1/x_crl.c b/src/lib/libcrypto/asn1/x_crl.c index 0da2e9572b..b8f517d873 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.28 2018/02/20 17:04:58 jsing Exp $ */ | 1 | /* $OpenBSD: x_crl.c,v 1.29 2018/02/22 16:58:45 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 | * |
| @@ -686,6 +686,18 @@ X509_CRL_get_meth_data(X509_CRL *crl) | |||
| 686 | return crl->meth_data; | 686 | return crl->meth_data; |
| 687 | } | 687 | } |
| 688 | 688 | ||
| 689 | int | ||
| 690 | X509_CRL_get_signature_nid(const X509_CRL *crl) | ||
| 691 | { | ||
| 692 | return OBJ_obj2nid(crl->sig_alg->algorithm); | ||
| 693 | } | ||
| 694 | |||
| 695 | const STACK_OF(X509_EXTENSION) * | ||
| 696 | X509_CRL_get0_extensions(const X509_CRL *crl) | ||
| 697 | { | ||
| 698 | return crl->crl->extensions; | ||
| 699 | } | ||
| 700 | |||
| 689 | const ASN1_TIME * | 701 | const ASN1_TIME * |
| 690 | X509_CRL_get0_lastUpdate(const X509_CRL *crl) | 702 | X509_CRL_get0_lastUpdate(const X509_CRL *crl) |
| 691 | { | 703 | { |
diff --git a/src/lib/libcrypto/x509/x509.h b/src/lib/libcrypto/x509/x509.h index 3dc636473f..4f3c730a8f 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.35 2018/02/22 16:53:42 jsing Exp $ */ | 1 | /* $OpenBSD: x509.h,v 1.36 2018/02/22 16:58:45 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 | * |
| @@ -607,7 +607,9 @@ extern "C" { | |||
| 607 | #define X509_CRL_get_REVOKED(x) ((x)->crl->revoked) | 607 | #define X509_CRL_get_REVOKED(x) ((x)->crl->revoked) |
| 608 | 608 | ||
| 609 | int X509_CRL_up_ref(X509_CRL *x); | 609 | int X509_CRL_up_ref(X509_CRL *x); |
| 610 | int X509_CRL_get_signature_nid(const X509_CRL *crl); | ||
| 610 | 611 | ||
| 612 | const STACK_OF(X509_EXTENSION) *X509_CRL_get0_extensions(const X509_CRL *crl); | ||
| 611 | const ASN1_TIME *X509_CRL_get0_lastUpdate(const X509_CRL *crl); | 613 | const ASN1_TIME *X509_CRL_get0_lastUpdate(const X509_CRL *crl); |
| 612 | const ASN1_TIME *X509_CRL_get0_nextUpdate(const X509_CRL *crl); | 614 | const ASN1_TIME *X509_CRL_get0_nextUpdate(const X509_CRL *crl); |
| 613 | void X509_CRL_get0_signature(const X509_CRL *crl, const ASN1_BIT_STRING **psig, | 615 | void X509_CRL_get0_signature(const X509_CRL *crl, const ASN1_BIT_STRING **psig, |
| @@ -920,11 +922,13 @@ void X509_REVOKED_free(X509_REVOKED *a); | |||
| 920 | X509_REVOKED *d2i_X509_REVOKED(X509_REVOKED **a, const unsigned char **in, long len); | 922 | X509_REVOKED *d2i_X509_REVOKED(X509_REVOKED **a, const unsigned char **in, long len); |
| 921 | int i2d_X509_REVOKED(X509_REVOKED *a, unsigned char **out); | 923 | int i2d_X509_REVOKED(X509_REVOKED *a, unsigned char **out); |
| 922 | extern const ASN1_ITEM X509_REVOKED_it; | 924 | extern const ASN1_ITEM X509_REVOKED_it; |
| 925 | |||
| 923 | X509_CRL_INFO *X509_CRL_INFO_new(void); | 926 | X509_CRL_INFO *X509_CRL_INFO_new(void); |
| 924 | void X509_CRL_INFO_free(X509_CRL_INFO *a); | 927 | void X509_CRL_INFO_free(X509_CRL_INFO *a); |
| 925 | X509_CRL_INFO *d2i_X509_CRL_INFO(X509_CRL_INFO **a, const unsigned char **in, long len); | 928 | X509_CRL_INFO *d2i_X509_CRL_INFO(X509_CRL_INFO **a, const unsigned char **in, long len); |
| 926 | int i2d_X509_CRL_INFO(X509_CRL_INFO *a, unsigned char **out); | 929 | int i2d_X509_CRL_INFO(X509_CRL_INFO *a, unsigned char **out); |
| 927 | extern const ASN1_ITEM X509_CRL_INFO_it; | 930 | extern const ASN1_ITEM X509_CRL_INFO_it; |
| 931 | |||
| 928 | X509_CRL *X509_CRL_new(void); | 932 | X509_CRL *X509_CRL_new(void); |
| 929 | void X509_CRL_free(X509_CRL *a); | 933 | void X509_CRL_free(X509_CRL *a); |
| 930 | X509_CRL *d2i_X509_CRL(X509_CRL **a, const unsigned char **in, long len); | 934 | X509_CRL *d2i_X509_CRL(X509_CRL **a, const unsigned char **in, long len); |
