From b66a481888e00a36f833308bdcf53408238511d4 Mon Sep 17 00:00:00 2001 From: Rich Salz Date: Mon, 1 Jul 2019 14:41:19 -0400 Subject: Remove DES_check_key global Reviewed-by: Tim Hudson Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/9284) --- include/openssl/des.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'include/openssl/des.h') diff --git a/include/openssl/des.h b/include/openssl/des.h index a0f5f3c..f74412b 100644 --- a/include/openssl/des.h +++ b/include/openssl/des.h @@ -63,9 +63,6 @@ typedef struct DES_ks { # define DES_ede2_ofb64_encrypt(i,o,l,k1,k2,iv,n) \ DES_ede3_ofb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n)) -OPENSSL_DECLARE_GLOBAL(int, DES_check_key); /* defaults to false */ -# define DES_check_key OPENSSL_GLOBAL_REF(DES_check_key) - const char *DES_options(void); void DES_ecb3_encrypt(const_DES_cblock *input, DES_cblock *output, DES_key_schedule *ks1, DES_key_schedule *ks2, @@ -148,8 +145,7 @@ int DES_check_key_parity(const_DES_cblock *key); int DES_is_weak_key(const_DES_cblock *key); /* * DES_set_key (= set_key = DES_key_sched = key_sched) calls - * DES_set_key_checked if global variable DES_check_key is set, - * DES_set_key_unchecked otherwise. + * DES_set_key_unchecked */ int DES_set_key(const_DES_cblock *key, DES_key_schedule *schedule); int DES_key_sched(const_DES_cblock *key, DES_key_schedule *schedule); -- cgit v1.1