Attachment #518536 for bug #646952

View | Details | Raw Unified | Return to bug 646952
Collapse All | Expand All

Lines 122-128 _init_threadid_callback(void) Link Here

(-)a/lib/compat/openssl_support.c (-1 / +8 lines)
122	CRYPTO_set_id_callback(_ssl_thread_id);	122	CRYPTO_set_id_callback(_ssl_thread_id);
123	}	123	}
124		124
125	#else	125	#elif OPENSSL_VERSION_NUMBER < 0x10100000L
126		126
127	static void	127	static void
128	_ssl_thread_id2(CRYPTO_THREADID *id)	128	_ssl_thread_id2(CRYPTO_THREADID *id)
Lines 136-141 _init_threadid_callback(void) Link Here
136	CRYPTO_THREADID_set_callback(_ssl_thread_id2);	136	CRYPTO_THREADID_set_callback(_ssl_thread_id2);
137	}	137	}
138		138
		139	#else
		140
		141	static void
		142	_init_threadid_callback(void)
		143	{
		144	}
		145
139	#endif	146	#endif
140		147
141	void	148	void

Lines 477-483 _load_dh_fallback(void) Link Here

(-)a/lib/tlscontext.c (-1 / +1 lines)
477	BIGNUM *g = NULL;	477	BIGNUM *g = NULL;
478	BN_dec2bn(&g, "2");	478	BN_dec2bn(&g, "2");
479		479
480	if (!DH_set0_pqg(dh, get_rfc3526_prime_2048(NULL), NULL, g))	480	if (!DH_set0_pqg(dh, BN_get_rfc3526_prime_2048(NULL), NULL, g))
481	{	481	{
482	BN_free(g);	482	BN_free(g);
483	DH_free(dh);	483	DH_free(dh);

Return to bug 646952