| b.liu | e958203 | 2025-04-17 19:18:16 +0800 | [diff] [blame^] | 1 | --- a/lib/crypto/c_src/crypto_callback.c |
| 2 | +++ b/lib/crypto/c_src/crypto_callback.c |
| 3 | @@ -112,6 +112,7 @@ static ErlNifRWLock** lock_vec = NULL; / |
| 4 | |
| 5 | #include <openssl/crypto.h> |
| 6 | |
| 7 | +#if OPENSSL_VERSION_NUMBER < PACKED_OPENSSL_VERSION_PLAIN(1,1,0) |
| 8 | static INLINE void locking(int mode, ErlNifRWLock* lock) |
| 9 | { |
| 10 | switch (mode) { |
| 11 | @@ -132,7 +133,6 @@ static INLINE void locking(int mode, Erl |
| 12 | } |
| 13 | } |
| 14 | |
| 15 | -#if OPENSSL_VERSION_NUMBER < PACKED_OPENSSL_VERSION_PLAIN(1,1,0) |
| 16 | static void locking_function(int mode, int n, const char *file, int line) |
| 17 | { |
| 18 | locking(mode, lock_vec[n]); |
| 19 | --- a/lib/crypto/c_src/engine.c |
| 20 | +++ b/lib/crypto/c_src/engine.c |
| 21 | @@ -244,7 +244,7 @@ ERL_NIF_TERM engine_load_dynamic_nif(Erl |
| 22 | #ifdef HAS_ENGINE_SUPPORT |
| 23 | ASSERT(argc == 0); |
| 24 | |
| 25 | - ENGINE_load_dynamic(); |
| 26 | + ENGINE_load_builtin_engines(); |
| 27 | return atom_ok; |
| 28 | #else |
| 29 | return atom_notsup; |
| 30 | --- a/lib/crypto/c_src/info.c |
| 31 | +++ b/lib/crypto/c_src/info.c |
| 32 | @@ -20,6 +20,11 @@ |
| 33 | |
| 34 | #include "info.h" |
| 35 | |
| 36 | +#if OPENSSL_VERSION_NUMBER < PACKED_OPENSSL_VERSION_PLAIN(1,1,0) |
| 37 | +#define OPENSSL_VERSION SSLEAY_VERSION |
| 38 | +#define OpenSSL_version SSLeay_version |
| 39 | +#endif |
| 40 | + |
| 41 | #ifdef HAVE_DYNAMIC_CRYPTO_LIB |
| 42 | |
| 43 | # if defined(DEBUG) |
| 44 | @@ -77,7 +82,7 @@ ERL_NIF_TERM info_lib(ErlNifEnv *env, in |
| 45 | ASSERT(argc == 0); |
| 46 | |
| 47 | name_sz = strlen(libname); |
| 48 | - ver = SSLeay_version(SSLEAY_VERSION); |
| 49 | + ver = OpenSSL_version(OPENSSL_VERSION); |
| 50 | ver_sz = strlen(ver); |
| 51 | ver_num = OPENSSL_VERSION_NUMBER; |
| 52 | |
| 53 | --- a/lib/crypto/c_src/otp_test_engine.c |
| 54 | +++ b/lib/crypto/c_src/otp_test_engine.c |
| 55 | @@ -100,9 +100,11 @@ static int test_init(ENGINE *e) { |
| 56 | goto err; |
| 57 | #endif /* if defined(FAKE_RSA_IMPL) */ |
| 58 | |
| 59 | +#if OPENSSL_VERSION_NUMBER < PACKED_OPENSSL_VERSION_PLAIN(1,1,0) |
| 60 | /* Load all digest and cipher algorithms. Needed for password protected private keys */ |
| 61 | OpenSSL_add_all_ciphers(); |
| 62 | OpenSSL_add_all_digests(); |
| 63 | +#endif |
| 64 | |
| 65 | return 111; |
| 66 | |