diff options
| author | Bodo Möller <bodo@openssl.org> | 1999-05-16 12:26:16 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 1999-05-16 12:26:16 +0000 |
| commit | edf0bfb52b46bb9c8bf44e9c486be60c7087618c (patch) | |
| tree | 6ad2135e6ba0e639b8938729fd55696605913011 /crypto/evp/e_xcbc_d.c | |
| parent | e186bf96b433b85fc3a87b3ca2fd6c1929212d72 (diff) | |
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).
Diffstat (limited to 'crypto/evp/e_xcbc_d.c')
| -rw-r--r-- | crypto/evp/e_xcbc_d.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/crypto/evp/e_xcbc_d.c b/crypto/evp/e_xcbc_d.c index 3238de021d..3a6628a75c 100644 --- a/crypto/evp/e_xcbc_d.c +++ b/crypto/evp/e_xcbc_d.c @@ -87,12 +87,14 @@ EVP_CIPHER *EVP_desx_cbc(void) static void desx_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) + if (deskey != NULL) { - des_set_key(key,ctx->c.desx_cbc.ks); + des_set_key(deskey,ctx->c.desx_cbc.ks); memcpy(&(ctx->c.desx_cbc.inw[0]),&(key[8]),8); memcpy(&(ctx->c.desx_cbc.outw[0]),&(key[16]),8); } @@ -102,9 +104,9 @@ static void desx_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, unsigned char *in, unsigned int inl) { des_xcbc_encrypt(in,out,inl,ctx->c.desx_cbc.ks, - &(ctx->iv[0]), - &(ctx->c.desx_cbc.inw[0]), - &(ctx->c.desx_cbc.outw[0]), + (des_cblock *)&(ctx->iv[0]), + &ctx->c.desx_cbc.inw, + &ctx->c.desx_cbc.outw, ctx->encrypt); } #endif |