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/cfb64enc.c | |
| parent | e186bf96b433b85fc3a87b3ca2fd6c1929212d72 (diff) | |
| download | openssl-edf0bfb52b46bb9c8bf44e9c486be60c7087618c.zip openssl-edf0bfb52b46bb9c8bf44e9c486be60c7087618c.tar.gz openssl-edf0bfb52b46bb9c8bf44e9c486be60c7087618c.tar.bz2 | |
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/cfb64enc.c')
| -rw-r--r-- | crypto/des/cfb64enc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/crypto/des/cfb64enc.c b/crypto/des/cfb64enc.c index e2525a7..389a232 100644 --- a/crypto/des/cfb64enc.c +++ b/crypto/des/cfb64enc.c @@ -64,8 +64,8 @@ */ void des_cfb64_encrypt(const unsigned char *in, unsigned char *out, - long length, des_key_schedule schedule, des_cblock ivec, int *num, - int enc) + long length, des_key_schedule schedule, des_cblock *ivec, + int *num, int enc) { register DES_LONG v0,v1; register long l=length; @@ -73,7 +73,7 @@ void des_cfb64_encrypt(const unsigned char *in, unsigned char *out, DES_LONG ti[2]; unsigned char *iv,c,cc; - iv=ivec; + iv = &(*ivec)[0]; if (enc) { while (l--) @@ -83,10 +83,10 @@ void des_cfb64_encrypt(const unsigned char *in, unsigned char *out, c2l(iv,v0); ti[0]=v0; c2l(iv,v1); ti[1]=v1; des_encrypt(ti,schedule,DES_ENCRYPT); - iv=ivec; + iv = &(*ivec)[0]; v0=ti[0]; l2c(v0,iv); v0=ti[1]; l2c(v0,iv); - iv=ivec; + iv = &(*ivec)[0]; } c= *(in++)^iv[n]; *(out++)=c; @@ -103,10 +103,10 @@ void des_cfb64_encrypt(const unsigned char *in, unsigned char *out, c2l(iv,v0); ti[0]=v0; c2l(iv,v1); ti[1]=v1; des_encrypt(ti,schedule,DES_ENCRYPT); - iv=ivec; + iv = &(*ivec)[0]; v0=ti[0]; l2c(v0,iv); v0=ti[1]; l2c(v0,iv); - iv=ivec; + iv = &(*ivec)[0]; } cc= *(in++); c=iv[n]; |