cryptlib.c: eliminate dependency on _strtoui64, older Windows CRT don't have it.

[openssl.git] / crypto / cryptlib.c

diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index 12f24f6cc84ec990a78237534c36d29374d7a8d9..bb54e6485ad0efa18dbcaac1f0dc05120ea54489 100644 (file)
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -205,7 +205,7 @@ int CRYPTO_get_new_lockid(char *name)
 #if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN16)
        /* A hack to make Visual C++ 5.0 work correctly when linking as
         * a DLL using /MT. Without this, the application cannot use
-        * and floating point printf's.
+        * any floating point printf's.
         * It also seems to be needed for Visual C 1.5 (win16) */
        SSLeay_MSVC5_hack=(double)name[0]*(double)name[1];
 #endif
@@ -554,14 +554,6 @@ unsigned long CRYPTO_thread_id(void)
        }
 #endif
 
-static void (*do_dynlock_cb)(int mode, int type, const char *file, int line);
-
-void int_CRYPTO_set_do_dynlock_callback(
-       void (*dyn_cb)(int mode, int type, const char *file, int line))
-       {
-       do_dynlock_cb = dyn_cb;
-       }
-
 void CRYPTO_lock(int mode, int type, const char *file, int line)
        {
 #ifdef LOCK_DEBUG
@@ -591,8 +583,17 @@ void CRYPTO_lock(int mode, int type, const char *file, int line)
 #endif
        if (type < 0)
                {
-               if (do_dynlock_cb)
-                       do_dynlock_cb(mode, type, file, line);
+               if (dynlock_lock_callback != NULL)
+                       {
+                       struct CRYPTO_dynlock_value *pointer
+                               = CRYPTO_get_dynlock_value(type);
+
+                       OPENSSL_assert(pointer != NULL);
+
+                       dynlock_lock_callback(mode, pointer, file, line);
+
+                       CRYPTO_destroy_dynlockid(type);
+                       }
                }
        else
                if (locking_callback != NULL)
@@ -658,35 +659,48 @@ const char *CRYPTO_get_lock_name(int type)
 
 #if    defined(__i386)   || defined(__i386__)   || defined(_M_IX86) || \
        defined(__INTEL__) || \
-       defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64)
+       defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)
 
-unsigned long  OPENSSL_ia32cap_P=0;
-unsigned long *OPENSSL_ia32cap_loc(void) { return &OPENSSL_ia32cap_P; }
+unsigned int  OPENSSL_ia32cap_P[2];
+unsigned int *OPENSSL_ia32cap_loc(void) { return OPENSSL_ia32cap_P; }
 
 #if defined(OPENSSL_CPUID_OBJ) && !defined(OPENSSL_NO_ASM) && !defined(I386_ONLY)
 #define OPENSSL_CPUID_SETUP
+#if defined(_WIN32)
+typedef unsigned __int64 IA32CAP;
+#else
+typedef unsigned long long IA32CAP;
+#endif
 void OPENSSL_cpuid_setup(void)
 { static int trigger=0;
-  unsigned long OPENSSL_ia32_cpuid(void);
+  IA32CAP OPENSSL_ia32_cpuid(void);
+  IA32CAP vec;
   char *env;
 
     if (trigger)       return;
 
     trigger=1;
     if ((env=getenv("OPENSSL_ia32cap")))
-       OPENSSL_ia32cap_P = strtoul(env,NULL,0)|(1<<10);
+#if defined(_WIN32)
+    {  if (!sscanf(env,"%I64i",&vec)) vec = strtoul(env,NULL,0);   }
+#else
+       vec = strtoull(env,NULL,0);
+#endif
     else
-       OPENSSL_ia32cap_P = OPENSSL_ia32_cpuid()|(1<<10);
+       vec = OPENSSL_ia32_cpuid();
+
     /*
      * |(1<<10) sets a reserved bit to signal that variable
      * was initialized already... This is to avoid interference
      * with cpuid snippets in ELF .init segment.
      */
+    OPENSSL_ia32cap_P[0] = (unsigned int)vec|(1<<10);
+    OPENSSL_ia32cap_P[1] = (unsigned int)(vec>>32);
 }
 #endif
 
 #else
-unsigned long *OPENSSL_ia32cap_loc(void) { return NULL; }
+unsigned int *OPENSSL_ia32cap_loc(void) { return NULL; }
 #endif
 int OPENSSL_NONPIC_relocated = 0;
 #if !defined(OPENSSL_CPUID_SETUP) && !defined(OPENSSL_CPUID_OBJ)
@@ -694,62 +708,6 @@ void OPENSSL_cpuid_setup(void) {}
 #endif
 
 #if (defined(_WIN32) || defined(__CYGWIN__)) && defined(_WINDLL)
-
-#ifdef OPENSSL_FIPS
-
-#include <tlhelp32.h>
-#if defined(__GNUC__) && __GNUC__>=2
-static int DllInit(void) __attribute__((constructor));
-#elif defined(_MSC_VER)
-static int DllInit(void);
-# ifdef _WIN64
-# pragma section(".CRT$XCU",read)
-  __declspec(allocate(".CRT$XCU"))
-# else
-# pragma data_seg(".CRT$XCU")
-# endif
-  static int (*p)(void) = DllInit;
-# pragma data_seg()
-#endif
-
-static int DllInit(void)
-{
-#if defined(_WIN32_WINNT)
-       union   { int(*f)(void); BYTE *p; } t = { DllInit };
-        HANDLE hModuleSnap = INVALID_HANDLE_VALUE;
-       IMAGE_DOS_HEADER *dos_header;
-       IMAGE_NT_HEADERS *nt_headers;
-       MODULEENTRY32 me32 = {sizeof(me32)};
-
-       hModuleSnap = CreateToolhelp32Snapshot(TH32CS_SNAPMODULE,0);
-       if (hModuleSnap != INVALID_HANDLE_VALUE &&
-           Module32First(hModuleSnap,&me32)) do
-               {
-               if (t.p >= me32.modBaseAddr &&
-                   t.p <  me32.modBaseAddr+me32.modBaseSize)
-                       {
-                       dos_header=(IMAGE_DOS_HEADER *)me32.modBaseAddr;
-                       if (dos_header->e_magic==IMAGE_DOS_SIGNATURE)
-                               {
-                               nt_headers=(IMAGE_NT_HEADERS *)
-                                       ((BYTE *)dos_header+dos_header->e_lfanew);
-                               if (nt_headers->Signature==IMAGE_NT_SIGNATURE &&
-                                   me32.modBaseAddr!=(BYTE*)nt_headers->OptionalHeader.ImageBase)
-                                       OPENSSL_NONPIC_relocated=1;
-                               }
-                       break;
-                       }
-               } while (Module32Next(hModuleSnap,&me32));
-
-       if (hModuleSnap != INVALID_HANDLE_VALUE)
-               CloseHandle(hModuleSnap);
-#endif
-       OPENSSL_cpuid_setup();
-       return 0;
-}
-
-#else
-
 #ifdef __CYGWIN__
 /* pick DLL_[PROCESS|THREAD]_[ATTACH|DETACH] definitions */
 #include <windows.h>
@@ -793,8 +751,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason,
        }
 #endif
 
-#endif
-
 #if defined(_WIN32) && !defined(__CYGWIN__)
 #include <tchar.h>