diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index a7894ddac3fcb3e831d03ed10d2d2ca4a6bf51b6..b1e535a69596406fc81569806fdc6e3aa71f6ab0 100644 --- a/crypto/cryptlib.c +++ b/crypto/cryptlib.c @@ -161,7 +161,6 @@ void OPENSSL_cpuid_setup(void) unsigned int OPENSSL_ia32cap_P[4]; # endif #endif -int OPENSSL_NONPIC_relocated = 0; #if !defined(OPENSSL_CPUID_SETUP) && !defined(OPENSSL_CPUID_OBJ) void OPENSSL_cpuid_setup(void) { diff --git a/crypto/dllmain.c b/crypto/dllmain.c index 81bcb2d054979218d17f6e29303922244bbfe572..c23b06b4412609e01a87a6f9661c52846f9fcc8f 100644 --- a/crypto/dllmain.c +++ b/crypto/dllmain.c @@ -31,21 +31,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { case DLL_PROCESS_ATTACH: OPENSSL_cpuid_setup(); -# if defined(_WIN32_WINNT) - { - IMAGE_DOS_HEADER *dos_header = (IMAGE_DOS_HEADER *) hinstDLL; - IMAGE_NT_HEADERS *nt_headers; - - if (dos_header->e_magic == IMAGE_DOS_SIGNATURE) { - nt_headers = (IMAGE_NT_HEADERS *) ((char *)dos_header - + dos_header->e_lfanew); - if (nt_headers->Signature == IMAGE_NT_SIGNATURE && - hinstDLL != - (HINSTANCE) (nt_headers->OptionalHeader.ImageBase)) - OPENSSL_NONPIC_relocated = 1; - } - } -# endif break; case DLL_THREAD_ATTACH: break; diff --git a/include/internal/cryptlib.h b/include/internal/cryptlib.h index 2808fe7eea068aeca09b06e5c4eafe1ba7e22a6c..a608735187f8ac5071273ce58ff7d3314147f070 100644 --- a/include/internal/cryptlib.h +++ b/include/internal/cryptlib.h @@ -78,7 +78,6 @@ DEFINE_LHASH_OF(MEM); void OPENSSL_cpuid_setup(void); extern unsigned int OPENSSL_ia32cap_P[]; void OPENSSL_showfatal(const char *fmta, ...); -extern int OPENSSL_NONPIC_relocated; void crypto_cleanup_all_ex_data_int(void); int openssl_init_fork_handlers(void);