2 files changed, 8 insertions, 16 deletions
diff --git a/src/lib/libcrypto/man/EVP_SignInit.3 b/src/lib/libcrypto/man/EVP_SignInit.3
index a231499655..e1dcccabab 100644
--- a/src/lib/libcrypto/man/EVP_SignInit.3
+++ b/src/lib/libcrypto/man/EVP_SignInit.3
@@ -1,5 +1,6 @@
-.\"     $OpenBSD: EVP_SignInit.3,v 1.8 2018/03/27 17:35:50 schwarze Exp $
+.\" $OpenBSD: EVP_SignInit.3,v 1.9 2018/03/29 21:26:51 schwarze Exp $
-.\"     OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
+.\" full merge up to: OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
+.\" selective merge up to: OpenSSL 79b49fb0 Mar 20 10:03:10 2018 +1000
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
 .\" Copyright (c) 2000-2002, 2005, 2006, 2014-2016 The OpenSSL Project.
@@ -49,7 +50,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 27 2018 $
+.Dd $Mdocdate: March 29 2018 $
 .Dt EVP_SIGNINIT 3
 .Os
 .Sh NAME
@@ -154,11 +155,6 @@ used in preference to the low level interfaces.
 This is because the code then becomes transparent to the algorithm used
 and much more flexible.
 .Pp
-Due to the link between message digests and public key algorithms the
-correct digest algorithm must be used with the correct public key type.
-A list of algorithms and associated public key algorithms appears in
-.Xr EVP_DigestInit 3 .
-.Pp
 The call to
 .Fn EVP_SignFinal
 internally finalizes a copy of the digest context.
diff --git a/src/lib/libcrypto/man/EVP_VerifyInit.3 b/src/lib/libcrypto/man/EVP_VerifyInit.3
index 0a95a087c3..a3cac95455 100644
--- a/src/lib/libcrypto/man/EVP_VerifyInit.3
+++ b/src/lib/libcrypto/man/EVP_VerifyInit.3
@@ -1,5 +1,6 @@
-.\"     $OpenBSD: EVP_VerifyInit.3,v 1.7 2018/03/27 17:35:50 schwarze Exp $
+.\" $OpenBSD: EVP_VerifyInit.3,v 1.8 2018/03/29 21:26:51 schwarze Exp $
-.\"     OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
+.\" full merge up to: OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
+.\" selective merge up to: OpenSSL 79b49fb0 Mar 20 10:03:10 2018 +1000
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
 .\" Copyright (c) 2000, 2001, 2006, 2016 The OpenSSL Project.
@@ -49,7 +50,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 27 2018 $
+.Dd $Mdocdate: March 29 2018 $
 .Dt EVP_VERIFYINIT 3
 .Os
 .Sh NAME
@@ -133,11 +134,6 @@ used in preference to the low level interfaces.
 This is because the code then becomes transparent to the algorithm used
 and much more flexible.
 .Pp
-Due to the link between message digests and public key algorithms, the
-correct digest algorithm must be used with the correct public key type.
-A list of algorithms and associated public key algorithms appears in
-.Xr EVP_DigestInit 3 .
-.Pp
 The call to
 .Fn EVP_VerifyFinal
 internally finalizes a copy of the digest context.

diff --git a/src/lib/libcrypto/man/EVP_SignInit.3 b/src/lib/libcrypto/man/EVP_SignInit.3 index a231499655..e1dcccabab 100644 --- a/src/lib/libcrypto/man/EVP_SignInit.3 +++ b/src/lib/libcrypto/man/EVP_SignInit.3
@@ -1,5 +1,6 @@
1	.\" $OpenBSD: EVP_SignInit.3,v 1.8 2018/03/27 17:35:50 schwarze Exp $	1	.\" $OpenBSD: EVP_SignInit.3,v 1.9 2018/03/29 21:26:51 schwarze Exp $
2	.\" OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100	2	.\" full merge up to: OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
		3	.\" selective merge up to: OpenSSL 79b49fb0 Mar 20 10:03:10 2018 +1000
3	.\"	4	.\"
4	.\" This file was written by Dr. Stephen Henson <steve@openssl.org>.	5	.\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
5	.\" Copyright (c) 2000-2002, 2005, 2006, 2014-2016 The OpenSSL Project.	6	.\" Copyright (c) 2000-2002, 2005, 2006, 2014-2016 The OpenSSL Project.
@@ -49,7 +50,7 @@
49	.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED	50	.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
50	.\" OF THE POSSIBILITY OF SUCH DAMAGE.	51	.\" OF THE POSSIBILITY OF SUCH DAMAGE.
51	.\"	52	.\"
52	.Dd $Mdocdate: March 27 2018 $	53	.Dd $Mdocdate: March 29 2018 $
53	.Dt EVP_SIGNINIT 3	54	.Dt EVP_SIGNINIT 3
54	.Os	55	.Os
55	.Sh NAME	56	.Sh NAME
@@ -154,11 +155,6 @@ used in preference to the low level interfaces.
154	This is because the code then becomes transparent to the algorithm used	155	This is because the code then becomes transparent to the algorithm used
155	and much more flexible.	156	and much more flexible.
156	.Pp	157	.Pp
157	Due to the link between message digests and public key algorithms the
158	correct digest algorithm must be used with the correct public key type.
159	A list of algorithms and associated public key algorithms appears in
160	.Xr EVP_DigestInit 3 .
161	.Pp
162	The call to	158	The call to
163	.Fn EVP_SignFinal	159	.Fn EVP_SignFinal
164	internally finalizes a copy of the digest context.	160	internally finalizes a copy of the digest context.


diff --git a/src/lib/libcrypto/man/EVP_VerifyInit.3 b/src/lib/libcrypto/man/EVP_VerifyInit.3 index 0a95a087c3..a3cac95455 100644 --- a/src/lib/libcrypto/man/EVP_VerifyInit.3 +++ b/src/lib/libcrypto/man/EVP_VerifyInit.3
@@ -1,5 +1,6 @@
1	.\" $OpenBSD: EVP_VerifyInit.3,v 1.7 2018/03/27 17:35:50 schwarze Exp $	1	.\" $OpenBSD: EVP_VerifyInit.3,v 1.8 2018/03/29 21:26:51 schwarze Exp $
2	.\" OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100	2	.\" full merge up to: OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
		3	.\" selective merge up to: OpenSSL 79b49fb0 Mar 20 10:03:10 2018 +1000
3	.\"	4	.\"
4	.\" This file was written by Dr. Stephen Henson <steve@openssl.org>.	5	.\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
5	.\" Copyright (c) 2000, 2001, 2006, 2016 The OpenSSL Project.	6	.\" Copyright (c) 2000, 2001, 2006, 2016 The OpenSSL Project.
@@ -49,7 +50,7 @@
49	.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED	50	.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
50	.\" OF THE POSSIBILITY OF SUCH DAMAGE.	51	.\" OF THE POSSIBILITY OF SUCH DAMAGE.
51	.\"	52	.\"
52	.Dd $Mdocdate: March 27 2018 $	53	.Dd $Mdocdate: March 29 2018 $
53	.Dt EVP_VERIFYINIT 3	54	.Dt EVP_VERIFYINIT 3
54	.Os	55	.Os
55	.Sh NAME	56	.Sh NAME
@@ -133,11 +134,6 @@ used in preference to the low level interfaces.
133	This is because the code then becomes transparent to the algorithm used	134	This is because the code then becomes transparent to the algorithm used
134	and much more flexible.	135	and much more flexible.
135	.Pp	136	.Pp
136	Due to the link between message digests and public key algorithms, the
137	correct digest algorithm must be used with the correct public key type.
138	A list of algorithms and associated public key algorithms appears in
139	.Xr EVP_DigestInit 3 .
140	.Pp
141	The call to	137	The call to
142	.Fn EVP_VerifyFinal	138	.Fn EVP_VerifyFinal
143	internally finalizes a copy of the digest context.	139	internally finalizes a copy of the digest context.