[patch] With this patch build with openssl-1.1

virtualgl-openssl-1.1.patch (text/plain), 1.44 KB, created by alexandrl on 2018-12-30 09:05:39 UTC

diff -urN VirtualGL-2.5.2.origin/include/Socket.h VirtualGL-2.5.2/include/Socket.h
--- VirtualGL-2.5.2.origin/include/Socket.h	2017-03-03 01:13:45.000000000 +0200
+++ VirtualGL-2.5.2/include/Socket.h	2018-12-30 10:51:40.756173239 +0200
@@ -160,15 +160,19 @@
 
 			#ifdef USESSL
 
+			#if OPENSSL_VERSION_NUMBER < 0x10100000L
 			static void lockingCallback(int mode, int type, const char *file,
 				int line)
 			{
 				if(mode&CRYPTO_LOCK) cryptoLock[type].lock();
 				else cryptoLock[type].unlock();
 			}
+			#endif
 
 			static bool sslInit;
+			#if OPENSSL_VERSION_NUMBER < 0x10100000L
 			static CriticalSection cryptoLock[CRYPTO_NUM_LOCKS];
+			#endif
 			bool doSSL;  SSL_CTX *sslctx;  SSL *ssl;
 
 			#endif
diff -urN VirtualGL-2.5.2.origin/util/Socket.cpp VirtualGL-2.5.2/util/Socket.cpp
--- VirtualGL-2.5.2.origin/util/Socket.cpp	2017-03-03 01:13:45.000000000 +0200
+++ VirtualGL-2.5.2/util/Socket.cpp	2018-12-30 10:55:20.606323853 +0200
@@ -43,8 +43,10 @@
 
 #ifdef USESSL
 bool Socket::sslInit=false;
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
 CriticalSection Socket::cryptoLock[CRYPTO_NUM_LOCKS];
 #endif
+#endif
 CriticalSection Socket::mutex;
 int Socket::instanceCount=0;
 
@@ -160,7 +162,9 @@
 		SSL_load_error_strings();
 		ERR_load_crypto_strings();
 		CRYPTO_set_id_callback(Thread::threadID);
+		#if OPENSSL_VERSION_NUMBER < 0x10100000L
 		CRYPTO_set_locking_callback(lockingCallback);
+		#endif
 		SSL_library_init();
 		sslInit=true;
 		char *env=NULL;