From c303d4d8686b9b46b5d85acdd94ec896433b813f Mon Sep 17 00:00:00 2001 From: Rich Salz Date: Mon, 2 Feb 2015 22:40:36 -0500 Subject: [PATCH] old_des fix windows build, remove docs Remove outdated doc files. Fix windows build after old_des was removed. Reviewed-by: Tim Hudson --- doc/crypto/des.pod | 31 ---------------------- doc/crypto/ui_compat.pod | 57 ---------------------------------------- util/mkdef.pl | 2 +- 3 files changed, 1 insertion(+), 89 deletions(-) delete mode 100644 doc/crypto/ui_compat.pod diff --git a/doc/crypto/des.pod b/doc/crypto/des.pod index 2afe572104..6742a4cfb6 100644 --- a/doc/crypto/des.pod +++ b/doc/crypto/des.pod @@ -312,37 +312,6 @@ functions directly. Single-key DES is insecure due to its short key size. ECB mode is not suitable for most applications; see L. -=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 . 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 -OpenSSL 0.9.5. - -des_generate_random_block(), des_init_random_number_generator(), -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 -SSLeay and in OpenSSL prior version 0.9.5, as well as in the original -MIT library. - =head1 AUTHOR Eric Young (eay@cryptsoft.com). Modified for the OpenSSL project diff --git a/doc/crypto/ui_compat.pod b/doc/crypto/ui_compat.pod deleted file mode 100644 index adf2ae5e53..0000000000 --- a/doc/crypto/ui_compat.pod +++ /dev/null @@ -1,57 +0,0 @@ -=pod - -=head1 NAME - -des_read_password, des_read_2passwords, des_read_pw_string, des_read_pw - -Compatibility user interface functions - -=head1 SYNOPSIS - - #include - - int des_read_password(DES_cblock *key,const char *prompt,int verify); - int des_read_2passwords(DES_cblock *key1,DES_cblock *key2, - const char *prompt,int verify); - - int des_read_pw_string(char *buf,int length,const char *prompt,int verify); - int des_read_pw(char *buf,char *buff,int size,const char *prompt,int verify); - -=head1 DESCRIPTION - -The DES library contained a few routines to prompt for passwords. These -aren't necessarely dependent on DES, and have therefore become part of the -UI compatibility library. - -des_read_pw() writes the string specified by I to standard output -turns echo off and reads an input string from the terminal. The string is -returned in I, which must have spac for at least I bytes. -If I is set, the user is asked for the password twice and unless -the two copies match, an error is returned. The second password is stored -in I, which must therefore also be at least I bytes. A return -code of -1 indicates a system error, 1 failure due to use interaction, and -0 is success. All other functions described here use des_read_pw() to do -the work. - -des_read_pw_string() is a variant of des_read_pw() that provides a buffer -for you if I is set. - -des_read_password() calls des_read_pw() and converts the password to a -DES key by calling DES_string_to_key(); des_read_2password() operates in -the same way as des_read_password() except that it generates two keys -by using the DES_string_to_2key() function. - -=head1 NOTES - -des_read_pw_string() is available in the MIT Kerberos library as well, and -is also available under the name EVP_read_pw_string(). - -=head1 SEE ALSO - -L, L - -=head1 AUTHOR - -Richard Levitte (richard@levitte.org) for the OpenSSL project -(http://www.openssl.org). - -=cut diff --git a/util/mkdef.pl b/util/mkdef.pl index 03fbf20e45..be7dd42895 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -281,7 +281,7 @@ my $crypto ="crypto/crypto.h"; $crypto.=" crypto/cryptlib.h"; $crypto.=" crypto/o_dir.h"; $crypto.=" crypto/o_str.h"; -$crypto.=" crypto/des/des.h crypto/des/des_old.h" ; # unless $no_des; +$crypto.=" crypto/des/des.h" ; # unless $no_des; $crypto.=" crypto/idea/idea.h" ; # unless $no_idea; $crypto.=" crypto/rc4/rc4.h" ; # unless $no_rc4; $crypto.=" crypto/rc5/rc5.h" ; # unless $no_rc5; -- 2.25.1