diff options
| author | Rich Salz <rsalz@akamai.com> | 2019-07-01 14:41:19 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@akamai.com> | 2019-07-01 19:42:12 -0400 |
| commit | b66a481888e00a36f833308bdcf53408238511d4 (patch) | |
| tree | 50beaefd6da8140fa30fe951389800589e8826ff /crypto/des | |
| parent | 6b10d29c1ac7dd4054cdb72e881d3e0213fb7ef0 (diff) | |
Remove DES_check_key global
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/9284)
Diffstat (limited to 'crypto/des')
| -rw-r--r-- | crypto/des/set_key.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/crypto/des/set_key.c b/crypto/des/set_key.c index 4726bb224d..d42cebdadc 100644 --- a/crypto/des/set_key.c +++ b/crypto/des/set_key.c @@ -18,9 +18,6 @@ #include <openssl/crypto.h> #include "des_locl.h" -/* defaults to false */ -OPENSSL_IMPLEMENT_GLOBAL(int, DES_check_key, 0) - static const unsigned char odd_parity[256] = { 1, 1, 2, 2, 4, 4, 7, 7, 8, 8, 11, 11, 13, 13, 14, 14, 16, 16, 19, 19, 21, 21, 22, 22, 25, 25, 26, 26, 28, 28, 31, 31, @@ -277,12 +274,7 @@ static const DES_LONG des_skb[8][64] = { int DES_set_key(const_DES_cblock *key, DES_key_schedule *schedule) { - if (DES_check_key) { - return DES_set_key_checked(key, schedule); - } else { - DES_set_key_unchecked(key, schedule); - return 0; - } + return DES_set_key_checked(key, schedule); } /*- |