Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 673988 | Differences between
and this patch

Collapse All | Expand All

(-)VirtualGL-2.5.2.origin/include/Socket.h (+4 lines)
Lines 160-174 Link Here
160
160
161
			#ifdef USESSL
161
			#ifdef USESSL
162
162
163
			#if OPENSSL_VERSION_NUMBER < 0x10100000L
163
			static void lockingCallback(int mode, int type, const char *file,
164
			static void lockingCallback(int mode, int type, const char *file,
164
				int line)
165
				int line)
165
			{
166
			{
166
				if(mode&CRYPTO_LOCK) cryptoLock[type].lock();
167
				if(mode&CRYPTO_LOCK) cryptoLock[type].lock();
167
				else cryptoLock[type].unlock();
168
				else cryptoLock[type].unlock();
168
			}
169
			}
170
			#endif
169
171
170
			static bool sslInit;
172
			static bool sslInit;
173
			#if OPENSSL_VERSION_NUMBER < 0x10100000L
171
			static CriticalSection cryptoLock[CRYPTO_NUM_LOCKS];
174
			static CriticalSection cryptoLock[CRYPTO_NUM_LOCKS];
175
			#endif
172
			bool doSSL;  SSL_CTX *sslctx;  SSL *ssl;
176
			bool doSSL;  SSL_CTX *sslctx;  SSL *ssl;
173
177
174
			#endif
178
			#endif
(-)VirtualGL-2.5.2.origin/util/Socket.cpp (+4 lines)
Lines 43-50 Link Here
43
43
44
#ifdef USESSL
44
#ifdef USESSL
45
bool Socket::sslInit=false;
45
bool Socket::sslInit=false;
46
#if OPENSSL_VERSION_NUMBER < 0x10100000L
46
CriticalSection Socket::cryptoLock[CRYPTO_NUM_LOCKS];
47
CriticalSection Socket::cryptoLock[CRYPTO_NUM_LOCKS];
47
#endif
48
#endif
49
#endif
48
CriticalSection Socket::mutex;
50
CriticalSection Socket::mutex;
49
int Socket::instanceCount=0;
51
int Socket::instanceCount=0;
50
52
Lines 160-166 Link Here
160
		SSL_load_error_strings();
162
		SSL_load_error_strings();
161
		ERR_load_crypto_strings();
163
		ERR_load_crypto_strings();
162
		CRYPTO_set_id_callback(Thread::threadID);
164
		CRYPTO_set_id_callback(Thread::threadID);
165
		#if OPENSSL_VERSION_NUMBER < 0x10100000L
163
		CRYPTO_set_locking_callback(lockingCallback);
166
		CRYPTO_set_locking_callback(lockingCallback);
167
		#endif
164
		SSL_library_init();
168
		SSL_library_init();
165
		sslInit=true;
169
		sslInit=true;
166
		char *env=NULL;
170
		char *env=NULL;

Return to bug 673988