Don't use a ssl specific DRBG anymore

[openssl.git] / crypto / evp / e_des.c

diff --git a/crypto/evp/e_des.c b/crypto/evp/e_des.c
index d8c4afa8860aa750ef3cd0bdf5a1d9a6d7250c4a..9b2facfecfce98bf421892f0bde536bd4d5e5f2b 100644 (file)
--- a/crypto/evp/e_des.c
+++ b/crypto/evp/e_des.c
@@ -15,8 +15,6 @@
 # include "internal/evp_int.h"
 # include <openssl/des.h>
 # include <openssl/rand.h>
 # include "internal/evp_int.h"
 # include <openssl/des.h>
 # include <openssl/rand.h>

-# include <internal/rand.h>
-# include "evp_locl.h"

 
 typedef struct {
     union {
 
 typedef struct {
     union {


@@ -231,12 +229,8 @@ static int des_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
 
     switch (type) {
     case EVP_CTRL_RAND_KEY:
 
     switch (type) {
     case EVP_CTRL_RAND_KEY:

-        if (c->drbg != NULL) {
-            if (RAND_DRBG_bytes(c->drbg, ptr, 8) == 0)
-                return 0;
-        } else if (RAND_bytes(ptr, 8) <= 0) {
+        if (RAND_bytes(ptr, 8) <= 0)

             return 0;
             return 0;

-        }

         DES_set_odd_parity((DES_cblock *)ptr);
         return 1;
 
         DES_set_odd_parity((DES_cblock *)ptr);
         return 1;