OpenSSL 0.9.7 stable 2002 05 08 merge

1 files changed, 4 insertions, 9 deletions

diff --git a/src/lib/libcrypto/des/rand_key.c b/src/lib/libcrypto/des/rand_key.c
index ee1a6c274e..2398165568 100644
--- a/src/lib/libcrypto/des/rand_key.c
+++ b/src/lib/libcrypto/des/rand_key.c
@@ -56,18 +56,13 @@
 #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)
+int DES_random_key(DES_cblock *ret)
         {
         do
                 {
-                if (RAND_bytes((unsigned char *)ret, sizeof(des_cblock)) != 1)
+                if (RAND_bytes((unsigned char *)ret, sizeof(DES_cblock)) != 1)
                         return (0);
-                } while (des_is_weak_key(ret));
-        des_set_odd_parity(ret);
+                } while (DES_is_weak_key(ret));
+        DES_set_odd_parity(ret);
         return (1);
         }