diff options
| author | Rich Salz <rsalz@akamai.com> | 2016-02-10 11:10:39 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-02-17 21:12:30 -0500 |
| commit | e4ef2e25f11de9c3d729be15bef693a815c3dfe4 (patch) | |
| tree | 44395f22251e1732935a09f8a650b43c4d4cabd1 /crypto/des | |
| parent | 4418e0302f471750e643079a753ab43a2eb164b8 (diff) | |
| download | openssl-e4ef2e25f11de9c3d729be15bef693a815c3dfe4.tar.gz | |
Remove "experimental" in code and comments, too.
Thanks to Viktor for additional review.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/des')
| -rw-r--r-- | crypto/des/str2key.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/crypto/des/str2key.c b/crypto/des/str2key.c index cd426c6b47..e671d14b0f 100644 --- a/crypto/des/str2key.c +++ b/crypto/des/str2key.c @@ -84,13 +84,7 @@ 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); OPENSSL_cleanse(&ks, sizeof(ks)); DES_set_odd_parity(key); @@ -141,21 +135,9 @@ 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); OPENSSL_cleanse(&ks, sizeof(ks)); DES_set_odd_parity(key1); |