Split EVP_des_cbc(3) out of EVP_EncryptInit(3) to reduce clutter:

this moves a large number of functions out of the way that are no
longer the latest and greatest.  Also mention a few that were missing.

4 files changed, 230 insertions, 55 deletions

diff --git a/src/lib/libcrypto/man/EVP_EncryptInit.3 b/src/lib/libcrypto/man/EVP_EncryptInit.3
index 3afff9f60f..a730923d96 100644
--- a/src/lib/libcrypto/man/EVP_EncryptInit.3
+++ b/src/lib/libcrypto/man/EVP_EncryptInit.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: EVP_EncryptInit.3,v 1.31 2019/03/21 11:21:40 schwarze Exp $
+.\" $OpenBSD: EVP_EncryptInit.3,v 1.32 2019/03/21 12:54:37 schwarze Exp $
 .\" full merge up to: OpenSSL 5211e094 Nov 11 14:39:11 2014 -0800
 .\"   EVP_bf_cbc.pod EVP_cast5_cbc.pod EVP_idea_cbc.pod EVP_rc2_cbc.pod
 .\"   7c6d372a Nov 20 13:20:01 2018 +0000
@@ -110,19 +110,6 @@
 .Nm EVP_CIPHER_param_to_asn1 ,
 .Nm EVP_CIPHER_asn1_to_param ,
 .Nm EVP_enc_null ,
-.Nm EVP_des_cbc ,
-.Nm EVP_des_ecb ,
-.Nm EVP_des_cfb ,
-.Nm EVP_des_ofb ,
-.Nm EVP_des_ede_cbc ,
-.Nm EVP_des_ede ,
-.Nm EVP_des_ede_ofb ,
-.Nm EVP_des_ede_cfb ,
-.Nm EVP_des_ede3_cbc ,
-.Nm EVP_des_ede3 ,
-.Nm EVP_des_ede3_ofb ,
-.Nm EVP_des_ede3_cfb ,
-.Nm EVP_desx_cbc ,
 .Nm EVP_rc4 ,
 .Nm EVP_rc4_40 ,
 .Nm EVP_rc4_hmac_md5 ,
@@ -933,29 +920,6 @@ All algorithms have a fixed key length unless otherwise stated.
 .Bl -tag -width Ds
 .It Fn EVP_enc_null
 Null cipher: does nothing.
-.It Xo
-.Fn EVP_des_cbc ,
-.Fn EVP_des_ecb ,
-.Fn EVP_des_cfb ,
-.Fn EVP_des_ofb
-.Xc
-DES in CBC, ECB, CFB and OFB modes respectively.
-.It Xo
-.Fn EVP_des_ede_cbc ,
-.Fn EVP_des_ede ,
-.Fn EVP_des_ede_ofb ,
-.Fn EVP_des_ede_cfb
-.Xc
-Two key triple DES in CBC, ECB, CFB and OFB modes respectively.
-.It Xo
-.Fn EVP_des_ede3_cbc ,
-.Fn EVP_des_ede3 ,
-.Fn EVP_des_ede3_ofb ,
-.Fn EVP_des_ede3_cfb
-.Xc
-Three key triple DES in CBC, ECB, CFB and OFB modes respectively.
-.It Fn EVP_desx_cbc
-DESX algorithm in CBC mode.
 .It Fn EVP_rc4
 RC4 stream cipher.
 This is a variable key length cipher with default key length 128 bits.
@@ -1034,7 +998,8 @@ The key length is 256 bits, the IV is 96 bits long.
 .El
 .Pp
 See also
-.Xr EVP_aes_128_cbc 3
+.Xr EVP_aes_128_cbc 3 ,
+.Xr EVP_des_cbc 3 ,
 and
 .Xr EVP_sm4_cbc 3 .
 .Ss GCM mode
@@ -1241,6 +1206,7 @@ do_crypt(FILE *in, FILE *out, int do_encrypt)
 .Sh SEE ALSO
 .Xr evp 3 ,
 .Xr EVP_aes_128_cbc 3 ,
+.Xr EVP_des_cbc 3 ,
 .Xr EVP_sm4_cbc 3
 .Sh HISTORY
 .Fn EVP_EncryptInit ,
@@ -1253,18 +1219,6 @@ do_crypt(FILE *in, FILE *out, int do_encrypt)
 .Fn EVP_CipherUpdate ,
 .Fn EVP_CipherFinal ,
 .Fn EVP_get_cipherbyname ,
-.Fn EVP_des_cbc ,
-.Fn EVP_des_ecb ,
-.Fn EVP_des_cfb ,
-.Fn EVP_des_ofb ,
-.Fn EVP_des_ede_cbc ,
-.Fn EVP_des_ede ,
-.Fn EVP_des_ede_ofb ,
-.Fn EVP_des_ede_cfb ,
-.Fn EVP_des_ede3_cbc ,
-.Fn EVP_des_ede3 ,
-.Fn EVP_des_ede3_ofb ,
-.Fn EVP_des_ede3_cfb ,
 .Fn EVP_rc4 ,
 .Fn EVP_idea_cbc ,
 .Fn EVP_idea_ecb ,
@@ -1278,8 +1232,6 @@ first appeared in SSLeay 0.5.1.
 and
 .Fn EVP_rc2_ofb
 first appeared in SSLeay 0.5.2.
-.Fn EVP_desx_cbc
-first appeared in SSLeay 0.6.2.
 .Fn EVP_CIPHER_block_size ,
 .Fn EVP_CIPHER_key_length ,
 .Fn EVP_CIPHER_iv_length ,
diff --git a/src/lib/libcrypto/man/EVP_des_cbc.3 b/src/lib/libcrypto/man/EVP_des_cbc.3
new file mode 100644
index 0000000000..759e03fac0
--- /dev/null
+++ b/src/lib/libcrypto/man/EVP_des_cbc.3
@@ -0,0 +1,221 @@
+.\" $OpenBSD: EVP_des_cbc.3,v 1.1 2019/03/21 12:54:37 schwarze Exp $
+.\" full merge up to:
+.\"   OpenSSL EVP_desx_cbc.pod 8fa4d95e Oct 21 11:59:09 2017 +0900
+.\" selective merge up to:
+.\"   OpenSSL EVP_des.pod 7c6d372a Nov 20 13:20:01 2018 +0000
+.\"
+.\" This file was written by Ronald Tse <ronald.tse@ribose.com>
+.\" Copyright (c) 2017 The OpenSSL Project.  All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\"
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\"
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in
+.\"    the documentation and/or other materials provided with the
+.\"    distribution.
+.\"
+.\" 3. All advertising materials mentioning features or use of this
+.\"    software must display the following acknowledgment:
+.\"    "This product includes software developed by the OpenSSL Project
+.\"    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+.\"
+.\" 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+.\"    endorse or promote products derived from this software without
+.\"    prior written permission. For written permission, please contact
+.\"    openssl-core@openssl.org.
+.\"
+.\" 5. Products derived from this software may not be called "OpenSSL"
+.\"    nor may "OpenSSL" appear in their names without prior written
+.\"    permission of the OpenSSL Project.
+.\"
+.\" 6. Redistributions of any form whatsoever must retain the following
+.\"    acknowledgment:
+.\"    "This product includes software developed by the OpenSSL Project
+.\"    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+.\" EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+.\" ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+.\" SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+.\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+.\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+.\" OF THE POSSIBILITY OF SUCH DAMAGE.
+.\"
+.Dd $Mdocdate: March 21 2019 $
+.Dt EVP_DES_CBC 3
+.Os
+.Sh NAME
+.Nm EVP_des_cbc ,
+.Nm EVP_des_cfb ,
+.Nm EVP_des_cfb1 ,
+.Nm EVP_des_cfb8 ,
+.Nm EVP_des_cfb64 ,
+.Nm EVP_des_ecb ,
+.Nm EVP_des_ofb ,
+.Nm EVP_des_ede ,
+.Nm EVP_des_ede_cbc ,
+.Nm EVP_des_ede_cfb ,
+.Nm EVP_des_ede_cfb64 ,
+.Nm EVP_des_ede_ecb ,
+.Nm EVP_des_ede_ofb ,
+.Nm EVP_des_ede3 ,
+.Nm EVP_des_ede3_cbc ,
+.Nm EVP_des_ede3_cfb ,
+.Nm EVP_des_ede3_cfb1 ,
+.Nm EVP_des_ede3_cfb8 ,
+.Nm EVP_des_ede3_cfb64 ,
+.Nm EVP_des_ede3_ecb ,
+.Nm EVP_des_ede3_ofb ,
+.Nm EVP_desx_cbc
+.Nd EVP DES cipher
+.Sh SYNOPSIS
+.In openssl/evp.h
+.Ft const EVP_CIPHER *
+.Fn EVP_des_cbc void
+.Ft const EVP_CIPHER *
+.Fn EVP_des_cfb void
+.Ft const EVP_CIPHER *
+.Fn EVP_des_cfb1 void
+.Ft const EVP_CIPHER *
+.Fn EVP_des_cfb8 void
+.Ft const EVP_CIPHER *
+.Fn EVP_des_cfb64 void
+.Ft const EVP_CIPHER *
+.Fn EVP_des_ecb void
+.Ft const EVP_CIPHER *
+.Fn EVP_des_ofb void
+.Ft const EVP_CIPHER *
+.Fn EVP_des_ede void
+.Ft const EVP_CIPHER *
+.Fn EVP_des_ede_cbc void
+.Ft const EVP_CIPHER *
+.Fn EVP_des_ede_cfb void
+.Ft const EVP_CIPHER *
+.Fn EVP_des_ede_cfb64 void
+.Ft const EVP_CIPHER *
+.Fn EVP_des_ede_ecb void
+.Ft const EVP_CIPHER *
+.Fn EVP_des_ede_ofb void
+.Ft const EVP_CIPHER *
+.Fn EVP_des_ede3 void
+.Ft const EVP_CIPHER *
+.Fn EVP_des_ede3_cbc void
+.Ft const EVP_CIPHER *
+.Fn EVP_des_ede3_cfb void
+.Ft const EVP_CIPHER *
+.Fn EVP_des_ede3_cfb1 void
+.Ft const EVP_CIPHER *
+.Fn EVP_des_ede3_cfb8 void
+.Ft const EVP_CIPHER *
+.Fn EVP_des_ede3_cfb64 void
+.Ft const EVP_CIPHER *
+.Fn EVP_des_ede3_ecb void
+.Ft const EVP_CIPHER *
+.Fn EVP_des_ede3_ofb void
+.Ft const EVP_CIPHER *
+.Fn EVP_desx_cbc void
+.Sh DESCRIPTION
+These functions provide the DES encryption algorithm in the
+.Xr evp 3
+framework.
+.Pp
+.Fn EVP_des_cbc ,
+.Fn EVP_des_cfb1 ,
+.Fn EVP_des_cfb8 ,
+.Fn EVP_des_cfb64 ,
+.Fn EVP_des_ecb ,
+and
+.Fn EVP_des_ofb
+provide DES in CBC, CFB with 1-bit shift, CFB with 8-bit shift,
+CFB with 64-bit shift, ECB, and OFB modes.
+.Fn EVP_des_cfb
+is an alias for
+.Fn EVP_des_cfb64 ,
+implemented as a macro.
+.Pp
+.Fn EVP_des_ede_cbc ,
+.Fn EVP_des_ede_cfb64 ,
+.Fn EVP_des_ede_ecb ,
+and
+.Fn EVP_des_ede_ofb
+provide two key triple DES in CBC, CFB with 64-bit shift, ECB, and OFB modes.
+.Fn EVP_des_ede_cfb
+is an alias for
+.Fn EVP_des_ede_cfb64 ,
+implemented as a macro.
+.Fn EVP_des_ede
+is an alias for
+.Fn EVP_des_ede_ecb .
+.Pp
+.Fn EVP_des_ede3_cbc ,
+.Fn EVP_des_ede3_cfb1 ,
+.Fn EVP_des_ede3_cfb8 ,
+.Fn EVP_des_ede3_cfb64 ,
+.Fn EVP_des_ede3_ecb ,
+.Fn EVP_des_ede3_ofb
+provide three key triple DES in CBC, CFB with 1-bit shift, CFB with 8-bit
+shift, CFB with 64-bit shift, ECB, and OFB modes.
+.Fn EVP_des_ede3_cfb
+is an alias for
+.Fn EVP_des_ede3_cfb64 ,
+implemented as a macro.
+.Fn EVP_des_ede3
+is an alias for
+.Fn EVP_des_ede3_ecb .
+.Pp
+.Fn EVP_desx_cbc
+provides the DES-X encryption algorithm in CBC mode.
+It uses a key length of 128 bits and acts on blocks of 128 bits.
+.Sh RETURN VALUES
+These functions return an
+.Vt EVP_CIPHER
+structure that provides the implementation of the symmetric cipher.
+.Sh SEE ALSO
+.Xr evp 3 ,
+.Xr EVP_EncryptInit 3
+.Sh HISTORY
+.Fn EVP_des_cbc ,
+.Fn EVP_des_cfb ,
+.Fn EVP_des_ecb ,
+.Fn EVP_des_ofb ,
+.Fn EVP_des_ede ,
+.Fn EVP_des_ede_cbc ,
+.Fn EVP_des_ede_cfb ,
+.Fn EVP_des_ede_ofb ,
+.Fn EVP_des_ede3 ,
+.Fn EVP_des_ede3_cbc ,
+.Fn EVP_des_ede3_cfb ,
+and
+.Fn EVP_des_ede3_ofb
+first appeared in SSLeay 0.5.1.
+.Fn EVP_desx_cbc
+first appeared in SSLeay 0.6.2.
+These functions have been available since
+.Ox 2.4 .
+.Pp
+.Fn EVP_des_ede_ecb
+and
+.Fn EVP_des_ede3_ecb
+first appeared in OpenSSL 0.9.7 and have been available since
+.Ox 3.2 .
+.Pp
+.Fn EVP_des_cfb1 ,
+.Fn EVP_des_cfb8 ,
+.Fn EVP_des_cfb64 ,
+.Fn EVP_des_ede_cfb64 ,
+.Fn EVP_des_ede3_cfb1 ,
+.Fn EVP_des_ede3_cfb8 ,
+and
+.Fn EVP_des_ede3_cfb64
+first appeared in OpenSSL 0.9.7e and have been available since
+.Ox 3.8 .
diff --git a/src/lib/libcrypto/man/Makefile b/src/lib/libcrypto/man/Makefile
index 884e5257ef..2e885c1bcd 100644
--- a/src/lib/libcrypto/man/Makefile
+++ b/src/lib/libcrypto/man/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.145 2019/03/18 11:38:16 schwarze Exp $
+# $OpenBSD: Makefile,v 1.146 2019/03/21 12:54:37 schwarze Exp $
 
 .include <bsd.own.mk>
 
@@ -152,6 +152,7 @@ MAN=	\
         EVP_SignInit.3 \
         EVP_VerifyInit.3 \
         EVP_aes_128_cbc.3 \
+        EVP_des_cbc.3 \
         EVP_sm4_cbc.3 \
         EXTENDED_KEY_USAGE_new.3 \
         GENERAL_NAME_new.3 \
diff --git a/src/lib/libcrypto/man/evp.3 b/src/lib/libcrypto/man/evp.3
index 6dbd884c72..4b1f5568b6 100644
--- a/src/lib/libcrypto/man/evp.3
+++ b/src/lib/libcrypto/man/evp.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: evp.3,v 1.7 2019/03/18 11:38:16 schwarze Exp $
+.\"     $OpenBSD: evp.3,v 1.8 2019/03/21 12:54:37 schwarze Exp $
 .\"     OpenSSL a9c85cea Nov 11 09:33:55 2016 +0100
 .\"
 .\" This file was written by Ulf Moeller <ulf@openssl.org>,
@@ -51,7 +51,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 18 2019 $
+.Dd $Mdocdate: March 21 2019 $
 .Dt EVP 3
 .Os
 .Sh NAME
@@ -184,6 +184,7 @@ operations are more efficient using the high level interfaces.
 .Xr EVP_AEAD_CTX_init 3 ,
 .Xr EVP_aes_128_cbc 3 ,
 .Xr EVP_BytesToKey 3 ,
+.Xr EVP_des_cbc 3 ,
 .Xr EVP_DigestInit 3 ,
 .Xr EVP_DigestSignInit 3 ,
 .Xr EVP_EncryptInit 3 ,