Skip to content

Commit 38e3d9a

Browse files
committed
addressed concerns
1 parent a30640c commit 38e3d9a

File tree

1 file changed

+13
-11
lines changed
  • hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto

1 file changed

+13
-11
lines changed

hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto/OpensslCipher.c

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -213,22 +213,24 @@ JNIEXPORT void JNICALL Java_org_apache_hadoop_crypto_OpensslCipher_initIDs
213213
"EVP_CIPHER_CTX_set_padding");
214214
LOAD_DYNAMIC_SYMBOL(dlsym_EVP_CIPHER_CTX_test_flags, env, openssl, \
215215
"EVP_CIPHER_CTX_test_flags");
216-
// name changed in OpenSSL 3 ABI - see History section in EVP_EncryptInit(3)
216+
217+
// names changed in OpenSSL 3 ABI - see History section in EVP_EncryptInit(3)
217218
#if OPENSSL_VERSION_NUMBER >= 0x30000000L
218-
LOAD_DYNAMIC_SYMBOL(dlsym_EVP_CIPHER_CTX_block_size, env, openssl, \
219-
"EVP_CIPHER_CTX_get_block_size");
219+
#define EVP_CIPHER_CTX_block_size "EVP_CIPHER_CTX_get_block_size"
220+
#define EVP_CIPHER_CTX_encrypting "EVP_CIPHER_CTX_is_encrypting"
220221
#else
222+
#define EVP_CIPHER_CTX_block_size "EVP_CIPHER_CTX_block_size"
223+
#define EVP_CIPHER_CTX_encrypting "EVP_CIPHER_CTX_encrypting"
224+
#endif /* OPENSSL_VERSION_NUMBER >= 0x30000000L */
225+
221226
LOAD_DYNAMIC_SYMBOL(dlsym_EVP_CIPHER_CTX_block_size, env, openssl, \
222-
"EVP_CIPHER_CTX_block_size");
223-
#endif
224-
// name changed in OpenSSL 3 ABI - see History section in EVP_EncryptInit(3)
225-
#if OPENSSL_VERSION_NUMBER >= 0x30000000L
226-
LOAD_DYNAMIC_SYMBOL(dlsym_EVP_CIPHER_CTX_encrypting, env, openssl, \
227-
"EVP_CIPHER_CTX_is_encrypting");
228-
#elif OPENSSL_VERSION_NUMBER >= 0x10100000L
227+
EVP_CIPHER_CTX_block_size);
228+
229+
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
229230
LOAD_DYNAMIC_SYMBOL(dlsym_EVP_CIPHER_CTX_encrypting, env, openssl, \
230-
"EVP_CIPHER_CTX_encrypting");
231+
EVP_CIPHER_CTX_encrypting);
231232
#endif
233+
232234
LOAD_DYNAMIC_SYMBOL(dlsym_EVP_CipherInit_ex, env, openssl, \
233235
"EVP_CipherInit_ex");
234236
LOAD_DYNAMIC_SYMBOL(dlsym_EVP_CipherUpdate, env, openssl, \

0 commit comments

Comments
 (0)