summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschwarze <>2018-02-27 20:43:41 +0000
committerschwarze <>2018-02-27 20:43:41 +0000
commitab315f6f3af89fb98fffe249c7c4e89ff030ffc4 (patch)
tree74e9ffc90cab182ac4e4732badb6af2549b02a12
parent8f9a6a740a805656d9ec4736e3213cfc7d276548 (diff)
downloadopenbsd-ab315f6f3af89fb98fffe249c7c4e89ff030ffc4.tar.gz
openbsd-ab315f6f3af89fb98fffe249c7c4e89ff030ffc4.tar.bz2
openbsd-ab315f6f3af89fb98fffe249c7c4e89ff030ffc4.zip
Garbage collect RC5 documentation.
We have no code implementing it, tedu@ took care of the rc5/ directory in 2014, the related files are commented out in arch/*/Makefile.inc, and opensslfeatures.h contains an explicit #define OPENSSL_NO_RC5.
-rw-r--r--src/lib/libcrypto/man/EVP_EncryptInit.325
-rw-r--r--src/lib/libcrypto/man/crypto.36
2 files changed, 6 insertions, 25 deletions
diff --git a/src/lib/libcrypto/man/EVP_EncryptInit.3 b/src/lib/libcrypto/man/EVP_EncryptInit.3
index a9377b2264..c55491867c 100644
--- a/src/lib/libcrypto/man/EVP_EncryptInit.3
+++ b/src/lib/libcrypto/man/EVP_EncryptInit.3
@@ -1,4 +1,4 @@
1.\" $OpenBSD: EVP_EncryptInit.3,v 1.8 2018/02/19 10:04:08 schwarze Exp $ 1.\" $OpenBSD: EVP_EncryptInit.3,v 1.9 2018/02/27 20:43:41 schwarze Exp $
2.\" full merge up to: OpenSSL 5211e094 Nov 11 14:39:11 2014 -0800 2.\" full merge up to: OpenSSL 5211e094 Nov 11 14:39:11 2014 -0800
3.\" selective merge up to: OpenSSL 5c5eb286 Dec 5 00:36:43 2017 +0100 3.\" selective merge up to: OpenSSL 5c5eb286 Dec 5 00:36:43 2017 +0100
4.\" 4.\"
@@ -51,7 +51,7 @@
51.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 51.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
52.\" OF THE POSSIBILITY OF SUCH DAMAGE. 52.\" OF THE POSSIBILITY OF SUCH DAMAGE.
53.\" 53.\"
54.Dd $Mdocdate: February 19 2018 $ 54.Dd $Mdocdate: February 27 2018 $
55.Dt EVP_ENCRYPTINIT 3 55.Dt EVP_ENCRYPTINIT 3
56.Os 56.Os
57.Sh NAME 57.Sh NAME
@@ -156,10 +156,6 @@
156.Nm EVP_aes_256_ccm , 156.Nm EVP_aes_256_ccm ,
157.Nm EVP_aes_128_cbc_hmac_sha1 , 157.Nm EVP_aes_128_cbc_hmac_sha1 ,
158.Nm EVP_aes_256_cbc_hmac_sha1 , 158.Nm EVP_aes_256_cbc_hmac_sha1 ,
159.Nm EVP_rc5_32_12_16_cbc ,
160.Nm EVP_rc5_32_12_16_cfb ,
161.Nm EVP_rc5_32_12_16_ecb ,
162.Nm EVP_rc5_32_12_16_ofb ,
163.Nm EVP_chacha20 159.Nm EVP_chacha20
164.Nd EVP cipher routines 160.Nd EVP cipher routines
165.Sh SYNOPSIS 161.Sh SYNOPSIS
@@ -737,8 +733,7 @@ the RC2 effective key length is not supported).
737.Pp 733.Pp
738.Fn EVP_CIPHER_CTX_ctrl 734.Fn EVP_CIPHER_CTX_ctrl
739allows various cipher specific parameters to be determined and set. 735allows various cipher specific parameters to be determined and set.
740Currently only the RC2 effective key length and the number of rounds of 736Currently only the RC2 effective key length can be set.
741RC5 can be set.
742.Pp 737.Pp
743.Fn EVP_CIPHER_CTX_rand_key 738.Fn EVP_CIPHER_CTX_rand_key
744generates a random key of the appropriate length based on the cipher 739generates a random key of the appropriate length based on the cipher
@@ -985,16 +980,6 @@ This is a variable key length cipher.
985CAST encryption algorithm in CBC, ECB, CFB and OFB modes respectively. 980CAST encryption algorithm in CBC, ECB, CFB and OFB modes respectively.
986This is a variable key length cipher. 981This is a variable key length cipher.
987.It Xo 982.It Xo
988.Fn EVP_rc5_32_12_16_cbc ,
989.Fn EVP_rc5_32_12_16_ecb ,
990.Fn EVP_rc5_32_12_16_cfb ,
991.Fn EVP_rc5_32_12_16_ofb
992.Xc
993RC5 encryption algorithm in CBC, ECB, CFB and OFB modes respectively.
994This is a variable key length cipher with an additional "number of
995rounds" parameter.
996By default the key length is set to 128 bits and 12 rounds.
997.It Xo
998.Fn EVP_aes_128_gcm , 983.Fn EVP_aes_128_gcm ,
999.Fn EVP_aes_192_gcm , 984.Fn EVP_aes_192_gcm ,
1000.Fn EVP_aes_256_gcm 985.Fn EVP_aes_256_gcm
@@ -1233,10 +1218,6 @@ appeared in OpenSSL 0.9.7.
1233.Fn EVP_CIPHER_CTX_reset 1218.Fn EVP_CIPHER_CTX_reset
1234fist appeared in OpenSSL 1.1.0. 1219fist appeared in OpenSSL 1.1.0.
1235.Sh BUGS 1220.Sh BUGS
1236For RC5 the number of rounds can currently only be set to 8, 12 or 16.
1237This is a limitation of the current RC5 code rather than the EVP
1238interface.
1239.Pp
1240.Dv EVP_MAX_KEY_LENGTH 1221.Dv EVP_MAX_KEY_LENGTH
1241and 1222and
1242.Dv EVP_MAX_IV_LENGTH 1223.Dv EVP_MAX_IV_LENGTH
diff --git a/src/lib/libcrypto/man/crypto.3 b/src/lib/libcrypto/man/crypto.3
index 7f0816903e..cbc8f1169c 100644
--- a/src/lib/libcrypto/man/crypto.3
+++ b/src/lib/libcrypto/man/crypto.3
@@ -1,4 +1,4 @@
1.\" $OpenBSD: crypto.3,v 1.17 2018/02/27 20:28:06 schwarze Exp $ 1.\" $OpenBSD: crypto.3,v 1.18 2018/02/27 20:43:41 schwarze Exp $
2.\" OpenSSL a9c85cea Nov 11 09:33:55 2016 +0100 2.\" OpenSSL a9c85cea Nov 11 09:33:55 2016 +0100
3.\" 3.\"
4.\" This file was written by Ulf Moeller <ulf@openssl.org> and 4.\" This file was written by Ulf Moeller <ulf@openssl.org> and
@@ -63,8 +63,8 @@ implementations of TLS and S/MIME, and they have also been used to
63implement SSH, OpenPGP, and other cryptographic standards. 63implement SSH, OpenPGP, and other cryptographic standards.
64.Pp 64.Pp
65.Sy Symmetric ciphers 65.Sy Symmetric ciphers
66including AES, Blowfish, CAST, Chacha20, IDEA, DES, RC2, RC4, and 66including AES, Blowfish, CAST, Chacha20, IDEA, DES, RC2, and RC4
67RC5 are provided by the generic interface 67are provided by the generic interface
68.Xr EVP_EncryptInit 3 . 68.Xr EVP_EncryptInit 3 .
69Low-level stand-alone interfaces include 69Low-level stand-alone interfaces include
70.Xr BF_set_key 3 , 70.Xr BF_set_key 3 ,