From 32cf5d5a732c530904fcef93c0d6f6e2e3fabd02 Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Fri, 16 Aug 2002 20:35:55 +0000 Subject: [PATCH] * string2key.c: Work around possible bug with AFS salts; [krb5-clients/1146] from . git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14734 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/crypto/des/ChangeLog | 5 +++++ src/lib/crypto/des/string2key.c | 3 +++ 2 files changed, 8 insertions(+) diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog index 3e00ae863..d19cc4730 100644 --- a/src/lib/crypto/des/ChangeLog +++ b/src/lib/crypto/des/ChangeLog @@ -1,3 +1,8 @@ +2002-08-16 Tom Yu + + * string2key.c: Work around possible bug with AFS salts; + [krb5-clients/1146] from . + 2002-06-07 Miro Jurisic * 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 a400f0701..74268a18b 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 */ -- 2.26.2