Remove the _shadow_ indirection, which is unnecessary in a world without

OPENSSL_EXPORT_VAR_AS_FUNCTION.

ok miod@

6 files changed, 8 insertions, 14 deletions

diff --git a/src/lib/libcrypto/des/des.h b/src/lib/libcrypto/des/des.h
index de99c73f43..cff50b2ec5 100644
--- a/src/lib/libcrypto/des/des.h
+++ b/src/lib/libcrypto/des/des.h
@@ -107,11 +107,8 @@ 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))
 
-extern int _shadow_DES_check_key;       /* defaults to false */
-#define DES_check_key _shadow_DES_check_key
-
-extern int _shadow_DES_rw_mode;         /* defaults to DES_PCBC_MODE */
-#define DES_rw_mode _shadow_DES_rw_mode
+extern int DES_check_key;       /* defaults to false */
+extern int DES_rw_mode;         /* defaults to DES_PCBC_MODE */
 
 const char *DES_options(void);
 void DES_ecb3_encrypt(const_DES_cblock *input, DES_cblock *output,
diff --git a/src/lib/libcrypto/des/enc_read.c b/src/lib/libcrypto/des/enc_read.c
index 8e1ff8e3eb..5a39390219 100644
--- a/src/lib/libcrypto/des/enc_read.c
+++ b/src/lib/libcrypto/des/enc_read.c
@@ -63,7 +63,7 @@
 
 /* This has some uglies in it but it works - even over sockets. */
 /*extern int errno;*/
-int _shadow_DES_rw_mode = DES_PCBC_MODE;
+int DES_rw_mode = DES_PCBC_MODE;
 
 
 /*
diff --git a/src/lib/libcrypto/des/set_key.c b/src/lib/libcrypto/des/set_key.c
index 85a0d2bfc1..c86a80b853 100644
--- a/src/lib/libcrypto/des/set_key.c
+++ b/src/lib/libcrypto/des/set_key.c
@@ -66,7 +66,7 @@
 #include <openssl/crypto.h>
 #include "des_locl.h"
 
-int _shadow_DES_check_key = 0;  /* defaults to false */
+int DES_check_key = 0;  /* defaults to false */
 
 static const unsigned char odd_parity[256]={
   1,  1,  2,  2,  4,  4,  7,  7,  8,  8, 11, 11, 13, 13, 14, 14,
diff --git a/src/lib/libssl/src/crypto/des/des.h b/src/lib/libssl/src/crypto/des/des.h
index de99c73f43..cff50b2ec5 100644
--- a/src/lib/libssl/src/crypto/des/des.h
+++ b/src/lib/libssl/src/crypto/des/des.h
@@ -107,11 +107,8 @@ 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))
 
-extern int _shadow_DES_check_key;       /* defaults to false */
-#define DES_check_key _shadow_DES_check_key
-
-extern int _shadow_DES_rw_mode;         /* defaults to DES_PCBC_MODE */
-#define DES_rw_mode _shadow_DES_rw_mode
+extern int DES_check_key;       /* defaults to false */
+extern int DES_rw_mode;         /* defaults to DES_PCBC_MODE */
 
 const char *DES_options(void);
 void DES_ecb3_encrypt(const_DES_cblock *input, DES_cblock *output,
diff --git a/src/lib/libssl/src/crypto/des/enc_read.c b/src/lib/libssl/src/crypto/des/enc_read.c
index 8e1ff8e3eb..5a39390219 100644
--- a/src/lib/libssl/src/crypto/des/enc_read.c
+++ b/src/lib/libssl/src/crypto/des/enc_read.c
@@ -63,7 +63,7 @@
 
 /* This has some uglies in it but it works - even over sockets. */
 /*extern int errno;*/
-int _shadow_DES_rw_mode = DES_PCBC_MODE;
+int DES_rw_mode = DES_PCBC_MODE;
 
 
 /*
diff --git a/src/lib/libssl/src/crypto/des/set_key.c b/src/lib/libssl/src/crypto/des/set_key.c
index 85a0d2bfc1..c86a80b853 100644
--- a/src/lib/libssl/src/crypto/des/set_key.c
+++ b/src/lib/libssl/src/crypto/des/set_key.c
@@ -66,7 +66,7 @@
 #include <openssl/crypto.h>
 #include "des_locl.h"
 
-int _shadow_DES_check_key = 0;  /* defaults to false */
+int DES_check_key = 0;  /* defaults to false */
 
 static const unsigned char odd_parity[256]={
   1,  1,  2,  2,  4,  4,  7,  7,  8,  8, 11, 11, 13, 13, 14, 14,