projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't shadow.
[oweals/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 8b774301577931ce834d7794e8ad5f63b1ee9dce..6bdf20b6460f567690ebc09faff5ad6f9ff13a28 100644
(file)
--- a/
crypto/evp/e_cfb_d.c
+++ b/
crypto/evp/e_cfb_d.c
@@
-87,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)
{
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);
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 (
des
key != NULL)
+ des_set_key(
des
key,ctx->c.des_ks);
}
static void des_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
}
static void des_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
@@
-102,7
+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,
des_cfb64_encrypt(
in,out,
(long)inl, ctx->c.des_ks,
- &(ctx->iv[0]),
+
(des_cblock *)
&(ctx->iv[0]),
&ctx->num,ctx->encrypt);
}
#endif
&ctx->num,ctx->encrypt);
}
#endif