amps-python-client 5.3.4.3__zip → 5.3.4.4__zip

{amps-python-client-5.3.4.3 → amps-python-client-5.3.4.4}/src/cpp/src/amps_ssl.c

@@ -88,8 +88,8 @@ char           _amps_ssl_initialization_error[ERROR_BUFFER_LENGTH];
 
 #ifdef _WIN32
 typedef int (*local_proc)(void);
-HMODULE _amps_ssl_libeay_handle = 0;
-HMODULE _amps_ssl_ssleay_handle = 0;
+HMODULE _amps_crypto_library_handle = 0;
+HMODULE _amps_ssl_library_handle = 0;
 #define AMPS_strcpy strcpy_s
 
 void _amps_get_last_error(char* buffer, size_t length)
@@ -114,35 +114,37 @@ void _amps_get_last_error(char* buffer, size_t length)
                    NULL);
   }
 }
-#define LOAD_AMPS_LIBEAY_FUNCTION(name)                                         \
-  *((FARPROC*)&_amps_##name) = GetProcAddress(_amps_ssl_libeay_handle,#name);   \
-  if(!_amps_##name)                                                             \
-  {                                                                             \
-    _amps_get_last_error(errorBuffer, ERROR_BUFFER_LENGTH);                   \
-    _AMPS_SNPRINTF(_amps_ssl_initialization_error,                            \
-                   ERROR_BUFFER_LENGTH,                                      \
-                   "Error locating SSL procedure %s: %s",                    \
-                   #name,                                                    \
-                   errorBuffer);                                             \
-    return -1;                                                                \
+#define LOAD_AMPS_LIBEAY_FUNCTION(name)                                            \
+  *((FARPROC*)&_amps_##name) = GetProcAddress(_amps_crypto_library_handle,#name);  \
+  if(!_amps_##name)                                                                \
+  {                                                                                \
+    _amps_get_last_error(errorBuffer, ERROR_BUFFER_LENGTH);                        \
+    _AMPS_SNPRINTF(_amps_ssl_initialization_error,                                 \
+                   ERROR_BUFFER_LENGTH,                                            \
+                   "Error locating CRYPTO procedure %s: %s",                       \
+                   #name,                                                          \
+                   errorBuffer);                                                   \
+    _amps_crypto_library_handle = 0;                                               \
+    return -1;                                                                     \
   }
-#define LOAD_AMPS_SSLEAY_FUNCTION(name)                                         \
-  *((FARPROC*)&_amps_##name) = GetProcAddress(_amps_ssl_ssleay_handle,#name);   \
-  if(!_amps_##name)                                                             \
-  {                                                                             \
-    _amps_get_last_error(errorBuffer, ERROR_BUFFER_LENGTH);                   \
-    _AMPS_SNPRINTF(_amps_ssl_initialization_error,                            \
-                   ERROR_BUFFER_LENGTH,                                       \
-                   "Error locating SSL procedure %s: %s",                     \
-                   #name,                                                     \
-                   errorBuffer);                                              \
-    return -1;                                                                \
+#define LOAD_AMPS_SSLEAY_FUNCTION(name)                                            \
+  *((FARPROC*)&_amps_##name) = GetProcAddress(_amps_ssl_library_handle,#name);     \
+  if(!_amps_##name)                                                                \
+  {                                                                                \
+    _amps_get_last_error(errorBuffer, ERROR_BUFFER_LENGTH);                        \
+    _AMPS_SNPRINTF(_amps_ssl_initialization_error,                                 \
+                   ERROR_BUFFER_LENGTH,                                            \
+                   "Error locating SSL procedure %s: %s",                          \
+                   #name,                                                          \
+                   errorBuffer);                                                   \
+    _amps_ssl_library_handle = 0;                                                  \
+    return -1;                                                                     \
   }
-#define LOAD_AMPS_LIBEAY_FUNCTION_OPTIONAL(name)                                \
-  *((FARPROC*)&_amps_##name) = GetProcAddress(_amps_ssl_libeay_handle,#name);
+#define LOAD_AMPS_LIBEAY_FUNCTION_OPTIONAL(name)                                   \
+  *((FARPROC*)&_amps_##name) = GetProcAddress(_amps_crypto_library_handle,#name);
 
-#define LOAD_AMPS_SSLEAY_FUNCTION_OPTIONAL(name)                                \
-  *((FARPROC*)&_amps_##name) = GetProcAddress(_amps_ssl_ssleay_handle,#name);
+#define LOAD_AMPS_SSLEAY_FUNCTION_OPTIONAL(name)                                   \
+  *((FARPROC*)&_amps_##name) = GetProcAddress(_amps_ssl_library_handle,#name);
 
 int _amps_ssl_load(const char* dllPath_)
 {
@@ -154,11 +156,10 @@ int _amps_ssl_load(const char* dllPath_)
     /* attempt to locate via GetModuleHandle since it
      *  may already be loaded
      */
-    _amps_ssl_ssleay_handle = (HMODULE) GetModuleHandle(dllPath_);
-    if (!_amps_ssl_ssleay_handle)
+    if (!GetModuleHandleExA(0, dllPath_, &_amps_ssl_library_handle))
     {
-      _amps_ssl_ssleay_handle = (HMODULE) LoadLibraryExA(dllPath_, NULL, LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR | LOAD_LIBRARY_SEARCH_DEFAULT_DIRS);
-      if (!_amps_ssl_ssleay_handle)
+      _amps_ssl_library_handle = (HMODULE) LoadLibraryExA(dllPath_, NULL, LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR | LOAD_LIBRARY_SEARCH_DEFAULT_DIRS);
+      if (!_amps_ssl_library_handle)
       {
         _amps_get_last_error(errorBuffer, ERROR_BUFFER_LENGTH);
         _AMPS_SNPRINTF(_amps_ssl_initialization_error, ERROR_BUFFER_LENGTH,
@@ -175,27 +176,39 @@ int _amps_ssl_load(const char* dllPath_)
      *       specify a ssleay32.dll path or at least filename,
      *       we won't default to looking around ourselves.
      */
-    _amps_ssl_ssleay_handle = LoadLibrary("ssleay32.dll");
-    if (!_amps_ssl_ssleay_handle)
+    _amps_ssl_library_handle = LoadLibrary("libssl-3.dll");
+    if (!_amps_ssl_library_handle)
     {
-      _amps_ssl_ssleay_handle = LoadLibrary("libssl-1_1-x64.dll");
+      _amps_ssl_library_handle = LoadLibrary("libssl-1_1.dll");
     }
-    if (!_amps_ssl_ssleay_handle)
+    if (!_amps_ssl_library_handle)
     {
-      _amps_ssl_ssleay_handle = LoadLibrary("libssl-1_1-x86.dll");
+      _amps_ssl_library_handle = LoadLibrary("libssl-1_1-x64.dll");
     }
-#else
-    _amps_ssl_ssleay_handle = GetModuleHandle("ssleay32.dll");
-    if (!_amps_ssl_ssleay_handle)
+    if (!_amps_ssl_library_handle)
+    {
+      _amps_ssl_library_handle = LoadLibrary("libssl-1_1-x86.dll");
+    }
+    if (!_amps_ssl_library_handle)
     {
-      _amps_ssl_ssleay_handle = GetModuleHandle("libssl-1_1-x64.dll");
+      _amps_ssl_library_handle = LoadLibrary("ssleay32.dll");
     }
-    if (!_amps_ssl_ssleay_handle)
+#else
+    if (!GetModuleHandleExA(0, "libssl-3.dll", &_amps_ssl_library_handle))
     {
-      _amps_ssl_ssleay_handle = GetModuleHandle("libssl-1_1-x86.dll");
+      if (!GetModuleHandleExA(0, "libssl-1_1.dll", &_amps_ssl_library_handle))
+      {
+        if (!GetModuleHandleExA(0, "libssl-1_1-x64.dll", &_amps_ssl_library_handle))
+        {
+          if (!GetModuleHandleExA(0, "libssl-1_1-x86.dll", &_amps_ssl_library_handle))
+          {
+            GetModuleHandleExA(0, "ssleay32.dll", &_amps_ssl_library_handle);
+          }
+        }
+      }
     }
 #endif
-    if (!_amps_ssl_ssleay_handle)
+    if (!_amps_ssl_library_handle)
     {
       _AMPS_SNPRINTF(_amps_ssl_initialization_error, ERROR_BUFFER_LENGTH,
                      "AMPS ssl_init() must be called with the path to " \
@@ -205,24 +218,29 @@ int _amps_ssl_load(const char* dllPath_)
     }
   }
 
-  /* Should have been loaded by ssleay32.dll loading if necessary */
-  _amps_ssl_libeay_handle = GetModuleHandle("libeay32.dll");
-  if (!_amps_ssl_libeay_handle)
-  {
-    _amps_ssl_libeay_handle = GetModuleHandle("libcrypto-1_1-x64.dll");
-  }
-
-  if (!_amps_ssl_libeay_handle)
-  {
-    _amps_ssl_libeay_handle = GetModuleHandle("libcrypto-1_1-x86.dll");
-  }
-
-  if (!_amps_ssl_libeay_handle)
+  if (!_amps_crypto_library_handle)
   {
-    _AMPS_SNPRINTF(_amps_ssl_initialization_error, ERROR_BUFFER_LENGTH,
-                   "The OpenSSL modules libeay32.dll, libcrypto-1_1-x64.dll, libcrypto-1_1-x86.dll"
-                   " were not loaded.");
-    return -1;
+    /* Should have been loaded by ssleay32.dll loading if necessary */
+    if (!GetModuleHandleExA(0, "libcrypto-3.dll", &_amps_crypto_library_handle))
+    {
+      if (!GetModuleHandleExA(0, "libcrypto-1_1.dll", &_amps_crypto_library_handle))
+      {
+        if (!GetModuleHandleExA(0, "libcrypto-1_1-x64.dll", &_amps_crypto_library_handle))
+        {
+          if (!GetModuleHandleExA(0, "libcrypto-1_1-x86.dll", &_amps_crypto_library_handle))
+          {
+            if (!GetModuleHandleExA(0, "libeay32.dll", &_amps_crypto_library_handle))
+            {
+              _AMPS_SNPRINTF(_amps_ssl_initialization_error, ERROR_BUFFER_LENGTH,
+                             "The OpenSSL modules libeay32.dll, "
+                             "libcrypto-1_1.dll, libcrypto-1_1-x64.dll were "
+                             "libcrypto-1_1-x86.dll not loaded.");
+              return -1;
+            }
+          }
+        }
+      }
+    }
   }
 
   LOAD_AMPS_SSLEAY_FUNCTION_OPTIONAL(SSL_library_init);
@@ -259,18 +277,19 @@ void*          _amps_ssl_library_handle = 0;
 void*          _amps_crypto_library_handle = 0;
 
 #define AMPS_strcpy(x, y, z) strcpy(x, z)
-#define LOAD_AMPS_SSL_FUNCTION_OPTIONAL(name)           \
+#define LOAD_AMPS_SSL_FUNCTION_OPTIONAL(name)                \
   _amps_##name = dlsym(_amps_ssl_library_handle,#name);
 
-#define LOAD_AMPS_SSL_FUNCTION(name)                    \
-  _amps_##name = dlsym(_amps_ssl_library_handle,#name); \
-  if(!_amps_##name)                                     \
-  {                                                     \
-    _AMPS_SNPRINTF(_amps_ssl_initialization_error,    \
-                   ERROR_BUFFER_LENGTH,               \
-                   "Error loading SSL module: %s",    \
-                   dlerror());                        \
-    return -1;                                        \
+#define LOAD_AMPS_SSL_FUNCTION(name)                         \
+  _amps_##name = dlsym(_amps_ssl_library_handle,#name);      \
+  if(!_amps_##name)                                          \
+  {                                                          \
+    _AMPS_SNPRINTF(_amps_ssl_initialization_error,           \
+                   ERROR_BUFFER_LENGTH,                      \
+                   "Error loading SSL module: %s",           \
+                   dlerror());                               \
+    _amps_ssl_library_handle = 0;                            \
+    return -1;                                               \
   }
 
 #define LOAD_AMPS_CRYPTO_FUNCTION_OPTIONAL(name)             \
@@ -292,12 +311,17 @@ void*          _amps_crypto_library_handle = 0;
                    ERROR_BUFFER_LENGTH,                      \
                    "Error loading CRYPTO module: %s",        \
                    dlerror());                               \
+    _amps_crypto_library_handle = 0;                         \
     return -1;                                               \
   }
 
 int _amps_ssl_load(const char* dllPath_)
 {
   _amps_ssl_initialization_error[0] = '\0';
+  if (_amps_ssl_library_handle && _amps_crypto_library_handle)
+  {
+    return 0;
+  }
   if (dllPath_)
   {
     _amps_ssl_library_handle = dlopen(dllPath_, RTLD_LOCAL | RTLD_LAZY);
@@ -330,11 +354,19 @@ int _amps_ssl_load(const char* dllPath_)
       memcpy(cryptoPath + offset + 6, ssl + 3, dllPathLen - offset - 3);
       cryptoPath[dllPathLen + 3] = '\0';
       _amps_crypto_library_handle = dlopen(cryptoPath, RTLD_LOCAL | RTLD_LAZY);
-      free(cryptoPath);
       if (!_amps_crypto_library_handle)
       {
-        _amps_crypto_library_handle = AMPS_RTLD_DEFAULT;
+        // If it's a python module, use it for both
+        if (strstr(dllPath_, "python"))
+        {
+          _amps_crypto_library_handle = _amps_ssl_library_handle;
+        }
+        else
+        {
+          _amps_crypto_library_handle = AMPS_RTLD_DEFAULT;
+        }
       }
+      free(cryptoPath);
     }
   }
   else
@@ -510,6 +542,25 @@ AMPSDLL int amps_ssl_init(const char* dllPath_)
   return 0;
 }
 
+AMPSDLL int amps_ssl_init_from_context(void* context_, const char* fileName_)
+{
+  if (_amps_ssl_load(NULL) != 0)
+  {
+    if (!fileName_ || _amps_ssl_load(fileName_))
+    {
+      return -1;
+    }
+  }
+  _amps_ssl_ctx = (_amps_SSL_CTX*)context_;
+
+#ifndef _WIN32
+  /* No SIGPIPE */
+  signal(SIGPIPE, SIG_IGN);
+#endif
+
+  return 0;
+}
+
 AMPSDLL const char* amps_ssl_get_error(void)
 {
   return _amps_ssl_initialization_error;

{amps-python-client-5.3.4.3 → amps-python-client-5.3.4.4}/src/cpp/src/tcp.c

@@ -755,7 +755,7 @@ amps_result amps_tcp_connect(amps_handle transport, const amps_char* address)
   {
     /* this is a reconnect */
     shutdown(fd, SHUT_RDWR);
-    closesocket(fd);
+    AMPS_CLOSESOCKET(fd);
     fd = AMPS_INVALID_SOCKET;
   }
   AMPS_JOIN(me->thread);
@@ -966,7 +966,7 @@ error:
     if (fd != AMPS_INVALID_SOCKET)
     {
       shutdown(fd, SHUT_RDWR);
-      closesocket(fd);
+      AMPS_CLOSESOCKET(fd);
     }
 #ifdef _WIN32
     me->thread = 0;
@@ -1031,7 +1031,7 @@ void amps_tcp_close(amps_handle transport)
 #endif
   if (fd != AMPS_INVALID_SOCKET)
   {
-    closesocket(fd);
+    AMPS_CLOSESOCKET(fd);
   }
   AMPS_UNLOCK(&me->lock);
 #ifndef _WIN32
@@ -1064,7 +1064,7 @@ void amps_tcp_destroy(amps_handle transport)
 #endif
   if (fd != AMPS_INVALID_SOCKET)
   {
-    closesocket(fd);
+    AMPS_CLOSESOCKET(fd);
   }
 
   AMPS_UNLOCK(&me->lock);
@@ -1093,7 +1093,7 @@ amps_result amps_tcp_handle_disconnect(
   if (fd != AMPS_INVALID_SOCKET)
   {
     shutdown(fd, SHUT_RDWR);
-    closesocket(fd);
+    AMPS_CLOSESOCKET(fd);
   }
 
   /* first let waiters know that we've failed. */