diff options
| author | Ezra Peisach <epeisach@mit.edu> | 2000-10-17 22:57:34 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 2000-10-17 22:57:34 +0000 |
| commit | a1453efdd2480cf6249795a41cd1a21579e2ada9 (patch) | |
| tree | 0367ad41f61b7ffcbf7ca42be64a26dbb349d782 /src/lib/crypto/des/string2key.c | |
| parent | 48e24f7ef133990af31e9554731a31b43c1d762c (diff) | |
| download | krb5-a1453efdd2480cf6249795a41cd1a21579e2ada9.tar.gz krb5-a1453efdd2480cf6249795a41cd1a21579e2ada9.tar.xz krb5-a1453efdd2480cf6249795a41cd1a21579e2ada9.zip | |
* des_int.h: Change prototypes for mit_des_cbc_encrypt(),
mit_des_cbc_cksum(), and mit_des3_cbc_encrypt() to take unsigned
long lengths.
* d3_cbc.c (mit_des3_cbc_encrypt): Length argument now takes an
unsigned long.
* f_cbc.c (mit_des_cbc_encrypt): Length argument now takes an
unsigned long.
* f_cksum.c (mit_des_cbc_cksum): Length argument now takes an
unsigned long.
* string2key.c: Unsigned/signed int cleanup. Test for a
salt-length of SALT_TYPE_AFS_LENGTH or -1 (for backwards
compatibilty) for use of mit_afs_string_to_key().
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12774 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/crypto/des/string2key.c')
| -rw-r--r-- | src/lib/crypto/des/string2key.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/crypto/des/string2key.c b/src/lib/crypto/des/string2key.c index 5381fdbc9..45a8500ec 100644 --- a/src/lib/crypto/des/string2key.c +++ b/src/lib/crypto/des/string2key.c @@ -75,13 +75,13 @@ krb5_keyblock FAR * keyblock; const krb5_data FAR * data; const krb5_data FAR * salt; { - register char *str, *copystr; + register krb5_octet *str, *copystr; register krb5_octet *key; register unsigned temp; register long i; register int j; - register long length; + register unsigned long length; unsigned char *k_p; int forward; register char *p_char; @@ -97,7 +97,7 @@ const krb5_data FAR * salt; key = keyblock->contents; if (salt) { - if (salt->length == -1) { + if (salt->length == SALT_TYPE_AFS_LENGTH || salt->length == (unsigned) -1) { /* cheat and do AFS string2key instead */ return mit_afs_string_to_key (keyblock, data, salt); } else @@ -178,7 +178,7 @@ const krb5_data FAR * salt; memset((char *)key_sked, 0, sizeof(key_sked)); /* clean & free the input string */ - memset(copystr, 0, (size_t) length); + memset(copystr, 0, length); krb5_xfree(copystr); /* now fix up key parity again */ |