3 files changed, 7 insertions, 47 deletions

diff --git a/src/lib/libcrypto/man/EVP_DigestInit.3 b/src/lib/libcrypto/man/EVP_DigestInit.3
index 85800722d5..9b2ee4e09f 100644
--- a/src/lib/libcrypto/man/EVP_DigestInit.3
+++ b/src/lib/libcrypto/man/EVP_DigestInit.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: EVP_DigestInit.3,v 1.21 2021/09/10 18:58:43 millert Exp $
+.\" $OpenBSD: EVP_DigestInit.3,v 1.22 2022/01/15 09:08:51 tb Exp $
 .\" full merge up to: OpenSSL 7f572e95 Dec 2 13:57:04 2015 +0000
 .\" selective merge up to: OpenSSL a95d7574 Jul 2 12:16:38 2017 -0400
 .\"
@@ -68,7 +68,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: September 10 2021 $
+.Dd $Mdocdate: January 15 2022 $
 .Dt EVP_DIGESTINIT 3
 .Os
 .Sh NAME
@@ -105,8 +105,6 @@
 .Nm EVP_sha256 ,
 .Nm EVP_sha384 ,
 .Nm EVP_sha512 ,
-.Nm EVP_dss ,
-.Nm EVP_dss1 ,
 .Nm EVP_ripemd160 ,
 .Nm EVP_get_digestbyname ,
 .Nm EVP_get_digestbynid ,
@@ -243,10 +241,6 @@
 .Ft const EVP_MD *
 .Fn EVP_sha512 void
 .Ft const EVP_MD *
-.Fn EVP_dss void
-.Ft const EVP_MD *
-.Fn EVP_dss1 void
-.Ft const EVP_MD *
 .Fn EVP_ripemd160 void
 .Ft const EVP_MD *
 .Fo EVP_get_digestbyname
@@ -484,16 +478,6 @@ returns an
 .Vt EVP_MD
 structure that provides concatenated MD5 and SHA1 message digests.
 .Pp
-.Fn EVP_dss
-and
-.Fn EVP_dss1
-return
-.Vt EVP_MD
-structures for SHA1 digest algorithms but using DSS (DSA) for the
-signature algorithm.
-Note: there is no need to use these pseudo-digests in OpenSSL 1.0.0 and
-later; they are however retained for compatibility.
-.Pp
 .Fn EVP_md_null
 is a "null" message digest that does nothing:
 i.e. the hash it returns is of zero length.
@@ -604,8 +588,6 @@ is
 .Fn EVP_md5 ,
 .Fn EVP_md5_sha1 ,
 .Fn EVP_sha1 ,
-.Fn EVP_dss ,
-.Fn EVP_dss1 ,
 and
 .Fn EVP_ripemd160
 return pointers to the corresponding
@@ -694,10 +676,6 @@ main(int argc, char *argv[])
 and
 .Fn EVP_sha1
 first appeared in SSLeay 0.5.1.
-.Fn EVP_dss
-and
-.Fn EVP_dss1
-first appeared in SSLeay 0.6.0.
 .Fn EVP_MD_size
 first appeared in SSLeay 0.6.6.
 .Fn EVP_MD_CTX_size ,
@@ -767,6 +745,4 @@ first appeared in OpenSSL 1.1.0 and have been available since
 The link between digests and signing algorithms was fixed in OpenSSL 1.0
 and later, so now
 .Fn EVP_sha1
-can be used with RSA and DSA; there is no need to use
-.Fn EVP_dss1
-any more.
+can be used with RSA and DSA.
diff --git a/src/lib/libcrypto/man/EVP_DigestSignInit.3 b/src/lib/libcrypto/man/EVP_DigestSignInit.3
index 57db4b31d3..de6e57c2cd 100644
--- a/src/lib/libcrypto/man/EVP_DigestSignInit.3
+++ b/src/lib/libcrypto/man/EVP_DigestSignInit.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: EVP_DigestSignInit.3,v 1.11 2021/05/20 14:41:47 tb Exp $
+.\"     $OpenBSD: EVP_DigestSignInit.3,v 1.12 2022/01/15 09:08:51 tb Exp $
 .\"     OpenSSL 9b86974e Aug 17 15:21:33 2015 -0400
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -49,7 +49,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 20 2021 $
+.Dd $Mdocdate: January 15 2022 $
 .Dt EVP_DIGESTSIGNINIT 3
 .Os
 .Sh NAME
@@ -189,14 +189,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
-In previous versions of OpenSSL, there was a link between message digest
-types and public key algorithms.
-This meant that "clone" digests such as
-.Xr EVP_dss1 3
-needed to be used to sign using SHA1 and DSA.
-This is no longer necessary and the use of clone digest is now
-discouraged.
-.Pp
 The call to
 .Fn EVP_DigestSignFinal
 internally finalizes a copy of the digest context.
diff --git a/src/lib/libcrypto/man/EVP_DigestVerifyInit.3 b/src/lib/libcrypto/man/EVP_DigestVerifyInit.3
index 0b3fa13921..0eb3143467 100644
--- a/src/lib/libcrypto/man/EVP_DigestVerifyInit.3
+++ b/src/lib/libcrypto/man/EVP_DigestVerifyInit.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: EVP_DigestVerifyInit.3,v 1.13 2021/05/20 14:41:47 tb Exp $
+.\"     $OpenBSD: EVP_DigestVerifyInit.3,v 1.14 2022/01/15 09:08:51 tb Exp $
 .\"     OpenSSL fb552ac6 Sep 30 23:43:01 2009 +0000
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -49,7 +49,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 20 2021 $
+.Dd $Mdocdate: January 15 2022 $
 .Dt EVP_DIGESTVERIFYINIT 3
 .Os
 .Sh NAME
@@ -170,14 +170,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
-In previous versions of OpenSSL, there was a link between message digest
-types and public key algorithms.
-This meant that "clone" digests such as
-.Xr EVP_dss1 3
-needed to be used to sign using SHA1 and DSA.
-This is no longer necessary and the use of clone digest is now
-discouraged.
-.Pp
 The call to
 .Fn EVP_DigestVerifyFinal
 internally finalizes a copy of the digest context.