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/rand_key.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/rand_key.c')
-rw-r--r-- | crypto/des/rand_key.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/crypto/des/rand_key.c b/crypto/des/rand_key.c index 00db2bef77..fc11792cda 100644 --- a/crypto/des/rand_key.c +++ b/crypto/des/rand_key.c @@ -62,13 +62,13 @@ static int seed=0; static des_cblock init; -void des_random_seed(des_cblock key) +void des_random_seed(des_cblock *key) { - memcpy(init,key,sizeof(des_cblock)); + memcpy(&init,key,sizeof(des_cblock)); seed=1; } -void des_random_key(unsigned char *ret) +void des_random_key(des_cblock *ret) { des_key_schedule ks; static DES_LONG c=0; @@ -99,13 +99,13 @@ void des_random_key(unsigned char *ret) t=(DES_LONG)((pid)|((c++)<<16)); l2c(t,p); - des_set_odd_parity(data); - des_set_key(data,ks); - des_cbc_cksum(key,key,sizeof(key),ks,data); + des_set_odd_parity(&data); + des_set_key(&data,ks); + des_cbc_cksum(key,&key,sizeof(key),ks,&data); - des_set_odd_parity(key); - des_set_key(key,ks); - des_cbc_cksum(key,data,sizeof(key),ks,key); + des_set_odd_parity(&key); + des_set_key(&key,ks); + des_cbc_cksum(key,&data,sizeof(key),ks,&key); memcpy(ret,data,sizeof(key)); memset(key,0,sizeof(key)); |