diff options
| author | Ben Laurie <ben@openssl.org> | 1999-02-13 18:52:38 +0000 |
|---|---|---|
| committer | Ben Laurie <ben@openssl.org> | 1999-02-13 18:52:38 +0000 |
| commit | 4e31df2cd73dbb659fd8a6eca6270fac661c072d (patch) | |
| tree | e27cb10012ceeaf8dd433b5cf12b6fd7e73fdb8a /crypto/evp/e_cbc_3d.c | |
| parent | e4119b931172a6a28e2ecb65ef41c6f23b89d09c (diff) | |
| download | openssl-4e31df2cd73dbb659fd8a6eca6270fac661c072d.tar.gz | |
Fix ghastly DES declarations, and all consequential warnings.
Diffstat (limited to 'crypto/evp/e_cbc_3d.c')
| -rw-r--r-- | crypto/evp/e_cbc_3d.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/crypto/evp/e_cbc_3d.c b/crypto/evp/e_cbc_3d.c index 5761bf186a..907e2e94b0 100644 --- a/crypto/evp/e_cbc_3d.c +++ b/crypto/evp/e_cbc_3d.c @@ -122,8 +122,8 @@ int enc; if (key != NULL) { - des_set_key((des_cblock *)key,ctx->c.des_ede.ks1); - des_set_key((des_cblock *)&(key[8]),ctx->c.des_ede.ks2); + des_set_key(key,ctx->c.des_ede.ks1); + des_set_key(&(key[8]),ctx->c.des_ede.ks2); memcpy( (char *)ctx->c.des_ede.ks3, (char *)ctx->c.des_ede.ks1, sizeof(ctx->c.des_ede.ks1)); @@ -142,9 +142,9 @@ int enc; if (key != NULL) { - des_set_key((des_cblock *)key,ctx->c.des_ede.ks1); - des_set_key((des_cblock *)&(key[8]),ctx->c.des_ede.ks2); - des_set_key((des_cblock *)&(key[16]),ctx->c.des_ede.ks3); + des_set_key(key,ctx->c.des_ede.ks1); + des_set_key(&(key[8]),ctx->c.des_ede.ks2); + des_set_key(&(key[16]),ctx->c.des_ede.ks3); } } @@ -154,10 +154,8 @@ unsigned char *out; unsigned char *in; unsigned int inl; { - des_ede3_cbc_encrypt( - (des_cblock *)in,(des_cblock *)out, - (long)inl, ctx->c.des_ede.ks1, + des_ede3_cbc_encrypt(in,out,inl, ctx->c.des_ede.ks1, ctx->c.des_ede.ks2,ctx->c.des_ede.ks3, - (des_cblock *)&(ctx->iv[0]), + &(ctx->iv[0]), ctx->encrypt); } |