This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch native_simplify
in repository https://gitbox.apache.org/repos/asf/commons-crypto.git
commit 8e613c932bd370ddad75cbe57d5ceb3480458853
Author: Sebb <s...@apache.org>
AuthorDate: Sat Nov 4 13:06:40 2023 +0000
Hide OS variable behaviour in macro define
The Windows macro invocations have an extra type argument,
but the other args are identical.
The Unix macro now ignores the type parameter
This allows the same invocation parameters on Unix and Windows
---
.../org/apache/commons/crypto/OpenSslInfoNative.c | 6 ++---
.../apache/commons/crypto/cipher/OpenSslNative.c | 28 ----------------------
.../commons/crypto/org_apache_commons_crypto.h | 6 +++--
.../crypto/random/OpenSslCryptoRandomNative.c | 22 +----------------
4 files changed, 7 insertions(+), 55 deletions(-)
diff --git a/src/main/native/org/apache/commons/crypto/OpenSslInfoNative.c
b/src/main/native/org/apache/commons/crypto/OpenSslInfoNative.c
index d76550ea..62f41d26 100644
--- a/src/main/native/org/apache/commons/crypto/OpenSslInfoNative.c
+++ b/src/main/native/org/apache/commons/crypto/OpenSslInfoNative.c
@@ -61,16 +61,14 @@ static void get_methods(JNIEnv *env, void *openssl)
static void get_methods(JNIEnv *env, HMODULE openssl)
#endif
{
+ LOAD_DYNAMIC_SYMBOL_FALLBACK(__dlsym_OpenSSL_version_num,
dlsym_OpenSSL_version_num, env, openssl, "OpenSSL_version_num", "SSLeay");
+ LOAD_DYNAMIC_SYMBOL_FALLBACK(__dlsym_OpenSSL_version, dlsym_OpenSSL_version,
env, openssl, "OpenSSL_version", "SSLeay_version");
#ifdef UNIX
- LOAD_DYNAMIC_SYMBOL_FALLBACK(dlsym_OpenSSL_version_num, env, openssl,
"OpenSSL_version_num", "SSLeay");
- LOAD_DYNAMIC_SYMBOL_FALLBACK(dlsym_OpenSSL_version, env, openssl,
"OpenSSL_version", "SSLeay_version");
Dl_info info;
(void) dladdr(dlsym_OpenSSL_version_num, &info); // ignore the return code
strncpy(dynamicLibraryPath, info.dli_fname, sizeof(dynamicLibraryPath) - 1);
// allow for null
#endif
#ifdef WINDOWS
- LOAD_DYNAMIC_SYMBOL_FALLBACK(__dlsym_OpenSSL_version_num,
dlsym_OpenSSL_version_num, env, openssl, "OpenSSL_version_num", "SSLeay");
- LOAD_DYNAMIC_SYMBOL_FALLBACK(__dlsym_OpenSSL_version, dlsym_OpenSSL_version,
env, openssl, "OpenSSL_version", "SSLeay_version");
LPWSTR lpFilename;
WCHAR buffer[80];
lpFilename = buffer;
diff --git a/src/main/native/org/apache/commons/crypto/cipher/OpenSslNative.c
b/src/main/native/org/apache/commons/crypto/cipher/OpenSslNative.c
index b38174eb..814cb2a1 100644
--- a/src/main/native/org/apache/commons/crypto/cipher/OpenSslNative.c
+++ b/src/main/native/org/apache/commons/crypto/cipher/OpenSslNative.c
@@ -109,19 +109,6 @@ static void loadAes(JNIEnv *env, void *openssl)
static void loadAes(JNIEnv *env, HMODULE openssl)
#endif
{
-#ifdef UNIX
- LOAD_DYNAMIC_SYMBOL(dlsym_EVP_aes_256_ctr, env, openssl, "EVP_aes_256_ctr");
- LOAD_DYNAMIC_SYMBOL(dlsym_EVP_aes_192_ctr, env, openssl, "EVP_aes_192_ctr");
- LOAD_DYNAMIC_SYMBOL(dlsym_EVP_aes_128_ctr, env, openssl, "EVP_aes_128_ctr");
- LOAD_DYNAMIC_SYMBOL(dlsym_EVP_aes_256_cbc, env, openssl, "EVP_aes_256_cbc");
- LOAD_DYNAMIC_SYMBOL(dlsym_EVP_aes_192_cbc, env, openssl, "EVP_aes_192_cbc");
- LOAD_DYNAMIC_SYMBOL(dlsym_EVP_aes_128_cbc, env, openssl, "EVP_aes_128_cbc");
- LOAD_DYNAMIC_SYMBOL(dlsym_EVP_aes_256_gcm, env, openssl, "EVP_aes_256_gcm");
- LOAD_DYNAMIC_SYMBOL(dlsym_EVP_aes_192_gcm, env, openssl, "EVP_aes_192_gcm");
- LOAD_DYNAMIC_SYMBOL(dlsym_EVP_aes_128_gcm, env, openssl, "EVP_aes_128_gcm");
-#endif
-
-#ifdef WINDOWS
LOAD_DYNAMIC_SYMBOL(__dlsym_EVP_aes_256_ctr, dlsym_EVP_aes_256_ctr, \
env, openssl, "EVP_aes_256_ctr");
LOAD_DYNAMIC_SYMBOL(__dlsym_EVP_aes_192_ctr, dlsym_EVP_aes_192_ctr, \
@@ -140,7 +127,6 @@ static void loadAes(JNIEnv *env, HMODULE openssl)
env, openssl, "EVP_aes_192_gcm");
LOAD_DYNAMIC_SYMBOL(__dlsym_EVP_aes_128_gcm, dlsym_EVP_aes_128_gcm, \
env, openssl, "EVP_aes_128_gcm");
-#endif
}
JNIEXPORT void JNICALL
Java_org_apache_commons_crypto_cipher_OpenSslNative_initIDs
@@ -170,20 +156,7 @@ JNIEXPORT void JNICALL
Java_org_apache_commons_crypto_cipher_OpenSslNative_initI
#ifdef UNIX
dlerror(); // Clear any existing error
- LOAD_DYNAMIC_SYMBOL(dlsym_EVP_CIPHER_CTX_new, env, openssl,
"EVP_CIPHER_CTX_new");
- LOAD_DYNAMIC_SYMBOL(dlsym_EVP_CIPHER_CTX_free, env, openssl,
"EVP_CIPHER_CTX_free");
- LOAD_DYNAMIC_SYMBOL(dlsym_EVP_CIPHER_CTX_set_padding, env, openssl,
"EVP_CIPHER_CTX_set_padding");
- LOAD_DYNAMIC_SYMBOL(dlsym_EVP_CIPHER_CTX_ctrl, env, openssl,
"EVP_CIPHER_CTX_ctrl");
- LOAD_DYNAMIC_SYMBOL(dlsym_EVP_CIPHER_CTX_block_size, env, openssl,
"EVP_CIPHER_CTX_block_size");
- LOAD_DYNAMIC_SYMBOL(dlsym_EVP_CIPHER_CTX_cipher, env, openssl,
"EVP_CIPHER_CTX_cipher");
- LOAD_DYNAMIC_SYMBOL(dlsym_EVP_CIPHER_flags, env, openssl,
"EVP_CIPHER_flags");
- LOAD_DYNAMIC_SYMBOL(dlsym_EVP_CIPHER_CTX_test_flags, env, openssl,
"EVP_CIPHER_CTX_test_flags");
- LOAD_DYNAMIC_SYMBOL(dlsym_EVP_CipherInit_ex, env, openssl,
"EVP_CipherInit_ex");
- LOAD_DYNAMIC_SYMBOL(dlsym_EVP_CipherUpdate, env, openssl,
"EVP_CipherUpdate");
- LOAD_DYNAMIC_SYMBOL(dlsym_EVP_CipherFinal_ex, env, openssl,
"EVP_CipherFinal_ex");
#endif
-
-#ifdef WINDOWS
LOAD_DYNAMIC_SYMBOL(__dlsym_EVP_CIPHER_CTX_new, dlsym_EVP_CIPHER_CTX_new, \
env, openssl, "EVP_CIPHER_CTX_new");
LOAD_DYNAMIC_SYMBOL(__dlsym_EVP_CIPHER_CTX_free, dlsym_EVP_CIPHER_CTX_free,
\
@@ -206,7 +179,6 @@ JNIEXPORT void JNICALL
Java_org_apache_commons_crypto_cipher_OpenSslNative_initI
env, openssl, "EVP_CipherUpdate");
LOAD_DYNAMIC_SYMBOL(__dlsym_EVP_CipherFinal_ex, dlsym_EVP_CipherFinal_ex, \
env, openssl, "EVP_CipherFinal_ex");
-#endif
loadAes(env, openssl);
jthrowable jthr = (*env)->ExceptionOccurred(env);
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
index 1896bfbc..5c26aa0e 100644
--- 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
@@ -133,13 +133,15 @@ void *do_dlsym_fallback(JNIEnv *env, void *handle, const
char *symbol, const cha
}
/* A helper macro to dlsym the requisite dynamic symbol and bail-out on error.
*/
-#define LOAD_DYNAMIC_SYMBOL(func_ptr, env, handle, symbol) \
+// func_type is currently ignored, so can use same macro invocation as for
Windows
+#define LOAD_DYNAMIC_SYMBOL(_func_type, func_ptr, env, handle, symbol) \
if ((func_ptr = do_dlsym(env, handle, symbol)) == NULL) { \
return; \
}
/* A macro to dlsym the requisite dynamic symbol (with fallback) and bail-out
on error. */
-#define LOAD_DYNAMIC_SYMBOL_FALLBACK(func_ptr, env, handle, symbol, fallback) \
+// func_type is currently ignored, so can use same macro invocation as for
Windows
+#define LOAD_DYNAMIC_SYMBOL_FALLBACK(_func_type, func_ptr, env, handle,
symbol, fallback) \
if ((func_ptr = do_dlsym_fallback(env, handle, symbol, fallback)) == NULL) {
\
return; \
}
diff --git
a/src/main/native/org/apache/commons/crypto/random/OpenSslCryptoRandomNative.c
b/src/main/native/org/apache/commons/crypto/random/OpenSslCryptoRandomNative.c
index 735ffeeb..d6232e07 100644
---
a/src/main/native/org/apache/commons/crypto/random/OpenSslCryptoRandomNative.c
+++
b/src/main/native/org/apache/commons/crypto/random/OpenSslCryptoRandomNative.c
@@ -119,29 +119,10 @@ JNIEXPORT void JNICALL
Java_org_apache_commons_crypto_random_OpenSslCryptoRandom
THROW(env, "java/lang/UnsatisfiedLinkError", msg);
return;
}
+ LOAD_DYNAMIC_SYMBOL_FALLBACK(__dlsym_OpenSSL_version_num,
dlsym_OpenSSL_version_num, env, openssl, "OpenSSL_version_num", "SSLeay");
#ifdef UNIX
- LOAD_DYNAMIC_SYMBOL_FALLBACK(dlsym_OpenSSL_version_num, env, openssl,
"OpenSSL_version_num", "SSLeay");
dlerror(); // Clear any existing error
- LOAD_DYNAMIC_SYMBOL(dlsym_CRYPTO_malloc, env, openssl, "CRYPTO_malloc");
- LOAD_DYNAMIC_SYMBOL(dlsym_CRYPTO_free, env, openssl, "CRYPTO_free");
- LOAD_DYNAMIC_SYMBOL(dlsym_ENGINE_by_id, env, openssl, "ENGINE_by_id");
- LOAD_DYNAMIC_SYMBOL(dlsym_ENGINE_init, env, openssl, "ENGINE_init");
- LOAD_DYNAMIC_SYMBOL(dlsym_ENGINE_set_default, env, openssl,
"ENGINE_set_default");
- LOAD_DYNAMIC_SYMBOL(dlsym_ENGINE_finish, env, openssl, "ENGINE_finish");
- LOAD_DYNAMIC_SYMBOL(dlsym_ENGINE_free, env, openssl, "ENGINE_free");
- LOAD_DYNAMIC_SYMBOL(dlsym_RAND_bytes, env, openssl, "RAND_bytes");
- LOAD_DYNAMIC_SYMBOL(dlsym_ERR_get_error, env, openssl, "ERR_get_error");
- if (dlsym_OpenSSL_version_num() < VERSION_1_1_X) {
- LOAD_DYNAMIC_SYMBOL(dlsym_CRYPTO_num_locks, env, openssl,
"CRYPTO_num_locks");
- LOAD_DYNAMIC_SYMBOL(dlsym_CRYPTO_set_id_callback, env, openssl,
"CRYPTO_set_id_callback");
- LOAD_DYNAMIC_SYMBOL(dlsym_CRYPTO_set_locking_callback, env, openssl,
"CRYPTO_set_locking_callback");
- LOAD_DYNAMIC_SYMBOL(dlsym_ENGINE_load_rdrand, env, openssl,
"ENGINE_load_rdrand");
- LOAD_DYNAMIC_SYMBOL(dlsym_ENGINE_cleanup, env, openssl, "ENGINE_cleanup");
- }
#endif
-
-#ifdef WINDOWS
- LOAD_DYNAMIC_SYMBOL_FALLBACK(__dlsym_OpenSSL_version_num,
dlsym_OpenSSL_version_num, env, openssl, "OpenSSL_version_num", "SSLeay");
LOAD_DYNAMIC_SYMBOL(__dlsym_CRYPTO_malloc, dlsym_CRYPTO_malloc, env,
openssl, "CRYPTO_malloc");
LOAD_DYNAMIC_SYMBOL(__dlsym_CRYPTO_free, dlsym_CRYPTO_free, env, openssl,
"CRYPTO_free");
LOAD_DYNAMIC_SYMBOL(__dlsym_ENGINE_by_id, dlsym_ENGINE_by_id, env, openssl,
"ENGINE_by_id");
@@ -157,7 +138,6 @@ JNIEXPORT void JNICALL
Java_org_apache_commons_crypto_random_OpenSslCryptoRandom
LOAD_DYNAMIC_SYMBOL(__dlsym_ENGINE_load_rdrand, dlsym_ENGINE_load_rdrand,
env, openssl, "ENGINE_load_rdrand");
LOAD_DYNAMIC_SYMBOL(__dlsym_ENGINE_cleanup, dlsym_ENGINE_cleanup, env,
openssl, "ENGINE_cleanup");
}
-#endif
openssl_rand_init();
}
