net-wireless/wpa_supplicant: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/6224

2 files changed, 0 insertions, 84 deletions

diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.5-do-not-call-dbus-functions-with-NULL-path.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.5-do-not-call-dbus-functions-with-NULL-path.patch
deleted file mode 100644
index 0f340c9566d2..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.5-do-not-call-dbus-functions-with-NULL-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/wpa_supplicant/dbus/dbus_new_helpers.c b/wpa_supplicant/dbus/dbus_new_helpers.c
-index 45623f3..0fc3d08 100644
---- a/wpa_supplicant/dbus/dbus_new_helpers.c
-+++ b/wpa_supplicant/dbus/dbus_new_helpers.c
-@@ -847,7 +847,7 @@ void wpa_dbus_mark_property_changed(struct wpas_dbus_priv *iface,
- 	const struct wpa_dbus_property_desc *dsc;
- 	int i = 0;
- 
--	if (iface == NULL)
-+	if (iface == NULL || path == NULL)
- 		return;
- 
- 	dbus_connection_get_object_path_data(iface->con, path,
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.5-libressl.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.5-libressl.patch
deleted file mode 100644
index 458628c577dc..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.5-libressl.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From c987191de92bacbf27df5d345a9d18aea8ea8a98 Mon Sep 17 00:00:00 2001

-From: =?UTF-8?q?Marek=20Beh=C3=BAn?= <kabel@blackhole.sk>

-Date: Mon, 16 Nov 2015 02:18:22 +0100

-Subject: [PATCH] Check for LIBRESSL_VERSION_NUMBER in tls_openssl.c

-

-LibreSSL does not yet support the new API, so do not use it

-when LIBRESSL_VERSION_NUMBER macro is defined.

----

- src/crypto/tls_openssl.c | 12 ++++++------

- 1 file changed, 6 insertions(+), 6 deletions(-)

-

-diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c

-index c2bb8c5..3883465 100644

---- a/src/crypto/tls_openssl.c

-+++ b/src/crypto/tls_openssl.c

-@@ -3163,7 +3163,7 @@ static int tls_parse_pkcs12(struct tls_data *data, SSL *ssl, PKCS12 *p12,

- 	}

- 

- 	if (certs) {

--#if OPENSSL_VERSION_NUMBER >= 0x10002000L

-+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)

- 		SSL_clear_chain_certs(ssl);

- 		while ((cert = sk_X509_pop(certs)) != NULL) {

- 			X509_NAME_oneline(X509_get_subject_name(cert), buf,

-@@ -3746,7 +3746,7 @@ int tls_connection_get_random(void *ssl_ctx, struct tls_connection *conn,

- 	if (conn == NULL || keys == NULL)

- 		return -1;

- 	ssl = conn->ssl;

--#if OPENSSL_VERSION_NUMBER < 0x10100000L

-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)

- 	if (ssl == NULL || ssl->s3 == NULL || ssl->session == NULL)

- 		return -1;

- 

-@@ -3775,7 +3775,7 @@ int tls_connection_get_random(void *ssl_ctx, struct tls_connection *conn,

- #ifndef CONFIG_FIPS

- static int openssl_get_keyblock_size(SSL *ssl)

- {

--#if OPENSSL_VERSION_NUMBER < 0x10100000L

-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)

- 	const EVP_CIPHER *c;

- 	const EVP_MD *h;

- 	int md_size;

-@@ -3845,7 +3845,7 @@ static int openssl_tls_prf(struct tls_connection *conn,

- 		   "mode");

- 	return -1;

- #else /* CONFIG_FIPS */

--#if OPENSSL_VERSION_NUMBER < 0x10100000L

-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)

- 	SSL *ssl;

- 	u8 *rnd;

- 	int ret = -1;

-@@ -4328,7 +4328,7 @@ int tls_connection_set_cipher_list(void *tls_ctx, struct tls_connection *conn,

- 

- 	wpa_printf(MSG_DEBUG, "OpenSSL: cipher suites: %s", buf + 1);

- 

--#if OPENSSL_VERSION_NUMBER >= 0x10100000L

-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)

- #if defined(EAP_FAST) || defined(EAP_FAST_DYNAMIC) || defined(EAP_SERVER_FAST)

- 	if (os_strstr(buf, ":ADH-")) {

- 		/*

-@@ -4917,7 +4917,7 @@ static int tls_sess_sec_cb(SSL *s, void *secret, int *secret_len,

- 	struct tls_connection *conn = arg;

- 	int ret;

- 

--#if OPENSSL_VERSION_NUMBER < 0x10100000L

-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)

- 	if (conn == NULL || conn->session_ticket_cb == NULL)

- 		return 0;

- 

--- 

-2.4.10