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/des/ede_cbcm_enc.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/des/ede_cbcm_enc.c')
-rw-r--r-- | crypto/des/ede_cbcm_enc.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/crypto/des/ede_cbcm_enc.c b/crypto/des/ede_cbcm_enc.c index 302e32ef48..c53062481d 100644 --- a/crypto/des/ede_cbcm_enc.c +++ b/crypto/des/ede_cbcm_enc.c @@ -73,7 +73,8 @@ http://www.cs.technion.ac.il/users/wwwb/cgi-bin/tr-get.cgi/1998/CS/CS0928.ps.gz 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, des_cblock ivec1, des_cblock ivec2, int enc) + des_key_schedule ks3, des_cblock *ivec1, des_cblock *ivec2, + int enc) { register DES_LONG tin0,tin1; register DES_LONG tout0,tout1,xor0,xor1,m0,m1; @@ -81,8 +82,8 @@ void des_ede3_cbcm_encrypt(const unsigned char *in, unsigned char *out, DES_LONG tin[2]; unsigned char *iv1,*iv2; - iv1=ivec1; - iv2=ivec2; + iv1 = &(*ivec1)[0]; + iv2 = &(*ivec2)[0]; if (enc) { @@ -125,11 +126,11 @@ void des_ede3_cbcm_encrypt(const unsigned char *in, unsigned char *out, l2c(tout0,out); l2c(tout1,out); } - iv1=ivec1; + iv1=&(*ivec1)[0]; l2c(m0,iv1); l2c(m1,iv1); - iv2=ivec2; + iv2=&(*ivec2)[0]; l2c(tout0,iv2); l2c(tout1,iv2); } @@ -182,11 +183,11 @@ void des_ede3_cbcm_encrypt(const unsigned char *in, unsigned char *out, xor1=t1; } - iv1=ivec1; + iv1=&(*ivec1)[0]; l2c(m0,iv1); l2c(m1,iv1); - iv2=ivec2; + iv2=&(*ivec2)[0]; l2c(xor0,iv2); l2c(xor1,iv2); } |