[sr-dev] git:5.7:8cc9ec41: tls: disable tls_rand for openssl >= 3.0

Module: kamailio Branch: 5.7 Commit: 8cc9ec410ff359e3d93e994c210977a8baa578c4 URL: https://github.com/kamailio/kamailio/commit/8cc9ec410ff359e3d93e994c210977a… Author: Victor Seva &lt;linuxmaniac(a)torreviejawireless.org&gt; Committer: Victor Seva &lt;linuxmaniac(a)torreviejawireless.org&gt; Date: 2023-06-21T12:10:59+02:00 tls: disable tls_rand for openssl >= 3.0 From https://www.openssl.org/docs/man3.0/man3/RAND_set_rand_method.html (cherry picked from commit c4b04696a6bfe31fdd65fa56529b0d46f2774067) --- Modified: src/modules/tls/tls_mod.c Modified: src/modules/tls/tls_rand.c Modified: src/modules/tls/tls_rand.h --- Diff: https://github.com/kamailio/kamailio/commit/8cc9ec410ff359e3d93e994c210977a… Patch: https://github.com/kamailio/kamailio/commit/8cc9ec410ff359e3d93e994c210977a… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index a0f90c11064..e57a98c052d 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -506,7 +506,8 @@ static void mod_destroy(void) int ksr_rand_engine_param(modparam_t type, void* val) { -#if OPENSSL_VERSION_NUMBER >= 0x10100000L +#if OPENSSL_VERSION_NUMBER >= 0x10100000L \ + && OPENSSL_VERSION_NUMBER < 0x030000000L str *reng; if(val==NULL) { @@ -674,7 +675,8 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) register_tls_hooks(&tls_h); -#if OPENSSL_VERSION_NUMBER >= 0x10100000L +#if OPENSSL_VERSION_NUMBER >= 0x10100000L \ + && OPENSSL_VERSION_NUMBER < 0x030000000L LM_DBG("setting cryptorand random engine\n"); RAND_set_rand_method(RAND_ksr_cryptorand_method()); #endif diff --git a/src/modules/tls/tls_rand.c b/src/modules/tls/tls_rand.c index 2cdb2ec0efe..260cd7ddbb9 100644 --- a/src/modules/tls/tls_rand.c +++ b/src/modules/tls/tls_rand.c @@ -29,7 +29,8 @@ #include "tls_rand.h" -#if OPENSSL_VERSION_NUMBER >= 0x10100000L +#if OPENSSL_VERSION_NUMBER >= 0x10100000L \ + && OPENSSL_VERSION_NUMBER < 0x030000000L #include "../../core/dprint.h" #include "../../core/locking.h" diff --git a/src/modules/tls/tls_rand.h b/src/modules/tls/tls_rand.h index 34d6b2d1ff2..58ddc853acd 100644 --- a/src/modules/tls/tls_rand.h +++ b/src/modules/tls/tls_rand.h @@ -21,7 +21,8 @@ #define _TLS_RAND_H_ #include <openssl/ssl.h> -#if OPENSSL_VERSION_NUMBER >= 0x10100000L +#if OPENSSL_VERSION_NUMBER >= 0x10100000L \ + && OPENSSL_VERSION_NUMBER < 0x030000000L #include <openssl/rand.h>