]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
[core] fix build with newer build tools against openssl 1.1 768/head
authorMike Jerris <mike@signalwire.com>
Mon, 3 Aug 2020 19:29:35 +0000 (15:29 -0400)
committerMike Jerris <mike@signalwire.com>
Mon, 3 Aug 2020 19:29:35 +0000 (15:29 -0400)
src/switch_core_cert.c

index 393baa55a968bb1588a5525518f8c2af840a1e0e..53cf538f765c38a44f18dccb46948c1cde1b9ebf 100644 (file)
@@ -36,6 +36,8 @@ static switch_mutex_t **ssl_mutexes;
 static switch_memory_pool_t *ssl_pool = NULL;
 static int ssl_count = 0;
 
+#if OPENSSL_VERSION_NUMBER <= 0x10100000
+
 static inline void switch_ssl_ssl_lock_callback(int mode, int type, char *file, int line)
 {
        if (mode & CRYPTO_LOCK) {
@@ -51,6 +53,8 @@ static inline void switch_ssl_ssl_thread_id(CRYPTO_THREADID *id)
        CRYPTO_THREADID_set_numeric(id, (unsigned long)switch_thread_self());
 }
 
+#endif
+
 SWITCH_DECLARE(void) switch_ssl_init_ssl_locks(void)
 {
 
@@ -69,8 +73,10 @@ SWITCH_DECLARE(void) switch_ssl_init_ssl_locks(void)
                        switch_assert(ssl_mutexes[i] != NULL);
                }
 
+#if OPENSSL_VERSION_NUMBER <= 0x10100000
                CRYPTO_THREADID_set_callback(switch_ssl_ssl_thread_id);
                CRYPTO_set_locking_callback((void (*)(int, int, const char*, int))switch_ssl_ssl_lock_callback);
+#endif
        }
 
        ssl_count++;