Commit ce15d5a9 authored by Richard Levitte's avatar Richard Levitte
Browse files

Remove DES_random_seed() but retain des_random_seed() for now. Change 

the docs to reflect this change and correct libeay.num.
parent ba1c6022

crypto/des/Makefile.ssl

+3 −0
Original line number Diff line number Diff line
@@ -153,6 +153,9 @@ cfb_enc.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h 
cfb_enc.o: ../../include/openssl/opensslconf.h cfb_enc.c des_locl.h

des_enc.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h

des_enc.o: ../../include/openssl/opensslconf.h des_enc.c des_locl.h ncbc_enc.c

des_old.o: ../../include/openssl/des.h ../../include/openssl/des_old.h

des_old.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h

des_old.o: ../../include/openssl/symhacks.h des_old.c

ecb3_enc.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h

ecb3_enc.o: ../../include/openssl/opensslconf.h des_locl.h ecb3_enc.c

ecb_enc.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h

crypto/des/des.h

+0 −1
Original line number Diff line number Diff line
@@ -198,7 +198,6 @@ void DES_pcbc_encrypt(const unsigned char *input,unsigned char *output, 
		      int enc);

DES_LONG DES_quad_cksum(const unsigned char *input,DES_cblock output[],

			long length,int out_count,DES_cblock *seed);

void DES_random_seed(DES_cblock *key);

int DES_random_key(DES_cblock *ret);

void DES_set_odd_parity(DES_cblock *key);

int DES_check_key_parity(const_DES_cblock *key);

crypto/des/des_old.c

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ DES_LONG des_quad_cksum(des_cblock *input,des_cblock *output, 
	}

void des_random_seed(des_cblock key)

	{

	DES_random_seed((DES_cblock *)key);

	RAND_seed(key, sizeof(des_cblock));

	}

void des_random_key(des_cblock ret)

	{

crypto/des/rand_key.c

+0 −5
Original line number Diff line number Diff line
@@ -56,11 +56,6 @@ 
#include <openssl/des.h>

#include <openssl/rand.h>



void DES_random_seed(DES_cblock *key)

	{

	RAND_seed(key, sizeof(DES_cblock));

	}



int DES_random_key(DES_cblock *ret)

	{

	do

doc/crypto/des.pod

+9 −7
Original line number Diff line number Diff line
@@ -122,11 +122,9 @@ each byte is the parity bit. The key schedule is an expanded form of 
the key; it is used to speed the encryption process.



DES_random_key() generates a random key.  The PRNG must be seeded

prior to using this function (see L<rand(3)|rand(3)>; for backward

compatibility the function DES_random_seed() is available as well).

If the PRNG could not generate a secure key, 0 is returned.  In

earlier versions of the library, DES_random_key() did not generate

secure keys.

prior to using this function (see L<rand(3)|rand(3)>).  If the PRNG

could not generate a secure key, 0 is returned.  In earlier versions

of the library, DES_random_key() did not generate secure keys.



Before a DES key can be used, it must be converted into the

architecture dependent I<DES_key_schedule> via the
@@ -348,9 +346,13 @@ crypt(3), L<des_modes(7)|des_modes(7)>, 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

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().

are provided for a short while, as well as crypt().  des_random_seed()

is were not kept as DES_ variants.  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(),