diff options
| author |   mho <mho@openbsd.org> | 2003-05-15 05:43:52 +0000 |
|---|---|---|
| committer | mho <mho@openbsd.org> | 2003-05-15 05:43:52 +0000 |
| commit | 5e9e00d2c2cb7c22a63389e9f4b1ab7e643deb43 (patch) | |
| tree | ed998961dafcb4f4f1862b3e5a6216c55639db78 | |
| parent | IPv6 IPsec gateway now functions; patch by itojun, tested by myself and vincent (diff) | |
| download | wireguard-openbsd-5e9e00d2c2cb7c22a63389e9f4b1ab7e643deb43.tar.xz wireguard-openbsd-5e9e00d2c2cb7c22a63389e9f4b1ab7e643deb43.zip | |
-Wall; ok hin@
| -rw-r--r-- | kerberosV/src/kdc/string2key.c | 2 | ||||
| -rw-r--r-- | kerberosV/src/lib/krb5/crypto.c | 17 |
2 files changed, 10 insertions, 9 deletions
diff --git a/kerberosV/src/kdc/string2key.c b/kerberosV/src/kdc/string2key.c index e1565bbd411..67f4af1a0c9 100644 --- a/kerberosV/src/kdc/string2key.c +++ b/kerberosV/src/kdc/string2key.c @@ -131,7 +131,7 @@ main(int argc, char **argv) if(num == 0) krb5_errx(context, 1, "there are no encryption types for that keytype"); etype = etypes[0]; - krb5_enctype_to_string(context, etype, &keytype_str); + krb5_enctype_to_string(context, etype, (char **) &keytype_str); if(num > 1 && version5) krb5_warnx(context, "ambiguous keytype, using %s", keytype_str); } diff --git a/kerberosV/src/lib/krb5/crypto.c b/kerberosV/src/lib/krb5/crypto.c index 32b4bc8c9ec..21f26ff8163 100644 --- a/kerberosV/src/lib/krb5/crypto.c +++ b/kerberosV/src/lib/krb5/crypto.c @@ -293,12 +293,13 @@ krb5_DES_AFS3_Transarc_string_to_key (krb5_data pw, memcpy(&temp_key, "kerberos", 8); des_set_odd_parity (&temp_key); des_set_key (&temp_key, schedule); - des_cbc_cksum (password, &ivec, passlen, schedule, &ivec); + des_cbc_cksum ((des_cblock *) password, &ivec, passlen, schedule, &ivec); memcpy(&temp_key, &ivec, 8); des_set_odd_parity (&temp_key); des_set_key (&temp_key, schedule); - des_cbc_cksum (password, key, passlen, schedule, &ivec); + des_cbc_cksum ((des_cblock *) password, (des_cblock *) key, passlen, + schedule, &ivec); memset(&schedule, 0, sizeof(schedule)); memset(&temp_key, 0, sizeof(temp_key)); memset(&ivec, 0, sizeof(ivec)); @@ -406,8 +407,8 @@ DES3_string_to_key(krb5_context context, des_set_key(keys + i, s[i]); } memset(&ivec, 0, sizeof(ivec)); - des_ede3_cbc_encrypt(tmp, - tmp, sizeof(tmp), + des_ede3_cbc_encrypt((des_cblock *) tmp, + (des_cblock *) tmp, sizeof(tmp), s[0], s[1], s[2], &ivec, DES_ENCRYPT); memset(s, 0, sizeof(s)); memset(&ivec, 0, sizeof(ivec)); @@ -1188,8 +1189,8 @@ RSA_MD4_DES_checksum(krb5_context context, MD4_Update (&md4, data, len); MD4_Final (p + 8, &md4); memset (&ivec, 0, sizeof(ivec)); - des_cbc_encrypt(p, - p, + des_cbc_encrypt((des_cblock *) p, + (des_cblock *) p, 24, key->schedule->data, &ivec, @@ -1263,8 +1264,8 @@ RSA_MD5_DES_checksum(krb5_context context, MD5_Update (&md5, data, len); MD5_Final (p + 8, &md5); memset (&ivec, 0, sizeof(ivec)); - des_cbc_encrypt(p, - p, + des_cbc_encrypt((des_cblock *) p, + (des_cblock *) p, 24, key->schedule->data, &ivec, |