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/des/ede_cbcm_enc.c | |
| parent | e4119b931172a6a28e2ecb65ef41c6f23b89d09c (diff) | |
| download | openssl-4e31df2cd73dbb659fd8a6eca6270fac661c072d.tar.gz | |
Fix ghastly DES declarations, and all consequential warnings.
Diffstat (limited to 'crypto/des/ede_cbcm_enc.c')
| -rw-r--r-- | crypto/des/ede_cbcm_enc.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/crypto/des/ede_cbcm_enc.c b/crypto/des/ede_cbcm_enc.c index a40b1d6073..10ffcbc729 100644 --- a/crypto/des/ede_cbcm_enc.c +++ b/crypto/des/ede_cbcm_enc.c @@ -65,7 +65,7 @@ Feedback Masking, by Coppersmith, Johnson and Matyas, (IBM and Certicom). #include "des_locl.h" -void des_ede3_cbcm_encrypt(const unsigned char *input,unsigned char *output, +void des_ede3_cbcm_encrypt(const unsigned char *in,unsigned char *out, long length, des_key_schedule ks1,des_key_schedule ks2, des_key_schedule ks3, @@ -74,15 +74,12 @@ void des_ede3_cbcm_encrypt(const unsigned char *input,unsigned char *output, { register DES_LONG tin0,tin1; register DES_LONG tout0,tout1,xor0,xor1,m0,m1; - register unsigned char *in,*out; register long l=length; DES_LONG tin[2]; unsigned char *iv1,*iv2; - in=(unsigned char *)input; - out=(unsigned char *)output; - iv1=(unsigned char *)ivec1; - iv2=(unsigned char *)ivec2; + iv1=ivec1; + iv2=ivec2; if (enc) { @@ -125,11 +122,11 @@ void des_ede3_cbcm_encrypt(const unsigned char *input,unsigned char *output, l2c(tout0,out); l2c(tout1,out); } - iv1=(unsigned char *)ivec1; + iv1=ivec1; l2c(m0,iv1); l2c(m1,iv1); - iv2=(unsigned char *)ivec2; + iv2=ivec2; l2c(tout0,iv2); l2c(tout1,iv2); } @@ -182,11 +179,11 @@ void des_ede3_cbcm_encrypt(const unsigned char *input,unsigned char *output, xor1=t1; } - iv1=(unsigned char *)ivec1; + iv1=ivec1; l2c(m0,iv1); l2c(m1,iv1); - iv2=(unsigned char *)ivec2; + iv2=ivec2; l2c(xor0,iv2); l2c(xor1,iv2); } |