2 files changed, 32 insertions, 5 deletions

diff --git a/src/lib/libcrypto/man/Makefile b/src/lib/libcrypto/man/Makefile
index 431285c7e0..8d15d6121c 100644
--- a/src/lib/libcrypto/man/Makefile
+++ b/src/lib/libcrypto/man/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.131 2018/02/17 23:24:38 schwarze Exp $
+# $OpenBSD: Makefile,v 1.132 2018/02/19 08:20:26 schwarze Exp $
 
 .include <bsd.own.mk>
 
@@ -241,10 +241,10 @@ MAN=	\
         X509_digest.3 \
         X509_get_pubkey.3 \
         X509_get_serialNumber.3 \
-        X509_get_signature_nid.3 \
         X509_get_subject_name.3 \
         X509_get_version.3 \
         X509_get0_notBefore.3 \
+        X509_get0_signature.3 \
         X509_new.3 \
         X509_sign.3 \
         X509_verify_cert.3 \
diff --git a/src/lib/libcrypto/man/X509_get_signature_nid.3 b/src/lib/libcrypto/man/X509_get0_signature.3
index 837b392bcc..4c6c3f1e4f 100644
--- a/src/lib/libcrypto/man/X509_get_signature_nid.3
+++ b/src/lib/libcrypto/man/X509_get0_signature.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: X509_get_signature_nid.3,v 1.1 2018/02/14 18:50:47 schwarze Exp $
+.\" $OpenBSD: X509_get0_signature.3,v 1.1 2018/02/19 08:20:26 schwarze Exp $
 .\" selective merge up to:
 .\" OpenSSL man3/X509_get0_signature 2f7a2520 Apr 25 17:28:08 2017 +0100
 .\"
@@ -49,22 +49,47 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: February 14 2018 $
-.Dt X509_GET_SIGNATURE_NID 3
+.Dd $Mdocdate: February 19 2018 $
+.Dt X509_GET0_SIGNATURE 3
 .Os
 .Sh NAME
+.Nm X509_get0_signature ,
 .Nm X509_get_signature_nid
 .Nd signature information
 .Sh SYNOPSIS
 .In openssl/x509.h
+.Ft void
+.Fo X509_get0_signature
+.Fa "const ASN1_BIT_STRING **psig"
+.Fa "const X509_ALGOR **palg"
+.Fa "const X509 *x"
+.Fc
 .Ft int
 .Fo X509_get_signature_nid
 .Fa "const X509 *x"
 .Fc
 .Sh DESCRIPTION
+.Fn X509_get0_signature
+sets
+.Pf * Fa psig
+to the signature of
+.Fa x
+and
+.Pf * Fa palg
+to the signature algorithm of
+.Fa x .
+The values returned are internal pointers
+that must not be freed by the caller.
+.Pp
 .Fn X509_get_signature_nid
 returns the NID corresponding to the signature algorithm of
 .Fa x .
+.Pp
+These functions provide lower level access to the signature
+for cases where an application wishes to analyse or generate a
+signature in a form where
+.Xr X509_sign 3
+is not appropriate, for example in a non-standard or unsupported format.
 .Sh SEE ALSO
 .Xr OBJ_obj2nid 3 ,
 .Xr X509_get_pubkey 3 ,
@@ -74,5 +99,7 @@ returns the NID corresponding to the signature algorithm of
 .Xr X509_sign 3 ,
 .Xr X509_verify_cert 3
 .Sh HISTORY
+.Fn X509_get0_signature
+and
 .Fn X509_get_signature_nid
 first appeared in OpenSSL 1.0.2.