Add official SSLv3 patch

4 files changed, 34 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 17b4613a4b89..e586faf96266 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Oct 16 02:42:12 UTC 2018
+# Wed Oct 17 22:58:52 UTC 2018
 pkgbase = bitcoin-gui-git
 	pkgdesc = Most recent stable branch, UPNP disabled, w/ Bitcoin binaries, dev tools, GUI, and wallet
 	pkgver = v0.17.0.r1.g5b47b8efd4
-	pkgrel = 2
+	pkgrel = 3
 	url = https://bitcoin.org/en/download
 	install = bitcoin-qt.install
 	arch = i686
@@ -37,15 +37,15 @@ pkgbase = bitcoin-gui-git
 	source = git+https://github.com/bitcoin/bitcoin.git#branch=0.17
 	source = git+https://github.com/bitcoin-core/packaging.git
 	source = bitcoin-qt.install
-	source = bitcoin-SSLfix.patch
+	source = bitcoin-officialSSLfix.patch
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = ebf7090ca1202e2c2ccd1aa5bb03e6ac911c458141a1cedda9b41f9c26c2602c
-	sha256sums = d9335c9b5c417b035f7be6cb3af7670487ec56bd71adaaad052e4913a5ef8495
+	sha256sums = 400cf501e193595529d46e4a3570a3d0c69e6c87bcc00e25fe24711a59f1109c
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = 67383fa1dd2f9576cc3c282f3a9b8c5f2d3eaa13799a6a7eb9eb2969face0ddaf6bb82c286c928b89397d8d2c9ba2efe9a603442f4bf6ed6d89ae9323c169375
-	sha512sums = 6c5b2a7e73eba407fd04e8571c719f0ca46bd9be53af329d6a139058ff5cd8e82727d395891c12dccfbdaf2f107f167a8033df9f50e13917da83446f0cb74a8f
+	sha512sums = 7455471d945c9da94fdb07d72c620d9aaadbd827e95e8f565de4aa6facd8fe2cb570bcbb3852093888e2ac2c08fb8fd0b0702a90d18b961f2cac926ad50525bf
 
 pkgname = bitcoin-gui-git
 
diff --git a/PKGBUILD b/PKGBUILD
index b4514c09ded5..c7fbe5a98f50 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ _branch=0.17
 #_tag=$(git ls-remote -t --refs https://github.com/bitcoin/bitcoin.git | awk '{print $2}' | LC_ALL=C sort -bfV | sed  '/rc[0-9]/d' | tail -n1 | sed -n -e 's/^.*tags\///p')
 pkgname=bitcoin-gui-git
 pkgver=v0.17.0.r1.g5b47b8efd4
-pkgrel=2
+pkgrel=3
 pkgdesc='Most recent stable branch, UPNP disabled, w/ Bitcoin binaries, dev tools, GUI, and wallet'
 arch=('i686' 'x86_64')
 url="https://bitcoin.org/en/download"
@@ -19,15 +19,15 @@ install=bitcoin-qt.install
 source=("git+https://github.com/bitcoin/bitcoin.git#branch=${_branch}"
         "git+https://github.com/bitcoin-core/packaging.git"
 				'bitcoin-qt.install'
-        'bitcoin-SSLfix.patch')
+        'bitcoin-officialSSLfix.patch')
 sha256sums=('SKIP'
             'SKIP'
             'ebf7090ca1202e2c2ccd1aa5bb03e6ac911c458141a1cedda9b41f9c26c2602c'
-            'd9335c9b5c417b035f7be6cb3af7670487ec56bd71adaaad052e4913a5ef8495')
+            '400cf501e193595529d46e4a3570a3d0c69e6c87bcc00e25fe24711a59f1109c')
 sha512sums=('SKIP'
             'SKIP'
             '67383fa1dd2f9576cc3c282f3a9b8c5f2d3eaa13799a6a7eb9eb2969face0ddaf6bb82c286c928b89397d8d2c9ba2efe9a603442f4bf6ed6d89ae9323c169375'
-            '6c5b2a7e73eba407fd04e8571c719f0ca46bd9be53af329d6a139058ff5cd8e82727d395891c12dccfbdaf2f107f167a8033df9f50e13917da83446f0cb74a8f')
+            '7455471d945c9da94fdb07d72c620d9aaadbd827e95e8f565de4aa6facd8fe2cb570bcbb3852093888e2ac2c08fb8fd0b0702a90d18b961f2cac926ad50525bf')
 
 pkgver() {
 	cd "$srcdir/bitcoin"
@@ -36,7 +36,7 @@ pkgver() {
 
 prepare() {
   cd "$srcdir/bitcoin"
-  patch -p1 < "$srcdir/bitcoin-SSLfix.patch"
+  patch -p1 < "$srcdir/bitcoin-officialSSLfix.patch"
 }
 
 
diff --git a/bitcoin-SSLfix.patch b/bitcoin-SSLfix.patch
deleted file mode 100644
index 0e6a16bcc3cc..000000000000
--- a/bitcoin-SSLfix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/qt/bitcoin.cpp	2018-10-15 18:45:35.610803000 -0700
-+++ b/src/qt/bitcoin.cpp	2018-10-15 19:19:02.004967860 -0700
-@@ -579,6 +579,7 @@
- #if QT_VERSION >= 0x050500
-     // Because of the POODLE attack it is recommended to disable SSLv3 (https://disablessl3.com/),
-     // so set SSL protocols to TLS1.0+.
-+    QSslSocket::sslLibraryVersionString();
-     QSslConfiguration sslconf = QSslConfiguration::defaultConfiguration();
-     sslconf.setProtocol(QSsl::TlsV1_0OrLater);
-     QSslConfiguration::setDefaultConfiguration(sslconf);
diff --git a/bitcoin-officialSSLfix.patch b/bitcoin-officialSSLfix.patch
new file mode 100644
index 000000000000..2d10f32983e1
--- /dev/null
+++ b/bitcoin-officialSSLfix.patch
@@ -0,0 +1,24 @@
+--- a/src/qt/bitcoin.cpp	2018-10-15 18:45:35.610803000 -0700
++++ b/src/qt/bitcoin.cpp	2018-10-17 15:48:20.580036450 -0700
+@@ -50,7 +50,6 @@
+ #include <QThread>
+ #include <QTimer>
+ #include <QTranslator>
+-#include <QSslConfiguration>
+
+ #if defined(QT_STATICPLUGIN)
+ #include <QtPlugin>
+@@ -576,13 +575,6 @@
+ #ifdef Q_OS_MAC
+     QApplication::setAttribute(Qt::AA_DontShowIconsInMenus);
+ #endif
+-#if QT_VERSION >= 0x050500
+-    // Because of the POODLE attack it is recommended to disable SSLv3 (https://disablessl3.com/),
+-    // so set SSL protocols to TLS1.0+.
+-    QSslConfiguration sslconf = QSslConfiguration::defaultConfiguration();
+-    sslconf.setProtocol(QSsl::TlsV1_0OrLater);
+-    QSslConfiguration::setDefaultConfiguration(sslconf);
+-#endif
+
+     // Register meta types used for QMetaObject::invokeMethod
+     qRegisterMetaType< bool* >();