File 0710-crypto-Fix-unused-function-warning.patch of Package erlang

From 0f98bab626ecd98447dc23cce63ca9503d34edba Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Tue, 3 Nov 2020 10:35:27 +0100
Subject: [PATCH 07/11] crypto: Fix unused function warning

---
 lib/crypto/c_src/crypto_callback.c | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/lib/crypto/c_src/crypto_callback.c b/lib/crypto/c_src/crypto_callback.c
index 0244952a65..53b4bbf1e0 100644
--- a/lib/crypto/c_src/crypto_callback.c
+++ b/lib/crypto/c_src/crypto_callback.c
@@ -106,9 +106,8 @@ static void crypto_free(void* ptr CCB_FILE_LINE_ARGS)
 
 
 #ifdef OPENSSL_THREADS /* vvvvvvvvvvvvvvv OPENSSL_THREADS vvvvvvvvvvvvvvvv */
-#if OPENSSL_VERSION_NUMBER < 0x10100000
+#if OPENSSL_VERSION_NUMBER < PACKED_OPENSSL_VERSION_PLAIN(1,1,0)
 static ErlNifRWLock** lock_vec = NULL; /* Static locks used by openssl */
-#endif
 
 #include <openssl/crypto.h>
 
@@ -132,8 +131,6 @@ static INLINE void locking(int mode, ErlNifRWLock* lock)
     }
 }
 
-#if OPENSSL_VERSION_NUMBER < PACKED_OPENSSL_VERSION_PLAIN(1,1,0)
-
 /* TODO: there should be an enif_atomic32_add_return() */
 
 typedef int (*add_lock_function_t)(int *var, int incr, int type, const char *file, int line);
@@ -192,21 +189,18 @@ DLLEXPORT struct crypto_callbacks* get_crypto_callbacks(int nlocks)
 	&crypto_realloc,
 	&crypto_free,
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000
-#ifdef OPENSSL_THREADS
+#if defined OPENSSL_THREADS && OPENSSL_VERSION_NUMBER < PACKED_OPENSSL_VERSION_PLAIN(1,1,0)
 	NULL, /* add_lock_function, filled in below */
 	&locking_function,
 	&id_function,
 	&dyn_create_function,
 	&dyn_lock_function,
 	&dyn_destroy_function
-#endif /* OPENSSL_THREADS */
-#endif
+#endif /* OPENSSL_THREADS && PACKED_OPENSSL_VERSION_PLAIN(1,1,0) */
     };
 
     if (!is_initialized) {
-#if OPENSSL_VERSION_NUMBER < 0x10100000
-#ifdef OPENSSL_THREADS
+#if defined OPENSSL_THREADS && OPENSSL_VERSION_NUMBER < PACKED_OPENSSL_VERSION_PLAIN(1,1,0)
 	the_struct.add_lock_function = get_add_lock_function();
 	if (nlocks > 0) {
 	    int i;
@@ -223,18 +217,15 @@ DLLEXPORT struct crypto_callbacks* get_crypto_callbacks(int nlocks)
                     goto err;
 	    }
 	}
-#endif
-#endif
+#endif /* OPENSSL_THREADS && PACKED_OPENSSL_VERSION_PLAIN(1,1,0) */
 	is_initialized = 1;
     }
     return &the_struct;
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000
-#ifdef OPENSSL_THREADS
+#if defined OPENSSL_THREADS && OPENSSL_VERSION_NUMBER < PACKED_OPENSSL_VERSION_PLAIN(1,1,0)
  err:
     return NULL;
 #endif
-#endif
 }
 
 #ifdef HAVE_DYNAMIC_CRYPTO_LIB
-- 
2.26.2

openSUSE Build Service is sponsored by