oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

use des functions to avoid generating warnings with openssl's

Browse Source 
prototypes


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10700 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2001-09-16 04:48:05 +00:00
parent a53e6efc5f
commit 5c99ba3d29
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/krb5/crypto.c
View File

@@ -248,12 +248,12 @@ DES_AFS3_Transarc_string_to_key (krb5_data pw,
memcpy(&temp_key, "kerberos", 8); memcpy(&temp_key, "kerberos", 8);
des_set_odd_parity (&temp_key); des_set_odd_parity (&temp_key);
des_set_key (&temp_key, schedule); des_set_key (&temp_key, schedule);
des_cbc_cksum ((des_cblock *)password, &ivec, passlen, schedule, &ivec); des_cbc_cksum (password, &ivec, passlen, schedule, &ivec);
memcpy(&temp_key, &ivec, 8); memcpy(&temp_key, &ivec, 8);
des_set_odd_parity (&temp_key); des_set_odd_parity (&temp_key);
des_set_key (&temp_key, schedule); des_set_key (&temp_key, schedule);
des_cbc_cksum ((des_cblock *)password, key, passlen, schedule, &ivec); des_cbc_cksum (password, key, passlen, schedule, &ivec);
memset(&schedule, 0, sizeof(schedule)); memset(&schedule, 0, sizeof(schedule));
memset(&temp_key, 0, sizeof(temp_key)); memset(&temp_key, 0, sizeof(temp_key));
memset(&ivec, 0, sizeof(ivec)); memset(&ivec, 0, sizeof(ivec));
@@ -359,8 +359,8 @@ DES3_string_to_key(krb5_context context,
des_set_key(keys + i, s[i]); des_set_key(keys + i, s[i]);
} }
memset(&ivec, 0, sizeof(ivec)); memset(&ivec, 0, sizeof(ivec));
des_ede3_cbc_encrypt((des_cblock *)tmp, des_ede3_cbc_encrypt(tmp,
(des_cblock *)tmp, sizeof(tmp), tmp, sizeof(tmp),
s[0], s[1], s[2], &ivec, DES_ENCRYPT); s[0], s[1], s[2], &ivec, DES_ENCRYPT);
memset(s, 0, sizeof(s)); memset(s, 0, sizeof(s));
memset(&ivec, 0, sizeof(ivec)); memset(&ivec, 0, sizeof(ivec));
@@ -895,8 +895,8 @@ RSA_MD4_DES_checksum(krb5_context context,
MD4_Update (&md4, data, len); MD4_Update (&md4, data, len);
MD4_Final (p + 8, &md4); MD4_Final (p + 8, &md4);
memset (&ivec, 0, sizeof(ivec)); memset (&ivec, 0, sizeof(ivec));
des_cbc_encrypt((des_cblock*)p, des_cbc_encrypt(p,
(des_cblock*)p, p,
24, 24,
key->schedule->data, key->schedule->data,
&ivec, &ivec,
@@ -970,8 +970,8 @@ RSA_MD5_DES_checksum(krb5_context context,
MD5_Update (&md5, data, len); MD5_Update (&md5, data, len);
MD5_Final (p + 8, &md5); MD5_Final (p + 8, &md5);
memset (&ivec, 0, sizeof(ivec)); memset (&ivec, 0, sizeof(ivec));
des_cbc_encrypt((des_cblock*)p, des_cbc_encrypt(p,
(des_cblock*)p, p,
24, 24,
key->schedule->data, key->schedule->data,
&ivec, &ivec,
@@ -1032,8 +1032,8 @@ RSA_MD5_DES3_checksum(krb5_context context,
MD5_Update (&md5, data, len); MD5_Update (&md5, data, len);
MD5_Final (p + 8, &md5); MD5_Final (p + 8, &md5);
memset (&ivec, 0, sizeof(ivec)); memset (&ivec, 0, sizeof(ivec));
des_ede3_cbc_encrypt((des_cblock*)p, des_ede3_cbc_encrypt(p,
(des_cblock*)p, p,
24, 24,
sched[0], sched[1], sched[2], sched[0], sched[1], sched[2],
&ivec, &ivec,