Commit ceb8e32c authored by Andy Polyakov's avatar Andy Polyakov
Browse files

crypto/dllmain.c: remove unused OPENSSL_NONPIC_relocated variable. 



Reviewed-by: default avatarKurt Roeckx <kurt@roeckx.be>
(Merged from https://github.com/openssl/openssl/pull/6752)
parent 9e4a1c3f

crypto/cryptlib.c

+0 −1
Original line number Diff line number Diff line
@@ -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)

{

crypto/dllmain.c

+0 −15
Original line number Diff line number Diff line
@@ -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;

include/internal/cryptlib.h

+0 −1
Original line number Diff line number Diff line
@@ -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);