Attachment #449670 for bug #567262





void * dh5_init(struct wpabuf **priv, struct wpabuf **publ)
{
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
	DH *dh;
	struct wpabuf *pubkey = NULL, *privkey = NULL;
	size_t publen, privlen;


void * dh5_init_fixed(const struct wpabuf *priv, const struct wpabuf *publ)
{
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
	DH *dh;

	dh = DH_new();
- 
--
src/crypto/tls_openssl.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)




		}
#endif /* OPENSSL_FIPS */
#endif /* CONFIG_FIPS */
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
		SSL_load_error_strings();
		SSL_library_init();
#ifndef OPENSSL_NO_SHA256


	tls_openssl_ref_count--;
	if (tls_openssl_ref_count == 0) {
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
#ifndef OPENSSL_NO_ENGINE
		ENGINE_cleanup();
#endif /* OPENSSL_NO_ENGINE */

		return 0;

#ifdef PKCS12_FUNCS
#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER)
	/*
	 * Clear previously set extra chain certificates, if any, from PKCS#12
	 * processing in tls_parse_pkcs12() to allow OpenSSL to build a new
- 
--
src/crypto/tls_openssl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Lines 3976-3982 int tls_connection_set_params(void tls_ctx, struct tls_connection conn, Link Here

(-)a/src/crypto/tls_openssl.c (-2 / +1 lines)
3976	engine_id = "pkcs11";	3976	engine_id = "pkcs11";
3977		3977
3978	#if defined(EAP_FAST) \|\| defined(EAP_FAST_DYNAMIC) \|\| defined(EAP_SERVER_FAST)	3978	#if defined(EAP_FAST) \|\| defined(EAP_FAST_DYNAMIC) \|\| defined(EAP_SERVER_FAST)
3979	#if OPENSSL_VERSION_NUMBER < 0x10100000L	3979	#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER)
3980	if (params->flags & TLS_CONN_EAP_FAST) {	3980	if (params->flags & TLS_CONN_EAP_FAST) {
3981	wpa_printf(MSG_DEBUG,	3981	wpa_printf(MSG_DEBUG,
3982	"OpenSSL: Use TLSv1_method() for EAP-FAST");	3982	"OpenSSL: Use TLSv1_method() for EAP-FAST");
3983	-

Return to bug 567262

Lines 611-617 void crypto_cipher_deinit(struct crypto_cipher *ctx) Link Here

(-)a/src/crypto/crypto_openssl.c (-4 / +2 lines)
611		611
612	void * dh5_init(struct wpabuf priv, struct wpabuf publ)	612	void * dh5_init(struct wpabuf priv, struct wpabuf publ)
613	{	613	{
614	#if OPENSSL_VERSION_NUMBER < 0x10100000L	614	#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER)
615	DH *dh;	615	DH *dh;
616	struct wpabuf pubkey = NULL, privkey = NULL;	616	struct wpabuf pubkey = NULL, privkey = NULL;
617	size_t publen, privlen;	617	size_t publen, privlen;
Lines 712-718 err: Link Here
712		712
713	void * dh5_init_fixed(const struct wpabuf priv, const struct wpabuf publ)	713	void * dh5_init_fixed(const struct wpabuf priv, const struct wpabuf publ)
714	{	714	{
715	#if OPENSSL_VERSION_NUMBER < 0x10100000L	715	#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER)
716	DH *dh;	716	DH *dh;
717		717
718	dh = DH_new();	718	dh = DH_new();
719	-
720	--
721	src/crypto/tls_openssl.c \| 6 +++---	719	src/crypto/tls_openssl.c \| 6 +++---
722	1 file changed, 3 insertions(+), 3 deletions(-)	720	1 file changed, 3 insertions(+), 3 deletions(-)

Lines 919-925 void * tls_init(const struct tls_config *conf) Link Here

(-)a/src/crypto/tls_openssl.c (-5 / +3 lines)
919	}	919	}
920	#endif /* OPENSSL_FIPS */	920	#endif /* OPENSSL_FIPS */
921	#endif /* CONFIG_FIPS */	921	#endif /* CONFIG_FIPS */
922	#if OPENSSL_VERSION_NUMBER < 0x10100000L	922	#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER)
923	SSL_load_error_strings();	923	SSL_load_error_strings();
924	SSL_library_init();	924	SSL_library_init();
925	#ifndef OPENSSL_NO_SHA256	925	#ifndef OPENSSL_NO_SHA256
Lines 1043-1049 void tls_deinit(void *ssl_ctx) Link Here
1043		1043
1044	tls_openssl_ref_count--;	1044	tls_openssl_ref_count--;
1045	if (tls_openssl_ref_count == 0) {	1045	if (tls_openssl_ref_count == 0) {
1046	#if OPENSSL_VERSION_NUMBER < 0x10100000L	1046	#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER)
1047	#ifndef OPENSSL_NO_ENGINE	1047	#ifndef OPENSSL_NO_ENGINE
1048	ENGINE_cleanup();	1048	ENGINE_cleanup();
1049	#endif /* OPENSSL_NO_ENGINE */	1049	#endif /* OPENSSL_NO_ENGINE */
Lines 2334-2340 static int tls_connection_client_cert(struct tls_connection *conn, Link Here
2334	return 0;	2334	return 0;
2335		2335
2336	#ifdef PKCS12_FUNCS	2336	#ifdef PKCS12_FUNCS
2337	#if OPENSSL_VERSION_NUMBER < 0x10002000L	2337	#if OPENSSL_VERSION_NUMBER < 0x10002000L \|\| defined(LIBRESSL_VERSION_NUMBER)
2338	/*	2338	/*
2339	* Clear previously set extra chain certificates, if any, from PKCS#12	2339	* Clear previously set extra chain certificates, if any, from PKCS#12
2340	* processing in tls_parse_pkcs12() to allow OpenSSL to build a new	2340	* processing in tls_parse_pkcs12() to allow OpenSSL to build a new
2341	-
2342	--
2343	src/crypto/tls_openssl.c \| 2 +-	2341	src/crypto/tls_openssl.c \| 2 +-
2344	1 file changed, 1 insertion(+), 1 deletion(-)	2342	1 file changed, 1 insertion(+), 1 deletion(-)