Expand the OPENSSL_.*GLOBAL.* macros and stop including e_os2.h.

ok miod@ beck@

6 files changed, 14 insertions, 16 deletions

diff --git a/src/lib/libcrypto/des/des.h b/src/lib/libcrypto/des/des.h
index 19a9918766..de99c73f43 100644
--- a/src/lib/libcrypto/des/des.h
+++ b/src/lib/libcrypto/des/des.h
@@ -61,8 +61,6 @@
 
 #include <openssl/opensslconf.h>
 
-#include <openssl/e_os2.h>      /* OPENSSL_DECLARE_GLOBAL, OPENSSL_GLOBAL_REF */
-
 #ifdef OPENSSL_NO_DES
 #error DES is disabled.
 #endif
@@ -109,10 +107,11 @@ 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)
-OPENSSL_DECLARE_GLOBAL(int,DES_rw_mode);        /* defaults to DES_PCBC_MODE */
-#define DES_rw_mode OPENSSL_GLOBAL_REF(DES_rw_mode)
+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
 
 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 e1ac04c5b3..8e1ff8e3eb 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;*/
-OPENSSL_IMPLEMENT_GLOBAL(int,DES_rw_mode,DES_PCBC_MODE)
+int _shadow_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 e8dea50b96..85a0d2bfc1 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"
 
-OPENSSL_IMPLEMENT_GLOBAL(int,DES_check_key,0)   /* defaults to false */
+int _shadow_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 19a9918766..de99c73f43 100644
--- a/src/lib/libssl/src/crypto/des/des.h
+++ b/src/lib/libssl/src/crypto/des/des.h
@@ -61,8 +61,6 @@
 
 #include <openssl/opensslconf.h>
 
-#include <openssl/e_os2.h>      /* OPENSSL_DECLARE_GLOBAL, OPENSSL_GLOBAL_REF */
-
 #ifdef OPENSSL_NO_DES
 #error DES is disabled.
 #endif
@@ -109,10 +107,11 @@ 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)
-OPENSSL_DECLARE_GLOBAL(int,DES_rw_mode);        /* defaults to DES_PCBC_MODE */
-#define DES_rw_mode OPENSSL_GLOBAL_REF(DES_rw_mode)
+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
 
 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 e1ac04c5b3..8e1ff8e3eb 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;*/
-OPENSSL_IMPLEMENT_GLOBAL(int,DES_rw_mode,DES_PCBC_MODE)
+int _shadow_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 e8dea50b96..85a0d2bfc1 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"
 
-OPENSSL_IMPLEMENT_GLOBAL(int,DES_check_key,0)   /* defaults to false */
+int _shadow_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,