diff options
-rw-r--r-- | src/lib/libcrypto/Symbols.list | 1 | ||||
-rw-r--r-- | src/lib/libcrypto/asn1/x_req.c | 8 | ||||
-rw-r--r-- | src/lib/libcrypto/x509/x509.h | 4 |
3 files changed, 11 insertions, 2 deletions
diff --git a/src/lib/libcrypto/Symbols.list b/src/lib/libcrypto/Symbols.list index 511c44cd86..fb10bdedd6 100644 --- a/src/lib/libcrypto/Symbols.list +++ b/src/lib/libcrypto/Symbols.list | |||
@@ -2791,6 +2791,7 @@ X509_REQ_get_attr_count | |||
2791 | X509_REQ_get_extension_nids | 2791 | X509_REQ_get_extension_nids |
2792 | X509_REQ_get_extensions | 2792 | X509_REQ_get_extensions |
2793 | X509_REQ_get_pubkey | 2793 | X509_REQ_get_pubkey |
2794 | X509_REQ_get_signature_nid | ||
2794 | X509_REQ_it | 2795 | X509_REQ_it |
2795 | X509_REQ_new | 2796 | X509_REQ_new |
2796 | X509_REQ_print | 2797 | X509_REQ_print |
diff --git a/src/lib/libcrypto/asn1/x_req.c b/src/lib/libcrypto/asn1/x_req.c index 38a6ec885c..eb5210aef6 100644 --- a/src/lib/libcrypto/asn1/x_req.c +++ b/src/lib/libcrypto/asn1/x_req.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x_req.c,v 1.16 2018/02/20 17:06:19 jsing Exp $ */ | 1 | /* $OpenBSD: x_req.c,v 1.17 2018/02/22 16:50:30 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 | * |
@@ -226,6 +226,12 @@ X509_REQ_dup(X509_REQ *x) | |||
226 | return ASN1_item_dup(&X509_REQ_it, x); | 226 | return ASN1_item_dup(&X509_REQ_it, x); |
227 | } | 227 | } |
228 | 228 | ||
229 | int | ||
230 | X509_REQ_get_signature_nid(const X509_REQ *req) | ||
231 | { | ||
232 | return OBJ_obj2nid(req->sig_alg->algorithm); | ||
233 | } | ||
234 | |||
229 | void | 235 | void |
230 | X509_REQ_get0_signature(const X509_REQ *req, const ASN1_BIT_STRING **psig, | 236 | X509_REQ_get0_signature(const X509_REQ *req, const ASN1_BIT_STRING **psig, |
231 | const X509_ALGOR **palg) | 237 | const X509_ALGOR **palg) |
diff --git a/src/lib/libcrypto/x509/x509.h b/src/lib/libcrypto/x509/x509.h index c7695b4663..9033b1d4d9 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.33 2018/02/22 16:47:50 jsing Exp $ */ | 1 | /* $OpenBSD: x509.h,v 1.34 2018/02/22 16:50:30 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 | * |
@@ -611,6 +611,8 @@ 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, | 611 | void X509_CRL_get0_signature(const X509_CRL *crl, const ASN1_BIT_STRING **psig, |
612 | const X509_ALGOR **palg); | 612 | const X509_ALGOR **palg); |
613 | 613 | ||
614 | int X509_REQ_get_signature_nid(const X509_REQ *req); | ||
615 | |||
614 | void X509_REQ_get0_signature(const X509_REQ *req, const ASN1_BIT_STRING **psig, | 616 | void X509_REQ_get0_signature(const X509_REQ *req, const ASN1_BIT_STRING **psig, |
615 | const X509_ALGOR **palg); | 617 | const X509_ALGOR **palg); |
616 | 618 | ||