summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschwarze <>2018-03-20 22:06:59 +0000
committerschwarze <>2018-03-20 22:06:59 +0000
commit41b33f54cf5f2720bf8659bd75a3c9965690015c (patch)
tree712138aba4852f7c1774500b978317724297a280
parent2569df8cf23f0774a46e876591fb98fb4fc2dbf4 (diff)
downloadopenbsd-41b33f54cf5f2720bf8659bd75a3c9965690015c.tar.gz
openbsd-41b33f54cf5f2720bf8659bd75a3c9965690015c.tar.bz2
openbsd-41b33f54cf5f2720bf8659bd75a3c9965690015c.zip
des.h HISTORY up to SSLeay 0.8.1b; researched from OpenSSL git;
while here, drop irrelevant history of Kerberos random number generator
-rw-r--r--src/lib/libcrypto/man/DES_set_key.356
-rw-r--r--src/lib/libcrypto/man/des_read_pw.38
2 files changed, 49 insertions, 15 deletions
diff --git a/src/lib/libcrypto/man/DES_set_key.3 b/src/lib/libcrypto/man/DES_set_key.3
index 9e0236c698..44c6dcbc43 100644
--- a/src/lib/libcrypto/man/DES_set_key.3
+++ b/src/lib/libcrypto/man/DES_set_key.3
@@ -1,4 +1,4 @@
1.\" $OpenBSD: DES_set_key.3,v 1.8 2018/02/13 20:54:10 schwarze Exp $ 1.\" $OpenBSD: DES_set_key.3,v 1.9 2018/03/20 22:06:59 schwarze Exp $
2.\" full merge up to: 2.\" full merge up to:
3.\" OpenSSL man3/DES_random_key 61f805c1 Jan 16 01:01:46 2018 +0800 3.\" OpenSSL man3/DES_random_key 61f805c1 Jan 16 01:01:46 2018 +0800
4.\" 4.\"
@@ -115,7 +115,7 @@
115.\" copied and put under another distribution licence 115.\" copied and put under another distribution licence
116.\" [including the GNU Public Licence.] 116.\" [including the GNU Public Licence.]
117.\" 117.\"
118.Dd $Mdocdate: February 13 2018 $ 118.Dd $Mdocdate: March 20 2018 $
119.Dt DES_SET_KEY 3 119.Dt DES_SET_KEY 3
120.Os 120.Os
121.Sh NAME 121.Sh NAME
@@ -786,23 +786,53 @@ ANSI X3.106
786The DES library was initially written to be source code compatible 786The DES library was initially written to be source code compatible
787with the MIT Kerberos library. 787with the MIT Kerberos library.
788.Sh HISTORY 788.Sh HISTORY
789In OpenSSL 0.9.7, all des_ functions were renamed to DES_ to avoid 789Versions of
790clashes with older versions of libdes. 790.Fn DES_random_key ,
791.Fn DES_set_key ,
792.Fn DES_key_sched ,
793.Fn DES_set_odd_parity ,
794.Fn DES_is_weak_key ,
795.Fn DES_ecb_encrypt ,
796.Fn DES_ecb2_encrypt ,
797.Fn DES_ecb3_encrypt ,
798.Fn DES_ncbc_encrypt ,
799.Fn DES_cfb_encrypt ,
800.Fn DES_ofb_encrypt ,
801.Fn DES_pcbc_encrypt ,
802.Fn DES_cfb64_encrypt ,
803.Fn DES_ofb64_encrypt ,
804.Fn DES_xcbc_encrypt ,
805.Fn DES_ede2_cbc_encrypt ,
806.Fn DES_ede2_cfb64_encrypt ,
807.Fn DES_ede2_ofb64_encrypt ,
808.Fn DES_ede3_cbc_encrypt ,
809.Fn DES_ede3_cfb64_encrypt ,
810.Fn DES_ede3_ofb64_encrypt ,
811.Fn DES_cbc_cksum ,
812.Fn DES_quad_cksum ,
813.Fn DES_string_to_key ,
814.Fn DES_string_to_2keys ,
815.Fn DES_fcrypt ,
816.Fn DES_crypt ,
817.Fn DES_enc_read ,
818and
819.Fn DES_enc_write
820with lower case names starting with
821.Sy des_
822appeared in SSLeay 0.8.1b or earlier and have been available since
823.Ox 2.4 .
824.Pp
825In OpenSSL 0.9.7, all
826.Sy des_
827functions were renamed to
828.Sy DES_
829to avoid clashes with older versions of libdes.
791.Pp 830.Pp
792.Fn DES_set_key_checked 831.Fn DES_set_key_checked
793and 832and
794.Fn DES_set_key_unchecked 833.Fn DES_set_key_unchecked
795were added in OpenSSL 0.9.5. 834were added in OpenSSL 0.9.5.
796.Pp 835.Pp
797.Fn des_generate_random_block ,
798.Fn des_init_random_number_generator ,
799.Fn des_new_random_key ,
800.Fn des_set_random_generator_seed ,
801.Fn des_set_sequence_number ,
802and
803.Fn des_rand_data 3
804are used in newer versions of Kerberos but are not implemented here.
805.Pp
806.Fn DES_random_key 836.Fn DES_random_key
807generated cryptographically weak random data in SSLeay and in OpenSSL 837generated cryptographically weak random data in SSLeay and in OpenSSL
808prior version 0.9.5, as well as in the original MIT library. 838prior version 0.9.5, as well as in the original MIT library.
diff --git a/src/lib/libcrypto/man/des_read_pw.3 b/src/lib/libcrypto/man/des_read_pw.3
index e772d0a65a..a7060d6efa 100644
--- a/src/lib/libcrypto/man/des_read_pw.3
+++ b/src/lib/libcrypto/man/des_read_pw.3
@@ -1,4 +1,4 @@
1.\" $OpenBSD: des_read_pw.3,v 1.6 2017/01/06 17:17:29 schwarze Exp $ 1.\" $OpenBSD: des_read_pw.3,v 1.7 2018/03/20 22:06:59 schwarze Exp $
2.\" OpenSSL doc/crypto/ui_compat.pod May 14 11:28:00 2006 +0000 2.\" OpenSSL doc/crypto/ui_compat.pod May 14 11:28:00 2006 +0000
3.\" OpenSSL doc/crypto/des.pod 2a9aca32 Oct 25 08:44:10 2001 +0000 3.\" OpenSSL doc/crypto/des.pod 2a9aca32 Oct 25 08:44:10 2001 +0000
4.\" 4.\"
@@ -50,7 +50,7 @@
50.\" 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
51.\" OF THE POSSIBILITY OF SUCH DAMAGE. 51.\" OF THE POSSIBILITY OF SUCH DAMAGE.
52.\" 52.\"
53.Dd $Mdocdate: January 6 2017 $ 53.Dd $Mdocdate: March 20 2018 $
54.Dt DES_READ_PW 3 54.Dt DES_READ_PW 3
55.Os 55.Os
56.Sh NAME 56.Sh NAME
@@ -130,6 +130,10 @@ is functionally similar to
130.Fn des_read_pw_string . 130.Fn des_read_pw_string .
131.Sh SEE ALSO 131.Sh SEE ALSO
132.Xr UI_new 3 132.Xr UI_new 3
133.Sh HISTORY
134These functions appeared in SSLeay 0.8.1b or earlier
135and have been available since
136.Ox 2.4 .
133.Sh AUTHORS 137.Sh AUTHORS
134.An Richard Levitte Aq Mt richard@levitte.org 138.An Richard Levitte Aq Mt richard@levitte.org
135for the OpenSSL project. 139for the OpenSSL project.