From 976b2c9c2fc4e1570a4d0c978e98685e9b5b80b7 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Thu, 14 Feb 2002 02:43:57 +0000 Subject: [PATCH] Because making the key strong by xoring the last byte with 0xF0 generates different keys than previous versions of OpenSSL and libdes, let's make Assar's change experimental for now. --- crypto/des/str2key.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/crypto/des/str2key.c b/crypto/des/str2key.c index 70f1d83e07..36c3f81d99 100644 --- a/crypto/des/str2key.c +++ b/crypto/des/str2key.c @@ -86,9 +86,13 @@ void DES_string_to_key(const char *str, DES_cblock *key) } #endif DES_set_odd_parity(key); +#ifdef EXPERIMENTAL_STR_TO_STRONG_KEY if(DES_is_weak_key(key)) (*key)[7] ^= 0xF0; DES_set_key(key,&ks); +#else + DES_set_key_unchecked(key,&ks); +#endif DES_cbc_cksum((const unsigned char*)str,key,length,&ks,key); memset(&ks,0,sizeof(ks)); DES_set_odd_parity(key); @@ -147,13 +151,21 @@ void DES_string_to_2keys(const char *str, DES_cblock *key1, DES_cblock *key2) #endif DES_set_odd_parity(key1); DES_set_odd_parity(key2); +#ifdef EXPERIMENTAL_STR_TO_STRONG_KEY if(DES_is_weak_key(key1)) (*key1)[7] ^= 0xF0; DES_set_key(key1,&ks); +#else + DES_set_key_unchecked(key1,&ks); +#endif DES_cbc_cksum((const unsigned char*)str,key1,length,&ks,key1); +#ifdef EXPERIMENTAL_STR_TO_STRONG_KEY if(DES_is_weak_key(key2)) (*key2)[7] ^= 0xF0; DES_set_key(key2,&ks); +#else + DES_set_key_unchecked(key2,&ks); +#endif DES_cbc_cksum((const unsigned char*)str,key2,length,&ks,key2); memset(&ks,0,sizeof(ks)); DES_set_odd_parity(key1); -- 2.25.1