From edf0bfb52b46bb9c8bf44e9c486be60c7087618c Mon Sep 17 00:00:00 2001 From: Bodo Möller Date: Sun, 16 May 1999 12:26:16 +0000 Subject: Change type of various DES function arguments from des_cblock (meaning pointer to char) to des_cblock * (meaning pointer to array with 8 char elements), which allows the compiler to do more typechecking. (The changed argument types were of type des_cblock * back in SSLeay, and a lot of ugly casts were used then to turn them into pointers to elements; but it can be done without those casts.) Introduce new type const_des_cblock -- before, the pointers rather than the elements pointed to were declared const, and for some reason gcc did not complain about this (but some other compilers did). --- crypto/evp/e_cfb_d.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'crypto/evp/e_cfb_d.c') diff --git a/crypto/evp/e_cfb_d.c b/crypto/evp/e_cfb_d.c index 8b77430157..6bdf20b646 100644 --- 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) { + 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(deskey,ctx->c.des_ks); } 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, - &(ctx->iv[0]), + (des_cblock *)&(ctx->iv[0]), &ctx->num,ctx->encrypt); } #endif -- cgit v1.2.3