[arch-commits] Commit in wpa_supplicant/trunk (PKGBUILD fix-pem-decryption.patch)

[Bartłomiej Piotrowski]

    Date: Tuesday, June 6, 2017 @ 07:34:17
  Author: bpiotrowski
Revision: 297847

1:2.6-6: fix isues with EAP-PEAP authentication

Added:
  wpa_supplicant/trunk/fix-pem-decryption.patch
Modified:
  wpa_supplicant/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |   21 +++++++++++++--------
 fix-pem-decryption.patch |   19 +++++++++++++++++++
 2 files changed, 32 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-06-06 07:21:03 UTC (rev 297846)
+++ PKGBUILD	2017-06-06 07:34:17 UTC (rev 297847)
@@ -4,25 +4,30 @@
 
 pkgname=wpa_supplicant
 pkgver=2.6
-pkgrel=5
+pkgrel=6
 epoch=1
-pkgdesc="A utility providing key negotiation for WPA wireless networks"
-url="http://hostap.epitest.fi/wpa_supplicant"
-arch=('i686' 'x86_64')
-depends=('openssl' 'libdbus' 'readline' 'libnl')
+pkgdesc='A utility providing key negotiation for WPA wireless networks'
+url='http://hostap.epitest.fi/wpa_supplicant'
+arch=(i686 x86_64)
+license=(GPL)
+depends=(openssl libdbus readline libnl)
 optdepends=('wpa_supplicant_gui: wpa_gui program')
-license=('GPL')
 install=wpa_supplicant.install
 source=(https://w1.fi/releases/${pkgname}-${pkgver}.tar.gz{,.asc}
-        config)
+        config
+        fix-pem-decryption.patch)
 validpgpkeys=('EC4AA0A991A5F2464582D52D2B6EF432EFC895FA') # Jouni Malinen
 sha256sums=('b4936d34c4e6cdd44954beba74296d964bc2c9668ecaa5255e499636fe2b1450'
             'SKIP'
-            'e7724868cda101f94962dd247c859cab581bc51080ae967b9e6409502d5193d4')
+            'e7724868cda101f94962dd247c859cab581bc51080ae967b9e6409502d5193d4'
+            '849444bd27390b00386a237941bcf3f3a0c429528445580148a919e08a58187d')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver/$pkgname"
   cp "$srcdir/config" ./.config
+
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -p1 -i "$srcdir/fix-pem-decryption.patch"
 }
 
 build() {

Added: fix-pem-decryption.patch
===================================================================
--- fix-pem-decryption.patch	                        (rev 0)
+++ fix-pem-decryption.patch	2017-06-06 07:34:17 UTC (rev 297847)
@@ -0,0 +1,19 @@
+--- a/src/crypto/tls_openssl.c	2016-10-02 19:51:11.000000000 +0100
++++ b/src/crypto/tls_openssl.c	2017-06-02 11:17:37.303222333 +0100
+@@ -2779,6 +2779,8 @@
+ 	} else
+ 		passwd = NULL;
+ 
++	SSL_set_default_passwd_cb(conn->ssl, tls_passwd_cb);
++	SSL_set_default_passwd_cb_userdata(conn->ssl, passwd);
+ 	SSL_CTX_set_default_passwd_cb(ssl_ctx, tls_passwd_cb);
+ 	SSL_CTX_set_default_passwd_cb_userdata(ssl_ctx, passwd);
+ 
+@@ -2869,6 +2871,7 @@
+ 		return -1;
+ 	}
+ 	ERR_clear_error();
++	SSL_set_default_passwd_cb(conn->ssl, NULL);
+ 	SSL_CTX_set_default_passwd_cb(ssl_ctx, NULL);
+ 	os_free(passwd);
+