diff options
Diffstat (limited to 'crypto/evp/e_cbc_d.c')
| -rw-r--r-- | crypto/evp/e_cbc_d.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/crypto/evp/e_cbc_d.c b/crypto/evp/e_cbc_d.c index f394fa4806..9203f3f52d 100644 --- a/crypto/evp/e_cbc_d.c +++ b/crypto/evp/e_cbc_d.c @@ -87,16 +87,20 @@ EVP_CIPHER *EVP_des_cbc(void) static void des_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key, unsigned char *iv, int enc) { + des_cblock *deskey = (des_cblock *)key; + 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(deskey,ctx->c.des_ks); } static void des_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, unsigned char *in, unsigned int inl) { - des_ncbc_encrypt(in,out,inl,ctx->c.des_ks,&(ctx->iv[0]),ctx->encrypt); + des_ncbc_encrypt(in,out,inl,ctx->c.des_ks, + (des_cblock *)&(ctx->iv[0]), + ctx->encrypt); } #endif |