diff options
| author | Richard Levitte <levitte@openssl.org> | 2001-10-25 06:46:22 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2001-10-25 06:46:22 +0000 |
| commit | ce15d5a9dc663399ee2cfdb27d33b27faeba2a52 (patch) | |
| tree | 31922ece1711ca17dc3278112d11b9ce966ce8a6 /crypto | |
| parent | ba1c602281ebe05087b8441b51cf9cf63c066a8c (diff) | |
| download | openssl-ce15d5a9dc663399ee2cfdb27d33b27faeba2a52.tar.gz | |
Remove DES_random_seed() but retain des_random_seed() for now. Change
the docs to reflect this change and correct libeay.num.
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/des/Makefile.ssl | 3 | ||||
| -rw-r--r-- | crypto/des/des.h | 1 | ||||
| -rw-r--r-- | crypto/des/des_old.c | 2 | ||||
| -rw-r--r-- | crypto/des/rand_key.c | 5 |
4 files changed, 4 insertions, 7 deletions
diff --git a/crypto/des/Makefile.ssl b/crypto/des/Makefile.ssl index 9e7d1dbe29..c1c9aaec7f 100644 --- a/crypto/des/Makefile.ssl +++ b/crypto/des/Makefile.ssl @@ -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 diff --git a/crypto/des/des.h b/crypto/des/des.h index 68fd355c79..cc95af823b 100644 --- a/crypto/des/des.h +++ b/crypto/des/des.h @@ -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); diff --git a/crypto/des/des_old.c b/crypto/des/des_old.c index 3de404600a..d4f701f540 100644 --- a/crypto/des/des_old.c +++ b/crypto/des/des_old.c @@ -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) { diff --git a/crypto/des/rand_key.c b/crypto/des/rand_key.c index a617969f70..2398165568 100644 --- a/crypto/des/rand_key.c +++ b/crypto/des/rand_key.c @@ -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 |