| 1 |
commit: 60c211a01666babeebbbee2eea595da93173ec4c |
| 2 |
Author: Stefan Strogin <stefan.strogin <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Jan 13 19:28:13 2019 +0000 |
| 4 |
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 14 01:42:16 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60c211a0 |
| 7 |
|
| 8 |
net-wireless/wpa_supplicant: remove unused patch |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.55, Repoman-2.3.12 |
| 11 |
Signed-off-by: Stefan Strogin <stefan.strogin <AT> gmail.com> |
| 12 |
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org> |
| 13 |
|
| 14 |
.../files/wpa_supplicant-2.6-libressl.patch | 81 ---------------------- |
| 15 |
1 file changed, 81 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.6-libressl.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.6-libressl.patch |
| 18 |
deleted file mode 100644 |
| 19 |
index 0394ab545b1..00000000000 |
| 20 |
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.6-libressl.patch |
| 21 |
+++ /dev/null |
| 22 |
@@ -1,81 +0,0 @@ |
| 23 |
-From d53b107120af86a0c711bac950bfc2fa728cb4e6 Mon Sep 17 00:00:00 2001 |
| 24 |
-From: Julian Ospald <hasufell@××××××××.de> |
| 25 |
-Date: Fri, 7 Oct 2016 17:45:46 +0200 |
| 26 |
-Subject: [PATCH] Fix LibreSSL compatibility |
| 27 |
-Upstream: pending, http://lists.infradead.org/pipermail/hostap/2016-October/036458.html |
| 28 |
- |
| 29 |
-This basically just follows |
| 30 |
-587b0457e0238b7b1800d46f5cdd5e1d2b06732f |
| 31 |
-with the same pattern, which was missed here. |
| 32 |
- |
| 33 |
-Signed-off-by: Julian Ospald <hasufell@××××××××.de> |
| 34 |
---- |
| 35 |
- src/crypto/crypto_openssl.c | 4 ++-- |
| 36 |
- src/crypto/tls_openssl.c | 8 ++++---- |
| 37 |
- 2 files changed, 6 insertions(+), 6 deletions(-) |
| 38 |
- |
| 39 |
-diff --git a/src/crypto/crypto_openssl.c b/src/crypto/crypto_openssl.c |
| 40 |
-index 19e0e2b..b3d1b07 100644 |
| 41 |
---- a/src/crypto/crypto_openssl.c |
| 42 |
-+++ b/src/crypto/crypto_openssl.c |
| 43 |
-@@ -611,7 +611,7 @@ void crypto_cipher_deinit(struct crypto_cipher *ctx) |
| 44 |
- |
| 45 |
- void * dh5_init(struct wpabuf **priv, struct wpabuf **publ) |
| 46 |
- { |
| 47 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L |
| 48 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
| 49 |
- DH *dh; |
| 50 |
- struct wpabuf *pubkey = NULL, *privkey = NULL; |
| 51 |
- size_t publen, privlen; |
| 52 |
-@@ -712,7 +712,7 @@ err: |
| 53 |
- |
| 54 |
- void * dh5_init_fixed(const struct wpabuf *priv, const struct wpabuf *publ) |
| 55 |
- { |
| 56 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L |
| 57 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
| 58 |
- DH *dh; |
| 59 |
- |
| 60 |
- dh = DH_new(); |
| 61 |
-diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c |
| 62 |
-index 23ac64b..a7d4880 100644 |
| 63 |
---- a/src/crypto/tls_openssl.c |
| 64 |
-+++ b/src/crypto/tls_openssl.c |
| 65 |
-@@ -919,7 +919,7 @@ void * tls_init(const struct tls_config *conf) |
| 66 |
- } |
| 67 |
- #endif /* OPENSSL_FIPS */ |
| 68 |
- #endif /* CONFIG_FIPS */ |
| 69 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L |
| 70 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
| 71 |
- SSL_load_error_strings(); |
| 72 |
- SSL_library_init(); |
| 73 |
- #ifndef OPENSSL_NO_SHA256 |
| 74 |
-@@ -1043,7 +1043,7 @@ void tls_deinit(void *ssl_ctx) |
| 75 |
- |
| 76 |
- tls_openssl_ref_count--; |
| 77 |
- if (tls_openssl_ref_count == 0) { |
| 78 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L |
| 79 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
| 80 |
- #ifndef OPENSSL_NO_ENGINE |
| 81 |
- ENGINE_cleanup(); |
| 82 |
- #endif /* OPENSSL_NO_ENGINE */ |
| 83 |
-@@ -2334,7 +2334,7 @@ static int tls_connection_client_cert(struct tls_connection *conn, |
| 84 |
- return 0; |
| 85 |
- |
| 86 |
- #ifdef PKCS12_FUNCS |
| 87 |
--#if OPENSSL_VERSION_NUMBER < 0x10002000L |
| 88 |
-+#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER) |
| 89 |
- /* |
| 90 |
- * Clear previously set extra chain certificates, if any, from PKCS#12 |
| 91 |
- * processing in tls_parse_pkcs12() to allow OpenSSL to build a new |
| 92 |
-@@ -3976,7 +3976,7 @@ int tls_connection_set_params(void *tls_ctx, struct tls_connection *conn, |
| 93 |
- engine_id = "pkcs11"; |
| 94 |
- |
| 95 |
- #if defined(EAP_FAST) || defined(EAP_FAST_DYNAMIC) || defined(EAP_SERVER_FAST) |
| 96 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L |
| 97 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
| 98 |
- if (params->flags & TLS_CONN_EAP_FAST) { |
| 99 |
- wpa_printf(MSG_DEBUG, |
| 100 |
- "OpenSSL: Use TLSv1_method() for EAP-FAST"); |
| 101 |
--- |
| 102 |
-2.10.1 |
| 103 |
- |
Archives