commit 60d37e9efa808e2d381b1a5a8739a2c20f8160c0 Author: Juergen Daubert <jue@jue.li> Date: Thu Jun 5 12:57:38 2014 +0200 wpa_supplicant: update to 2.2 diff --git a/wpa_supplicant/.md5sum b/wpa_supplicant/.md5sum index a00a43c..af1e489 100644 --- a/wpa_supplicant/.md5sum +++ b/wpa_supplicant/.md5sum @@ -1,2 +1 @@ -ba6674b926dc30cfca46cf9a6bdacd23 revert-51e3eaf.patch -e96b8db5a8171cd17a5b2012d6ad7cc7 wpa_supplicant-2.1.tar.gz +238e8e888bbd558e1a57e3eb28d1dd07 wpa_supplicant-2.2.tar.gz diff --git a/wpa_supplicant/Pkgfile b/wpa_supplicant/Pkgfile index fb3d968..21640b3 100644 --- a/wpa_supplicant/Pkgfile +++ b/wpa_supplicant/Pkgfile @@ -4,14 +4,11 @@ # Depends on: openssl ncurses readline libnl name=wpa_supplicant -version=2.1 -release=2 -source=(http://hostap.epitest.fi/releases/$name-$version.tar.gz \ - revert-51e3eaf.patch) +version=2.2 +release=1 +source=(http://hostap.epitest.fi/releases/$name-$version.tar.gz) build () { - patch -d $name-$version -p1 -i $SRC/revert-51e3eaf.patch - cd $name-$version/$name cp defconfig .config diff --git a/wpa_supplicant/revert-51e3eaf.patch b/wpa_supplicant/revert-51e3eaf.patch deleted file mode 100644 index e3141b0..0000000 --- a/wpa_supplicant/revert-51e3eaf.patch +++ /dev/null @@ -1,68 +0,0 @@ -From b62d5b5450101676a0c05691b4bcd94e11426397 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <j@w1.fi> -Date: Wed, 19 Feb 2014 09:56:02 +0000 -Subject: Revert "OpenSSL: Do not accept SSL Client certificate for server" - -This reverts commit 51e3eafb68e15e78e98ca955704be8a6c3a7b304. There are -too many deployed AAA servers that include both id-kp-clientAuth and -id-kp-serverAuth EKUs for this change to be acceptable as a generic rule -for AAA authentication server validation. OpenSSL enforces the policy of -not connecting if only id-kp-clientAuth is included. If a valid EKU is -listed with it, the connection needs to be accepted. - -Signed-off-by: Jouni Malinen <j@w1.fi> ---- -diff --git a/src/crypto/tls.h b/src/crypto/tls.h -index 287fd33..feba13f 100644 ---- a/src/crypto/tls.h -+++ b/src/crypto/tls.h -@@ -41,8 +41,7 @@ enum tls_fail_reason { - TLS_FAIL_ALTSUBJECT_MISMATCH = 6, - TLS_FAIL_BAD_CERTIFICATE = 7, - TLS_FAIL_SERVER_CHAIN_PROBE = 8, -- TLS_FAIL_DOMAIN_SUFFIX_MISMATCH = 9, -- TLS_FAIL_SERVER_USED_CLIENT_CERT = 10 -+ TLS_FAIL_DOMAIN_SUFFIX_MISMATCH = 9 - }; - - union tls_event_data { -diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c -index a13fa38..8cf1de8 100644 ---- a/src/crypto/tls_openssl.c -+++ b/src/crypto/tls_openssl.c -@@ -105,7 +105,6 @@ struct tls_connection { - unsigned int ca_cert_verify:1; - unsigned int cert_probe:1; - unsigned int server_cert_only:1; -- unsigned int server:1; - - u8 srv_cert_hash[32]; - -@@ -1480,16 +1479,6 @@ static int tls_verify_cb(int preverify_ok, X509_STORE_CTX *x509_ctx) - TLS_FAIL_SERVER_CHAIN_PROBE); - } - -- if (!conn->server && err_cert && preverify_ok && depth == 0 && -- (err_cert->ex_flags & EXFLAG_XKUSAGE) && -- (err_cert->ex_xkusage & XKU_SSL_CLIENT)) { -- wpa_printf(MSG_WARNING, "TLS: Server used client certificate"); -- openssl_tls_fail_event(conn, err_cert, err, depth, buf, -- "Server used client certificate", -- TLS_FAIL_SERVER_USED_CLIENT_CERT); -- preverify_ok = 0; -- } -- - if (preverify_ok && context->event_cb != NULL) - context->event_cb(context->cb_ctx, - TLS_CERT_CHAIN_SUCCESS, NULL); -@@ -2541,8 +2530,6 @@ openssl_handshake(struct tls_connection *conn, const struct wpabuf *in_data, - int res; - struct wpabuf *out_data; - -- conn->server = !!server; -- - /* - * Give TLS handshake data from the server (if available) to OpenSSL - * for processing. --- -cgit v0.9.2