generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make the change to strong keys in the string to key(s) functions experimental in the main trunk as well

Browse Source
This commit is contained in:
Richard Levitte 2002-03-26 12:44:35 +00:00
parent af1cb47e65
commit 003144a8e8
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crypto/des/str2key.c
View File

@ -86,9 +86,13 @@ void DES_string_to_key(const char *str, DES_cblock *key)
} }
#endif #endif
DES_set_odd_parity(key); DES_set_odd_parity(key);
#ifdef EXPERIMENTAL_STR_TO_STRONG_KEY
if(DES_is_weak_key(key)) if(DES_is_weak_key(key))
(*key)[7] ^= 0xF0; (*key)[7] ^= 0xF0;
DES_set_key(key,&ks); DES_set_key(key,&ks);
#else
DES_set_key_unchecked(key,&ks);
#endif
DES_cbc_cksum((const unsigned char*)str,key,length,&ks,key); DES_cbc_cksum((const unsigned char*)str,key,length,&ks,key);
memset(&ks,0,sizeof(ks)); memset(&ks,0,sizeof(ks));
DES_set_odd_parity(key); DES_set_odd_parity(key);
@ -147,13 +151,21 @@ void DES_string_to_2keys(const char *str, DES_cblock *key1, DES_cblock *key2)
#endif #endif
DES_set_odd_parity(key1); DES_set_odd_parity(key1);
DES_set_odd_parity(key2); DES_set_odd_parity(key2);
#ifdef EXPERIMENTAL_STR_TO_STRONG_KEY
if(DES_is_weak_key(key1)) if(DES_is_weak_key(key1))
(*key1)[7] ^= 0xF0; (*key1)[7] ^= 0xF0;
DES_set_key(key1,&ks); DES_set_key(key1,&ks);
#else
DES_set_key_unchecked(key1,&ks);
#endif
DES_cbc_cksum((const unsigned char*)str,key1,length,&ks,key1); DES_cbc_cksum((const unsigned char*)str,key1,length,&ks,key1);
#ifdef EXPERIMENTAL_STR_TO_STRONG_KEY
if(DES_is_weak_key(key2)) if(DES_is_weak_key(key2))
(*key2)[7] ^= 0xF0; (*key2)[7] ^= 0xF0;
DES_set_key(key2,&ks); DES_set_key(key2,&ks);
#else
DES_set_key_unchecked(key2,&ks);
#endif
DES_cbc_cksum((const unsigned char*)str,key2,length,&ks,key2); DES_cbc_cksum((const unsigned char*)str,key2,length,&ks,key2);
memset(&ks,0,sizeof(ks)); memset(&ks,0,sizeof(ks));
DES_set_odd_parity(key1); DES_set_odd_parity(key1);