Commit c31bbf1e authored by Richard Levitte's avatar Richard Levitte
Browse files

Apply one patch from Assar Westerlund <assar@sics.se>: 

The following patch makes sure that string2key does not use weak DES
keys (then making them non-weak by xor:ing with 0xF0).
parent 5e68f8ce

crypto/des/str2key.c

+9 −3
Original line number Diff line number Diff line
@@ -86,7 +86,9 @@ void DES_string_to_key(const char *str, DES_cblock *key) 
		}

#endif

	DES_set_odd_parity(key);

	DES_set_key_unchecked(key,&ks);

	if(DES_is_weak_key(key))

	    (*key)[7] ^= 0xF0;

	DES_set_key(key,&ks);

	DES_cbc_cksum((const unsigned char*)str,key,length,&ks,key);

	memset(&ks,0,sizeof(ks));

	DES_set_odd_parity(key);
@@ -145,9 +147,13 @@ 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);

	DES_set_key_unchecked(key1,&ks);

	if(DES_is_weak_key(key1))

	    (*key1)[7] ^= 0xF0;

	DES_set_key(key1,&ks);

	DES_cbc_cksum((const unsigned char*)str,key1,length,&ks,key1);

	DES_set_key_unchecked(key2,&ks);

	if(DES_is_weak_key(key2))

	    (*key2)[7] ^= 0xF0;

	DES_set_key(key2,&ks);

	DES_cbc_cksum((const unsigned char*)str,key2,length,&ks,key2);

	memset(&ks,0,sizeof(ks));

	DES_set_odd_parity(key1);