Fewer lies, also do not document DES_3cbc_encrypt anymore.

2 files changed, 12 insertions, 44 deletions

diff --git a/src/lib/libcrypto/doc/DES_set_key.pod b/src/lib/libcrypto/doc/DES_set_key.pod
index 75638a149a..c0447b8bae 100644
--- a/src/lib/libcrypto/doc/DES_set_key.pod
+++ b/src/lib/libcrypto/doc/DES_set_key.pod
@@ -287,8 +287,6 @@ The L<evp(3)|evp(3)> library provides higher-level encryption functions.
 
 =head1 BUGS
 
-DES_3cbc_encrypt() is flawed and must not be used in applications.
-
 DES_cbc_encrypt() does not modify B<ivec>; use DES_ncbc_encrypt()
 instead.
 
@@ -310,33 +308,19 @@ The same applies for DES_string_to_2key().
 
 ANSI X3.106
 
-The B<des> library was written to be source code compatible with
+The B<des> library was initially written to be source code compatible with
 the MIT Kerberos library.
 
 =head1 SEE ALSO
 
-crypt(3), L<des_modes(7)|des_modes(7)>, L<evp(3)|evp(3)>, L<rand(3)|rand(3)>
+crypt(3), L<evp(3)|evp(3)>, L<rand(3)|rand(3)>
 
 =head1 HISTORY
 
 In OpenSSL 0.9.7, all des_ functions were renamed to DES_ to avoid
-clashes with older versions of libdes.  Compatibility des_ functions
-are provided for a short while, as well as crypt().
-Declarations for these are in <openssl/des_old.h>. There is no DES_
-variant for des_random_seed().
-This will happen to other functions
-as well if they are deemed redundant (des_random_seed() just calls
-RAND_seed() and is present for backward compatibility only), buggy or
-already scheduled for removal.
-
-des_cbc_cksum(), des_cbc_encrypt(), des_ecb_encrypt(),
-des_is_weak_key(), des_key_sched(), des_pcbc_encrypt(),
-des_quad_cksum(), des_random_key() and des_string_to_key()
-are available in the MIT Kerberos library;
-des_check_key_parity(), des_fixup_key_parity() and des_is_weak_key()
-are available in newer versions of that library.
-
-des_set_key_checked() and des_set_key_unchecked() were added in
+clashes with older versions of libdes.
+
+DES_set_key_checked() and DES_set_key_unchecked() were added in
 OpenSSL 0.9.5.
 
 des_generate_random_block(), des_init_random_number_generator(),
@@ -344,7 +328,7 @@ des_new_random_key(), des_set_random_generator_seed() and
 des_set_sequence_number() and des_rand_data() are used in newer
 versions of Kerberos but are not implemented here.
 
-des_random_key() generated cryptographically weak random data in
+DES_random_key() generated cryptographically weak random data in
 SSLeay and in OpenSSL prior version 0.9.5, as well as in the original
 MIT library.
 
diff --git a/src/lib/libssl/src/doc/crypto/DES_set_key.pod b/src/lib/libssl/src/doc/crypto/DES_set_key.pod
index 75638a149a..c0447b8bae 100644
--- a/src/lib/libssl/src/doc/crypto/DES_set_key.pod
+++ b/src/lib/libssl/src/doc/crypto/DES_set_key.pod
@@ -287,8 +287,6 @@ The L<evp(3)|evp(3)> library provides higher-level encryption functions.
 
 =head1 BUGS
 
-DES_3cbc_encrypt() is flawed and must not be used in applications.
-
 DES_cbc_encrypt() does not modify B<ivec>; use DES_ncbc_encrypt()
 instead.
 
@@ -310,33 +308,19 @@ The same applies for DES_string_to_2key().
 
 ANSI X3.106
 
-The B<des> library was written to be source code compatible with
+The B<des> library was initially written to be source code compatible with
 the MIT Kerberos library.
 
 =head1 SEE ALSO
 
-crypt(3), L<des_modes(7)|des_modes(7)>, L<evp(3)|evp(3)>, L<rand(3)|rand(3)>
+crypt(3), L<evp(3)|evp(3)>, L<rand(3)|rand(3)>
 
 =head1 HISTORY
 
 In OpenSSL 0.9.7, all des_ functions were renamed to DES_ to avoid
-clashes with older versions of libdes.  Compatibility des_ functions
-are provided for a short while, as well as crypt().
-Declarations for these are in <openssl/des_old.h>. There is no DES_
-variant for des_random_seed().
-This will happen to other functions
-as well if they are deemed redundant (des_random_seed() just calls
-RAND_seed() and is present for backward compatibility only), buggy or
-already scheduled for removal.
-
-des_cbc_cksum(), des_cbc_encrypt(), des_ecb_encrypt(),
-des_is_weak_key(), des_key_sched(), des_pcbc_encrypt(),
-des_quad_cksum(), des_random_key() and des_string_to_key()
-are available in the MIT Kerberos library;
-des_check_key_parity(), des_fixup_key_parity() and des_is_weak_key()
-are available in newer versions of that library.
-
-des_set_key_checked() and des_set_key_unchecked() were added in
+clashes with older versions of libdes.
+
+DES_set_key_checked() and DES_set_key_unchecked() were added in
 OpenSSL 0.9.5.
 
 des_generate_random_block(), des_init_random_number_generator(),
@@ -344,7 +328,7 @@ des_new_random_key(), des_set_random_generator_seed() and
 des_set_sequence_number() and des_rand_data() are used in newer
 versions of Kerberos but are not implemented here.
 
-des_random_key() generated cryptographically weak random data in
+DES_random_key() generated cryptographically weak random data in
 SSLeay and in OpenSSL prior version 0.9.5, as well as in the original
 MIT library.