RAND_pseudo_bytes is good enough for encryption IVs,

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

diff --git a/crypto/evp/e_cfb_d.c b/crypto/evp/e_cfb_d.c
index 08fad964a44086c34d8fc3b54c248747fefca0d0..9e1714bd15dad9f5c6b17c5ea16191ccd1845791 100644 (file)
--- a/crypto/evp/e_cfb_d.c
+++ b/crypto/evp/e_cfb_d.c
@@ -58,19 +58,14 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
 
-#ifndef NOPROTO
+#ifndef NO_DES
 static void des_cfb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
        unsigned char *iv,int enc);
 static void des_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
        unsigned char *in, unsigned int inl);
-#else
-static void des_cfb_init_key();
-static void des_cfb_cipher();
-#endif
-
 static EVP_CIPHER d_cfb_cipher=
        {
        NID_des_cfb64,
@@ -92,13 +87,15 @@ EVP_CIPHER *EVP_des_cfb(void)
 static void des_cfb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
             unsigned char *iv, int enc)
        {
+       des_cblock *deskey = (des_cblock *)key;
+
        ctx->num=0;
 
        if (iv != NULL)
                memcpy(&(ctx->oiv[0]),iv,8);
        memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
-       if (key != NULL)
-               des_set_key(key,ctx->c.des_ks);
+       if (deskey != NULL)
+               des_set_key_unchecked(deskey,ctx->c.des_ks);
        }
 
 static void des_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
@@ -107,6 +104,7 @@ static void des_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
        des_cfb64_encrypt(
                in,out,
                (long)inl, ctx->c.des_ks,
-               &(ctx->iv[0]),
+               (des_cblock *)&(ctx->iv[0]),
                &ctx->num,ctx->encrypt);
        }
+#endif