From 2ba26b0190bef6cfb23ca8305c7e549e7ac58a17 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Thu, 23 Apr 2015 12:43:27 -0500
Subject: [PATCH] Remove obsolete wpa_supplicant-openssl-more-algs.patch

Fixed upstream back in 2010 by 1056dad796e78509604c0aa836803c8425b4ba37:
"Fix PKCS#12 use with OpenSSL 1.0.0"
---
 wpa_supplicant-openssl-more-algs.patch | 16 ----------------
 wpa_supplicant.spec                    |  9 ++++-----
 2 files changed, 4 insertions(+), 21 deletions(-)
 delete mode 100644 wpa_supplicant-openssl-more-algs.patch

diff --git a/wpa_supplicant-openssl-more-algs.patch b/wpa_supplicant-openssl-more-algs.patch
deleted file mode 100644
index d798a09..0000000
--- a/wpa_supplicant-openssl-more-algs.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c
-index 52db8fc..c5c10f7 100644
---- a/src/crypto/tls_openssl.c
-+++ b/src/crypto/tls_openssl.c
-@@ -770,6 +770,11 @@ void * tls_init(const struct tls_config *conf)
- #endif /* OPENSSL_FIPS */
- #endif /* CONFIG_FIPS */
- 		SSL_load_error_strings();
-+				/* Only add potentially weak hashes and encryption algorithms
-+				* when FIPS mode is not enabled.
-+				*/
-+				if (!conf || !conf->fips_mode)
-+						OpenSSL_add_all_algorithms();
- 		SSL_library_init();
- #ifndef OPENSSL_NO_SHA256
- 		EVP_add_digest(EVP_sha256());
diff --git a/wpa_supplicant.spec b/wpa_supplicant.spec
index aaf4f2a..ec0799c 100644
--- a/wpa_supplicant.spec
+++ b/wpa_supplicant.spec
@@ -7,7 +7,7 @@ Summary: WPA/WPA2/IEEE 802.1X Supplicant
 Name: wpa_supplicant
 Epoch: 1
 Version: 2.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: System Environment/Base
 Source0: http://w1.fi/releases/%{name}-%{version}%{rcver}%{snapshot}.tar.gz
@@ -29,9 +29,6 @@ Patch1: wpa_supplicant-flush-debug-output.patch
 Patch2: wpa_supplicant-dbus-service-file-args.patch
 # quiet an annoying and frequent syslog message
 Patch3: wpa_supplicant-quiet-scan-results-message.patch
-# allow more private key encryption algorithms. is this really a good idea?
-# seems to be related to RHBZ #538851, see comment #12
-Patch5: wpa_supplicant-openssl-more-algs.patch
 # distro specific customization for Qt4 build tools, not suitable for upstream
 Patch6: wpa_supplicant-gui-qt4.patch
 # Less aggressive roaming; signal strength is wildly variable
@@ -89,7 +86,6 @@ Graphical User Interface for wpa_supplicant written using QT
 %patch1 -p1 -b .flush-debug-output
 %patch2 -p1 -b .dbus-service-file
 %patch3 -p1 -b .quiet-scan-results-msg
-%patch5 -p1 -b .more-openssl-algs
 %patch6 -p1 -b .qt4
 %patch8 -p1 -b .rh837402-less-aggressive-roaming
 %patch9 -p1 -b .cve-2015-1863
@@ -207,6 +203,9 @@ fi
 %endif
 
 %changelog
+* Thu Apr 23 2015 Dan Williams <dcbw@redhat.com> - 1:2.4-2
+- Remove obsolete wpa_supplicant-openssl-more-algs.patch
+
 * Thu Apr 23 2015 Adam Williamson <awilliam@redhat.com> - 1:2.4-1
 - new release 2.4
 - add some info on a couple of patches