Attachment #414802 for bug #563362

Lines 36-42 Link Here

(-)lib/dns/dst_openssl.h.orig (-1 / +1 lines)
36	#define USE_ENGINE 1	36	#define USE_ENGINE 1
37	#endif	37	#endif
38		38
39	#if OPENSSL_VERSION_NUMBER < 0x10100000L	39	#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER)
40	/*	40	/*
41	* These are new in OpenSSL 1.1.0. BN_GENCB _cb needs to be declared in	41	* These are new in OpenSSL 1.1.0. BN_GENCB _cb needs to be declared in
42	* the function like this before the BN_GENCB_new call:	42	* the function like this before the BN_GENCB_new call:




	return (result == ISC_R_SUCCESS ? 1 : -1);
}

#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
static void
entropy_add(const void *buf, int num, double entropy) {
	/*

		UNLOCK(&locks[type]);
}

#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
static unsigned long
id_callback(void) {
	return ((unsigned long)isc_thread_self());

	if (result != ISC_R_SUCCESS)
		goto cleanup_mutexalloc;
	CRYPTO_set_locking_callback(lock_callback);
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
	CRYPTO_set_id_callback(id_callback);
#endif


	CRYPTO_cleanup_all_ex_data();
#endif
	ERR_clear_error();
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
	ERR_remove_state(0);
#endif
	ERR_free_strings();

Lines 173-179 openssldh_generate(dst_key_t *key, int generator, void Link Here

(-)lib/dns/openssldh_link.c.orig (-2 / +2 lines)
173	DH *dh = NULL;	173	DH *dh = NULL;
174	#if OPENSSL_VERSION_NUMBER > 0x00908000L	174	#if OPENSSL_VERSION_NUMBER > 0x00908000L
175	BN_GENCB *cb;	175	BN_GENCB *cb;
176	#if OPENSSL_VERSION_NUMBER < 0x10100000L	176	#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER)
177	BN_GENCB _cb;	177	BN_GENCB _cb;
178	#endif	178	#endif
179	union {	179	union {
Lines 210-216 openssldh_generate(dst_key_t *key, int generator, void Link Here
210	if (dh == NULL)	210	if (dh == NULL)
211	return (dst__openssl_toresult(ISC_R_NOMEMORY));	211	return (dst__openssl_toresult(ISC_R_NOMEMORY));
212	cb = BN_GENCB_new();	212	cb = BN_GENCB_new();
213	#if OPENSSL_VERSION_NUMBER >= 0x10100000L	213	#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
214	if (cb == NULL) {	214	if (cb == NULL) {
215	DH_free(dh);	215	DH_free(dh);
216	return (dst__openssl_toresult(ISC_R_NOMEMORY));	216	return (dst__openssl_toresult(ISC_R_NOMEMORY));

Lines 359-365 openssldsa_generate(dst_key_t *key, int unused, void ( Link Here

(-)lib/dns/openssldsa_link.c.orig (-2 / +2 lines)
359	isc_result_t result;	359	isc_result_t result;
360	#if OPENSSL_VERSION_NUMBER > 0x00908000L	360	#if OPENSSL_VERSION_NUMBER > 0x00908000L
361	BN_GENCB *cb;	361	BN_GENCB *cb;
362	#if OPENSSL_VERSION_NUMBER < 0x10100000L	362	#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER)
363	BN_GENCB _cb;	363	BN_GENCB _cb;
364	#endif	364	#endif
365	union {	365	union {
Lines 383-389 openssldsa_generate(dst_key_t *key, int unused, void ( Link Here
383	if (dsa == NULL)	383	if (dsa == NULL)
384	return (dst__openssl_toresult(DST_R_OPENSSLFAILURE));	384	return (dst__openssl_toresult(DST_R_OPENSSLFAILURE));
385	cb = BN_GENCB_new();	385	cb = BN_GENCB_new();
386	#if OPENSSL_VERSION_NUMBER >= 0x10100000L	386	#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
387	if (cb == NULL) {	387	if (cb == NULL) {
388	DSA_free(dsa);	388	DSA_free(dsa);
389	return (dst__openssl_toresult(DST_R_OPENSSLFAILURE));	389	return (dst__openssl_toresult(DST_R_OPENSSLFAILURE));

Lines 771-777 opensslrsa_generate(dst_key_t key, int exp, void (ca Link Here

(-)lib/dns/opensslrsa_link.c.orig (-1 / +1 lines)
771	} u;	771	} u;
772	RSA *rsa = RSA_new();	772	RSA *rsa = RSA_new();
773	BIGNUM *e = BN_new();	773	BIGNUM *e = BN_new();
774	#if OPENSSL_VERSION_NUMBER < 0x10100000L	774	#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER)
775	BN_GENCB _cb;	775	BN_GENCB _cb;
776	#endif	776	#endif
777	BN_GENCB *cb = BN_GENCB_new();	777	BN_GENCB *cb = BN_GENCB_new();

Return to bug 563362

Lines 88-94 entropy_getpseudo(unsigned char *buf, int num) { Link Here

(-)lib/dns/openssl_link.c.orig (-4 / +4 lines)
88	return (result == ISC_R_SUCCESS ? 1 : -1);	88	return (result == ISC_R_SUCCESS ? 1 : -1);
89	}	89	}
90		90
91	#if OPENSSL_VERSION_NUMBER < 0x10100000L	91	#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER)
92	static void	92	static void
93	entropy_add(const void *buf, int num, double entropy) {	93	entropy_add(const void *buf, int num, double entropy) {
94	/*	94	/*
Lines 121-127 lock_callback(int mode, int type, const char *file, in Link Here
121	UNLOCK(&locks[type]);	121	UNLOCK(&locks[type]);
122	}	122	}
123		123
124	#if OPENSSL_VERSION_NUMBER < 0x10100000L	124	#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER)
125	static unsigned long	125	static unsigned long
126	id_callback(void) {	126	id_callback(void) {
127	return ((unsigned long)isc_thread_self());	127	return ((unsigned long)isc_thread_self());
Lines 187-193 dst__openssl_init(const char *engine) { Link Here
187	if (result != ISC_R_SUCCESS)	187	if (result != ISC_R_SUCCESS)
188	goto cleanup_mutexalloc;	188	goto cleanup_mutexalloc;
189	CRYPTO_set_locking_callback(lock_callback);	189	CRYPTO_set_locking_callback(lock_callback);
190	#if OPENSSL_VERSION_NUMBER < 0x10100000L	190	#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER)
191	CRYPTO_set_id_callback(id_callback);	191	CRYPTO_set_id_callback(id_callback);
192	#endif	192	#endif
193		193
Lines 287-293 dst__openssl_destroy(void) { Link Here
287	CRYPTO_cleanup_all_ex_data();	287	CRYPTO_cleanup_all_ex_data();
288	#endif	288	#endif
289	ERR_clear_error();	289	ERR_clear_error();
290	#if OPENSSL_VERSION_NUMBER < 0x10100000L	290	#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER)
291	ERR_remove_state(0);	291	ERR_remove_state(0);
292	#endif	292	#endif
293	ERR_free_strings();	293	ERR_free_strings();