diff options
| author | Richard Levitte <levitte@openssl.org> | 2002-03-26 12:44:35 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2002-03-26 12:44:35 +0000 |
| commit | 003144a8e8ed5c6c4aaee6e227773bb3d6bc0f9d (patch) | |
| tree | c0bb27bf9df9c00b120db3cc5f50be15ae26c827 /crypto/des/str2key.c | |
| parent | af1cb47e65499c23f2dc152d6b26a55e11d5af2b (diff) | |
Make the change to strong keys in the string to key(s) functions experimental in the main trunk as well
Diffstat (limited to 'crypto/des/str2key.c')
| -rw-r--r-- | crypto/des/str2key.c | 12 |
1 files changed, 12 insertions, 0 deletions
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); |