diff options
| author | Tom Yu <tlyu@mit.edu> | 2002-08-16 20:35:55 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2002-08-16 20:35:55 +0000 |
| commit | 32cf5d5a732c530904fcef93c0d6f6e2e3fabd02 (patch) | |
| tree | 9d3f3cd3d91e107524595cb658307dfe59cb43b5 /src/lib/crypto | |
| parent | 727043701f0a015919b2b355a5c67e433ae70cb9 (diff) | |
| download | krb5-32cf5d5a732c530904fcef93c0d6f6e2e3fabd02.zip krb5-32cf5d5a732c530904fcef93c0d6f6e2e3fabd02.tar.gz krb5-32cf5d5a732c530904fcef93c0d6f6e2e3fabd02.tar.bz2 | |
* string2key.c: Work around possible bug with AFS salts;
[krb5-clients/1146] from <Wolfgang.Friebel@cern.ch>.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14734 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/crypto')
| -rw-r--r-- | src/lib/crypto/des/ChangeLog | 5 | ||||
| -rw-r--r-- | src/lib/crypto/des/string2key.c | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog index 3e00ae8..d19cc47 100644 --- a/src/lib/crypto/des/ChangeLog +++ b/src/lib/crypto/des/ChangeLog @@ -1,3 +1,8 @@ +2002-08-16 Tom Yu <tlyu@mit.edu> + + * string2key.c: Work around possible bug with AFS salts; + [krb5-clients/1146] from <Wolfgang.Friebel@cern.ch>. + 2002-06-07 Miro Jurisic <meeroh@mit.edu> * des_int.h: use "" includes for k5-int.h diff --git a/src/lib/crypto/des/string2key.c b/src/lib/crypto/des/string2key.c index a400f07..74268a1 100644 --- a/src/lib/crypto/des/string2key.c +++ b/src/lib/crypto/des/string2key.c @@ -99,6 +99,9 @@ mit_des_string_to_key_int (keyblock, data, salt) if (salt) { if (salt->length == SALT_TYPE_AFS_LENGTH || salt->length == (unsigned) -1) { krb5_data salt2; + char *c; + c = strchr(salt->data, '@'); + if (c != NULL) *c = '\0'; /* workaround from krb5-clients/1146 */ salt2.data = salt->data; salt2.length = strlen (salt2.data); /* cheat and do AFS string2key instead */ |