Oops, GetLastError returns a DWORD

apache · Nov 6, 2023 · c3750c5 · c3750c5
1 parent 191851b
commit c3750c5
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 7 deletions.
diff --git a/src/main/native/org/apache/commons/crypto/OpenSslInfoNative.c b/src/main/native/org/apache/commons/crypto/OpenSslInfoNative.c
@@ -78,8 +78,14 @@ static int load_library(JNIEnv *env)
 
   if (!openssl) {
     char msg[1000];
+#ifdef UNIX
     snprintf(msg, sizeof(msg), "Cannot load %s (%s)!", COMMONS_CRYPTO_OPENSSL_LIBRARY,  \
-    GET_LAST_ERROR);
+    dlerror()); // returns char*
+#endif
+#ifdef WINDOWS
+    snprintf(msg, sizeof(msg), "Cannot load %s (%d)!", COMMONS_CRYPTO_OPENSSL_LIBRARY,  \
+    GetLastError()); // returns DWORD
+#endif
     THROW(env, "java/lang/UnsatisfiedLinkError", msg);
     return 0;
   }

diff --git a/src/main/native/org/apache/commons/crypto/cipher/OpenSslNative.c b/src/main/native/org/apache/commons/crypto/cipher/OpenSslNative.c
@@ -130,8 +130,14 @@ JNIEXPORT void JNICALL Java_org_apache_commons_crypto_cipher_OpenSslNative_initI
 
   if (!openssl) {
     char msg[1000];
+#ifdef UNIX
     snprintf(msg, sizeof(msg), "Cannot load %s (%s)!", COMMONS_CRYPTO_OPENSSL_LIBRARY,  \
-    GET_LAST_ERROR);
+    dlerror()); // returns char*
+#endif
+#ifdef WINDOWS
+    snprintf(msg, sizeof(msg), "Cannot load %s (%d)!", COMMONS_CRYPTO_OPENSSL_LIBRARY,  \
+    GetLastError()); // returns DWORD
+#endif
     THROW(env, "java/lang/UnsatisfiedLinkError", msg);
     return;
   }

diff --git a/src/main/native/org/apache/commons/crypto/org_apache_commons_crypto.h b/src/main/native/org/apache/commons/crypto/org_apache_commons_crypto.h
@@ -147,8 +147,7 @@ void *do_dlsym_fallback(JNIEnv *env, void *handle, const char *symbol, const cha
   if ((func_ptr = do_dlsym_fallback(env, handle, symbol, fallback)) == NULL) { \
     return; \
   }
-// Macro to hide different method names
-#define GET_LAST_ERROR dlerror()
+
 #endif
 // Unix part end
 
@@ -257,8 +256,7 @@ static FARPROC WINAPI do_dlsym_fallback(JNIEnv *env, HMODULE handle, LPCSTR symb
   }
   return func_ptr;
 }
-// Macro to hide different method names
-#define GET_LAST_ERROR GetLastError()
+
 #endif
 // Windows part end
 

diff --git a/src/main/native/org/apache/commons/crypto/random/OpenSslCryptoRandomNative.c b/src/main/native/org/apache/commons/crypto/random/OpenSslCryptoRandomNative.c
@@ -104,7 +104,14 @@ JNIEXPORT void JNICALL Java_org_apache_commons_crypto_random_OpenSslCryptoRandom
 
   if (!openssl) {
     char msg[1000];
-    snprintf(msg, sizeof(msg), "Cannot load %s (%s)!", COMMONS_CRYPTO_OPENSSL_LIBRARY, GET_LAST_ERROR);
+#ifdef UNIX
+    snprintf(msg, sizeof(msg), "Cannot load %s (%s)!", COMMONS_CRYPTO_OPENSSL_LIBRARY,  \
+    dlerror()); // returns char*
+#endif
+#ifdef WINDOWS
+    snprintf(msg, sizeof(msg), "Cannot load %s (%d)!", COMMONS_CRYPTO_OPENSSL_LIBRARY,  \
+    GetLastError()); // returns DWORD
+#endif
     THROW(env, "java/lang/UnsatisfiedLinkError", msg);
     return;
   }