diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-03-29 16:48:02 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-03-30 11:22:42 +0200 |
| commit | 84af71a916d0bfce4dde135e4a5fe60d75f4940c (patch) | |
| tree | 5b39e6add40a06f3a621ee4aaf6a1040f3ac8deb /crypto/cryptlib.c | |
| parent | 2a08d1a05db937f8b1a62422b78ffe2fa07d3ead (diff) | |
| download | openssl-84af71a916d0bfce4dde135e4a5fe60d75f4940c.tar.gz | |
Break out DllMain from crypto/cryptlib.c and use it in shared libs only
Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'crypto/cryptlib.c')
| -rw-r--r-- | crypto/cryptlib.c | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index e41a6fc117..7e1d780f6c 100644 --- a/crypto/cryptlib.c +++ b/crypto/cryptlib.c @@ -195,55 +195,6 @@ void OPENSSL_cpuid_setup(void) } #endif -#if (defined(_WIN32) || defined(__CYGWIN__)) && defined(_WINDLL) -# ifdef __CYGWIN__ -/* pick DLL_[PROCESS|THREAD]_[ATTACH|DETACH] definitions */ -# include <windows.h> -/* - * this has side-effect of _WIN32 getting defined, which otherwise is - * mutually exclusive with __CYGWIN__... - */ -# endif - -/* - * All we really need to do is remove the 'error' state when a thread - * detaches - */ - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved); -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; - case DLL_THREAD_DETACH: - OPENSSL_thread_stop(); - break; - case DLL_PROCESS_DETACH: - break; - } - return (TRUE); -} -#endif - #if defined(_WIN32) && !defined(__CYGWIN__) # include <tchar.h> # include <signal.h> |