Re: Build libssh against openssl 1.1.0

[Andreas Schneider <asn@xxxxxxxxxxxxxx>]

On Saturday, 5 November 2016 17:02:13 CET Andreas Schneider wrote:
> On Wednesday, 2 November 2016 17:58:01 CET Jakub Jelen wrote:
> > Andreas,
> > thank you for the comments. I reworked the patch (attached) to smaller
> > parts that finally build and passes the testsuite in master for both
> > OpenSSL versions (sorry for the first bad version). It also improves the
> > readability of some constructions according to your hints.
> 
> Thank you very much. I split up one patch which didn't have your sign off.
> The patchset is attached. I need your ok to add your sign-off and push it.
> 

And please also check the attached patch.


Thanks.

-- 
Andreas Schneider                   GPG-ID: CC014E3D
www.cryptomilk.org                asn@xxxxxxxxxxxxxx

From 7317e288e9b5a59e480953b55cdb4e21d7eb5602 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@xxxxxxxxxxxxxx>
Date: Sun, 6 Nov 2016 12:07:32 +0100
Subject: [PATCH] threads: Use new API call with OpenSSL 1.1.0

Signed-off-by: Andreas Schneider <asn@xxxxxxxxxxxxxx>
---
 src/threads.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/threads.c b/src/threads.c
index 7f3a304..651cfdf 100644
--- a/src/threads.c
+++ b/src/threads.c
@@ -127,8 +127,14 @@ static int libcrypto_thread_init(void){
 	for (i=0;i<n;++i){
 		user_callbacks->mutex_init(&libcrypto_mutexes[i]);
 	}
-  CRYPTO_set_id_callback(user_callbacks->thread_id);
-	CRYPTO_set_locking_callback(libcrypto_lock_callback);
+
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+    CRYPTO_THREADID_set_callback(user_callbacks->thread_id);
+#else
+    CRYPTO_set_id_callback(user_callbacks->thread_id);
+#endif
+
+    CRYPTO_set_locking_callback(libcrypto_lock_callback);
 
 	return SSH_OK;
 }
-- 
2.10.1