May 2015 - openSUSE Commits - openSUSE Mailing Lists

commit gtksourceviewmm for openSUSE:Factory
by root＠hilbert.suse.de 02 May '15

02 May '15

Hello community, here is the log from the commit of package gtksourceviewmm for openSUSE:Factory checked in at 2015-05-02 16:13:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gtksourceviewmm (Old) and /work/SRC/openSUSE:Factory/.gtksourceviewmm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gtksourceviewmm" Changes: -------- --- /work/SRC/openSUSE:Factory/gtksourceviewmm/gtksourceviewmm.changes 2013-04-02 20:36:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gtksourceviewmm.new/gtksourceviewmm.changes 2015-05-02 16:13:48.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Apr 29 20:41:06 UTC 2015 - zaitor(a)opensuse.org + +- Update to version 3.12.0: + + Deprecated some API because some of the C API was deprecated. + + Fix the examples build with recent gtkmm versions. + +------------------------------------------------------------------- Old: ---- gtksourceviewmm-3.2.0.tar.bz2 New: ---- gtksourceviewmm-3.12.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtksourceviewmm.spec ++++++ --- /var/tmp/diff_new_pack.RF15Xt/_old 2015-05-02 16:13:48.000000000 +0200 +++ /var/tmp/diff_new_pack.RF15Xt/_new 2015-05-02 16:13:48.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package gtksourceviewmm # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,13 @@ Name: gtksourceviewmm -Version: 3.2.0 +Version: 3.12.0 Release: 0 Summary: C++ interface for gtksourceview License: LGPL-2.1+ Group: System/Libraries Url: http://projects.gnome.org/gtksourceviewmm/ -Source0: http://download.gnome.org/sources/gtksourceviewmm/3.2/%{name}-%{version}.ta… +Source0: http://download.gnome.org/sources/gtksourceviewmm/3.12/%{name}-%{version}.t… BuildRequires: gcc-c++ BuildRequires: pkgconfig(glibmm-2.4) BuildRequires: pkgconfig(gtkmm-3.0)

1 0

commit fontforge for openSUSE:Factory
by root＠hilbert.suse.de 02 May '15

02 May '15

Hello community, here is the log from the commit of package fontforge for openSUSE:Factory checked in at 2015-05-02 16:12:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fontforge (Old) and /work/SRC/openSUSE:Factory/.fontforge.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "fontforge" Changes: -------- --- /work/SRC/openSUSE:Factory/fontforge/fontforge.changes 2015-04-27 22:06:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fontforge.new/fontforge.changes 2015-05-02 16:12:33.000000000 +0200 @@ -1,0 +2,6 @@ +Fri May 1 13:17:09 UTC 2015 - coolo(a)suse.com + +- also repackage the broken gnulib links to fix build with + newer libtool + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fontforge.spec ++++++ --- /var/tmp/diff_new_pack.teLhio/_old 2015-05-02 16:12:40.000000000 +0200 +++ /var/tmp/diff_new_pack.teLhio/_new 2015-05-02 16:12:40.000000000 +0200 @@ -98,7 +98,7 @@ sed -i 's/\r$//' doc/html/{Big5.txt,corpchar.txt} %build -./bootstrap +./bootstrap --force %configure \ --disable-static \ --enable-pyextension \ ++++++ fontforge-20150330-repacked.tar.gz ++++++ /work/SRC/openSUSE:Factory/fontforge/fontforge-20150330-repacked.tar.gz /work/SRC/openSUSE:Factory/.fontforge.new/fontforge-20150330-repacked.tar.gz differ: char 1, line 1 ++++++ get-source.sh ++++++ --- /var/tmp/diff_new_pack.teLhio/_old 2015-05-02 16:12:40.000000000 +0200 +++ /var/tmp/diff_new_pack.teLhio/_new 2015-05-02 16:12:40.000000000 +0200 @@ -14,7 +14,10 @@ wget "https://github.com/fontforge/fontforge/releases/download/$VERSION/fontforge…" tar xf fontforge-$VERSION.tar.gz -rm fontforge-*/win/gold/libX11-*.noarch.rpm +cd fontforge-* +rm win/gold/libX11-*.noarch.rpm +./bootsrap --copy --force +cd .. tar czf fontforge-$VERSION-repacked.tar.gz fontforge-$VERSION rm -rf fontforge-$VERSION rm fontforge-$VERSION.tar.gz ++++++ propagate-creation-and-modification-times-to-ttf.patch ++++++ --- /var/tmp/diff_new_pack.teLhio/_old 2015-05-02 16:12:40.000000000 +0200 +++ /var/tmp/diff_new_pack.teLhio/_new 2015-05-02 16:12:40.000000000 +0200 @@ -6,11 +6,11 @@ coming from the source. This enables TrueType Font to be built reproducibly. -diff --git a/fontforge/tottf.c b/fontforge/tottf.c -index a980610..3d488b0 100644 ---- a/fontforge/tottf.c -+++ b/fontforge/tottf.c -@@ -2812,7 +2812,6 @@ void cvt_unix_to_1904( long time, int32 result[2]) { +Index: fontforge-20150330/fontforge/tottf.c +=================================================================== +--- fontforge-20150330.orig/fontforge/tottf.c ++++ fontforge-20150330/fontforge/tottf.c +@@ -2758,7 +2758,6 @@ void cvt_unix_to_1904( long long time, i static void sethead(struct head *head,SplineFont *sf,struct alltabs *at, enum fontformat format, int32 *bsizes) { @@ -18,7 +18,7 @@ int i, lr, rl, indic_rearrange, arabic; ASM *sm; struct ttflangname *useng; -@@ -2920,10 +2919,8 @@ static void sethead(struct head *head,SplineFont *sf,struct alltabs *at, +@@ -2866,10 +2865,8 @@ static void sethead(struct head *head,Sp head->flags |= (1<<9); /* Apple documents this */ /* if there are any indic characters, set bit 10 */

1 0

commit aaa_base for openSUSE:Factory
by root＠hilbert.suse.de 02 May '15

02 May '15

Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at 2015-05-02 16:11:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aaa_base (Old) and /work/SRC/openSUSE:Factory/.aaa_base.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "aaa_base" Changes: -------- --- /work/SRC/openSUSE:Factory/aaa_base/aaa_base.changes 2015-04-28 20:41:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.aaa_base.new/aaa_base.changes 2015-05-02 16:11:25.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 28 16:20:16 UTC 2015 - ro(a)suse.com + +- xdg-environment: reduce list in /opt/* to gnome,kde4,kde3 (bnc#910904) + +------------------------------------------------------------------- Old: ---- aaa_base-13.2+git20150424.4a32a7a.tar.xz New: ---- aaa_base-13.2+git20150428.4b7d6b6.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.xOOHxm/_old 2015-05-02 16:11:25.000000000 +0200 +++ /var/tmp/diff_new_pack.xOOHxm/_new 2015-05-02 16:11:25.000000000 +0200 @@ -18,7 +18,7 @@ Name: aaa_base -Version: 13.2+git20150424.4a32a7a +Version: 13.2+git20150428.4b7d6b6 Release: 0 Url: https://github.com/openSUSE/aaa_base Provides: aaa_skel = %{version}-%{release} ++++++ aaa_base-13.2+git20150424.4a32a7a.tar.xz -> aaa_base-13.2+git20150428.4b7d6b6.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-13.2+git20150424.4a32a7a/files/etc/profile.d/xdg-environment.csh new/aaa_base-13.2+git20150428.4b7d6b6/files/etc/profile.d/xdg-environment.csh --- old/aaa_base-13.2+git20150424.4a32a7a/files/etc/profile.d/xdg-environment.csh 2015-04-24 10:28:37.000000000 +0200 +++ new/aaa_base-13.2+git20150428.4b7d6b6/files/etc/profile.d/xdg-environment.csh 2015-04-28 18:18:52.000000000 +0200 @@ -4,7 +4,7 @@ set XDG_DATA_DIRS=(${XDG_DATA_DIRS:as/:/ /}) endif set nonomatch -foreach xdgdir (/usr/local/share /usr/share /etc/opt/*/share /opt/*/share /usr/share/gnome/help) +foreach xdgdir (/usr/local/share /usr/share /etc/opt/gnome/share /etc/opt/kde4/share /etc/opt/kde3/share /opt/gnome/share /opt/kde4/share /opt/kde3/share /usr/share/gnome) if ( -d "$xdgdir" ) then set -l XDG_DATA_DIRS=($XDG_DATA_DIRS $xdgdir) endif @@ -22,7 +22,7 @@ set XDG_CONFIG_DIRS=(${XDG_CONFIG_DIRS:as/:/ /}) endif set nonomatch -foreach xdgdir (/usr/local/etc/xdg /etc/xdg /etc/opt/*/xdg) +foreach xdgdir (/usr/local/etc/xdg /etc/xdg /etc/opt/gnome/xdg /etc/opt/kde4/xdg /etc/opt/kde3/xdg) if ( -d "$xdgdir" ) then set -l XDG_CONFIG_DIRS=($XDG_CONFIG_DIRS $xdgdir) endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-13.2+git20150424.4a32a7a/files/etc/profile.d/xdg-environment.sh new/aaa_base-13.2+git20150428.4b7d6b6/files/etc/profile.d/xdg-environment.sh --- old/aaa_base-13.2+git20150424.4a32a7a/files/etc/profile.d/xdg-environment.sh 2015-04-24 10:28:37.000000000 +0200 +++ new/aaa_base-13.2+git20150428.4b7d6b6/files/etc/profile.d/xdg-environment.sh 2015-04-28 18:18:52.000000000 +0200 @@ -25,7 +25,7 @@ if [ "x$ZSH_VERSION" != "x" ] ; then setopt nullglob localoptions fi - for xdgdir in /usr/local/share /usr/share /etc/opt/*/share /opt/*/share /usr/share/gnome ; do + for xdgdir in /usr/local/share /usr/share /etc/opt/gnome/share /etc/opt/kde4/share /etc/opt/kde3/share /opt/gnome/share /opt/kde4/share /opt/kde3/share /usr/share/gnome ; do if test -d "$xdgdir" && test -d "$xdgdir/applications"; then if test -z "$XDG_DATA_DIRS"; then XDG_DATA_DIRS="$xdgdir" @@ -38,7 +38,7 @@ XDG_DATA_DIRS=$(uniquefy_search_path "$XDG_DATA_DIRS") export XDG_DATA_DIRS - for xdgdir in /usr/local/etc/xdg /etc/xdg /etc/opt/*/xdg ; do + for xdgdir in /usr/local/etc/xdg /etc/xdg /etc/opt/gnome/xdg /etc/opt/kde4/xdg /etc/opt/kde3/xdg ; do if test -d "$xdgdir"; then if test -z "$XDG_CONFIG_DIRS"; then XDG_CONFIG_DIRS="$xdgdir"

1 0

commit glibc for openSUSE:Factory
by root＠hilbert.suse.de 02 May '15

02 May '15

Hello community, here is the log from the commit of package glibc for openSUSE:Factory checked in at 2015-05-02 16:10:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glibc (Old) and /work/SRC/openSUSE:Factory/.glibc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "glibc" Changes: -------- --- /work/SRC/openSUSE:Factory/glibc/glibc-testsuite.changes 2015-04-05 02:02:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.glibc.new/glibc-testsuite.changes 2015-05-02 16:10:04.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 8 12:50:39 UTC 2015 - mgorman(a)suse.com + +- threaded-trim-threshold.patch: Fix regression in threaded application + malloc performance (bsc#915955, BZ #17195) + +------------------------------------------------------------------- glibc-utils.changes: same change glibc.changes: same change New: ---- threaded-trim-threshold.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glibc-testsuite.spec ++++++ --- /var/tmp/diff_new_pack.JRFDTt/_old 2015-05-02 16:10:06.000000000 +0200 +++ /var/tmp/diff_new_pack.JRFDTt/_new 2015-05-02 16:10:06.000000000 +0200 @@ -243,6 +243,8 @@ Patch1004: powerpc-software-sqrt.patch # PATCH-FIX-UPSTREAM Fix DTV race, assert, DTV_SURPLUS Static TLS limit, and nptl_db garbage (bsc#919678, BZ #17090, BZ #17620, BZ #17621, BZ #17628) Patch1005: static-tls-dtv-limit.patch +# PATCH-FIX-UPSTREAM Fix regression in threaded application malloc performance (bsc#915955, BZ #17195) +Patch1006: threaded-trim-threshold.patch ### # Patches awaiting upstream approval @@ -469,6 +471,7 @@ %patch1003 -p1 %patch1004 -p1 %patch1005 -p1 +%patch1006 -p1 %patch2000 -p1 %patch2002 -p1 glibc-utils.spec: same change glibc.spec: same change ++++++ threaded-trim-threshold.patch ++++++ >From c26efef9798914e208329c0e8c3c73bb1135d9e3 Mon Sep 17 00:00:00 2001 From: Mel Gorman <mgorman(a)suse.de> Date: Thu, 2 Apr 2015 12:14:14 +0530 Subject: [PATCH] malloc: Consistently apply trim_threshold to all heaps [BZ #17195] Trimming heaps is a balance between saving memory and the system overhead required to update page tables and discard allocated pages. The malloc option M_TRIM_THRESHOLD is a tunable that users are meant to use to decide where this balance point is but it is only applied to the main arena. For scalability reasons, glibc malloc has per-thread heaps but these are shrunk with madvise() if there is one page free at the top of the heap. In some circumstances this can lead to high system overhead if a thread has a control flow like while (data_to_process) { buf = malloc(large_size); do_stuff(); free(buf); } For a large size, the free() will call madvise (pagetable teardown, page free and TLB flush) every time followed immediately by a malloc (fault, kernel page alloc, zeroing and charge accounting). The kernel overhead can dominate such a workload. This patch allows the user to tune when madvise gets called by applying the trim threshold to the per-thread heaps and using similar logic to the main arena when deciding whether to shrink. Alternatively if the dynamic brk/mmap threshold gets adjusted then the new values will be obeyed by the per-thread heaps. Bug 17195 was a test case motivated by a problem encountered in scientific applications written in python that performance badly due to high page fault overhead. The basic operation of such a program was posted by Julian Taylor https://sourceware.org/ml/libc-alpha/2015-02/msg00373.html With this patch applied, the overhead is eliminated. All numbers in this report are in seconds and were recorded by running Julian's program 30 times. pyarray glibc madvise 2.21 v2 System min 1.81 ( 0.00%) 0.00 (100.00%) System mean 1.93 ( 0.00%) 0.02 ( 99.20%) System stddev 0.06 ( 0.00%) 0.01 ( 88.99%) System max 2.06 ( 0.00%) 0.03 ( 98.54%) Elapsed min 3.26 ( 0.00%) 2.37 ( 27.30%) Elapsed mean 3.39 ( 0.00%) 2.41 ( 28.84%) Elapsed stddev 0.14 ( 0.00%) 0.02 ( 82.73%) Elapsed max 4.05 ( 0.00%) 2.47 ( 39.01%) glibc madvise 2.21 v2 User 141.86 142.28 System 57.94 0.60 Elapsed 102.02 72.66 Note that almost a minutes worth of system time is eliminted and the program completes 28% faster on average. To illustrate the problem without python this is a basic test-case for the worst case scenario where every free is a madvise followed by a an alloc /* gcc bench-free.c -lpthread -o bench-free */ static int num = 1024; void __attribute__((noinline,noclone)) dostuff (void *p) { } void *worker (void *data) { int i; for (i = num; i--;) { void *m = malloc (48*4096); dostuff (m); free (m); } return NULL; } int main() { int i; pthread_t t; void *ret; if (pthread_create (&t, NULL, worker, NULL)) exit (2); if (pthread_join (t, &ret)) exit (3); return 0; } Before the patch, this resulted in 1024 calls to madvise. With the patch applied, madvise is called twice because the default trim threshold is high enough to avoid this. This a more complex case where there is a mix of frees. It's simply a different worker function for the test case above void *worker (void *data) { int i; int j = 0; void *free_index[num]; for (i = num; i--;) { void *m = malloc ((i % 58) *4096); dostuff (m); if (i % 2 == 0) { free (m); } else { free_index[j++] = m; } } for (; j >= 0; j--) { free(free_index[j]); } return NULL; } glibc 2.21 calls malloc 90305 times but with the patch applied, it's called 13438. Increasing the trim threshold will decrease the number of times it's called with the option of eliminating the overhead. ebizzy is meant to generate a workload resembling common web application server workloads. It is threaded with a large working set that at its core has an allocation, do_stuff, free loop that also hits this case. The primary metric of the benchmark is records processed per second. This is running on my desktop which is a single socket machine with an I7-4770 and 8 cores. Each thread count was run for 30 seconds. It was only run once as the performance difference is so high that the variation is insignificant. glibc 2.21 patch threads 1 10230 44114 threads 2 19153 84925 threads 4 34295 134569 threads 8 51007 183387 Note that the saving happens to be a concidence as the size allocated by ebizzy was less than the default threshold. If a different number of chunks were specified then it may also be necessary to tune the threshold to compensate This is roughly quadrupling the performance of this benchmark. The difference in system CPU usage illustrates why. ebizzy running 1 thread with glibc 2.21 10230 records/s 306904 real 30.00 s user 7.47 s sys 22.49 s 22.49 seconds was spent in the kernel for a workload runinng 30 seconds. With the patch applied ebizzy running 1 thread with patch applied 44126 records/s 1323792 real 30.00 s user 29.97 s sys 0.00 s system CPU usage was zero with the patch applied. strace shows that glibc running this workload calls madvise approximately 9000 times a second. With the patch applied madvise was called twice during the workload (or 0.06 times per second). 2015-02-10 Mel Gorman <mgorman(a)suse.de> [BZ #17195] * malloc/arena.c (free): Apply trim threshold to per-thread heaps as well as the main arena. --- --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -241,6 +241,8 @@ /* For MIN, MAX, powerof2. */ #include <sys/param.h> +/* For ALIGN_DOWN. */ +#include <libc-internal.h> /* Debugging: --- a/malloc/arena.c +++ b/malloc/arena.c @@ -658,7 +658,7 @@ heap_trim (heap_info *heap, size_t pad) unsigned long pagesz = GLRO (dl_pagesize); mchunkptr top_chunk = top (ar_ptr), p, bck, fwd; heap_info *prev_heap; - long new_size, top_size, extra, prev_size, misalign; + long new_size, top_size, top_area, extra, prev_size, misalign; /* Can this heap go away completely? */ while (top_chunk == chunk_at_offset (heap, sizeof (*heap))) @@ -694,9 +694,16 @@ heap_trim (heap_info *heap, size_t pad) set_head (top_chunk, new_size | PREV_INUSE); /*check_chunk(ar_ptr, top_chunk);*/ } + + /* Uses similar logic for per-thread arenas as the main arena with systrim + by preserving the top pad and at least a page. */ top_size = chunksize (top_chunk); - extra = (top_size - pad - MINSIZE - 1) & ~(pagesz - 1); - if (extra < (long) pagesz) + top_area = top_size - MINSIZE - 1; + if (top_area <= pad) + return 0; + + extra = ALIGN_DOWN(top_area - pad, pagesz); + if ((unsigned long) extra < mp_.trim_threshold) return 0; /* Try to shrink. */

1 0

commit wpa_supplicant for openSUSE:13.1:Update
by root＠hilbert.suse.de 01 May '15

01 May '15

Hello community, here is the log from the commit of package wpa_supplicant for openSUSE:13.1:Update checked in at 2015-05-01 14:56:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/wpa_supplicant (Old) and /work/SRC/openSUSE:13.1:Update/.wpa_supplicant.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wpa_supplicant" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.fyJsKG/_old 2015-05-01 14:56:16.000000000 +0200 +++ /var/tmp/diff_new_pack.fyJsKG/_new 2015-05-01 14:56:16.000000000 +0200 @@ -1 +1 @@ -<link package='wpa_supplicant.3065' cicount='copy' /> +<link package='wpa_supplicant.3727' cicount='copy' />

1 0

commit wpa_supplicant.3727 for openSUSE:13.1:Update
by root＠hilbert.suse.de 01 May '15

01 May '15

Hello community, here is the log from the commit of package wpa_supplicant.3727 for openSUSE:13.1:Update checked in at 2015-05-01 14:56:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/wpa_supplicant.3727 (Old) and /work/SRC/openSUSE:13.1:Update/.wpa_supplicant.3727.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wpa_supplicant.3727" Changes: -------- New Changes file: --- /dev/null 2015-04-29 01:05:10.436023256 +0200 +++ /work/SRC/openSUSE:13.1:Update/.wpa_supplicant.3727.new/wpa_supplicant.changes 2015-05-01 14:56:14.000000000 +0200 @@ -0,0 +1,1355 @@ +------------------------------------------------------------------- +Mon Apr 20 01:55:01 CEST 2015 - ro(a)suse.de + +- add patch (bnc#927558) (CVE-2015-1863) + 0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch + wpa_supplicant P2P SSID processing vulnerability + +------------------------------------------------------------------- +Mon Oct 13 17:39:56 CEST 2014 - ro(a)suse.de + +- add 0001-Add-os_exec-helper-to-run-external-programs.patch +- add 0002-wpa_cli-Use-os_exec-for-action-script-execution.patch +- fixing CVE-2014-3686 (bnc#900611) trying to abuse the action + scripts in wpa_cli + +------------------------------------------------------------------- +Mon Jun 16 06:29:16 UTC 2014 - glin(a)suse.com + +- Enable AP mode and P2P (bnc#860885) + +------------------------------------------------------------------- +Mon Sep 9 09:18:17 UTC 2013 - fcrozat(a)suse.com + +- Add systemd service file, to properly track wpa_supplicant in + its own systemd service (and not in dbus one). +- Always enable systemd service, it is still dbus activated. + +------------------------------------------------------------------- +Wed Apr 24 03:48:27 UTC 2013 - glin(a)suse.com + +- Update to 2.0 + * removed Qt3-based wpa_gui (obsoleted by wpa_qui-qt4) + * removed unmaintained driver wrappers broadcom, iphone, osx, + ralink, hostap, madwifi (hostap and madwifi remain available + for hostapd; their wpa_supplicant functionality is obsoleted + by wext) + * improved debug logging (human readable event names, interface + name included in more entries) + * changed AP mode behavior to enable WPS only for open and + WPA/WPA2-Personal configuration + * improved P2P concurrency operations + - better coordination of concurrent scan and P2P search + operations + - avoid concurrent remain-on-channel operation requests by + canceling previous operations prior to starting a new one + - reject operations that would require multi-channel + concurrency if the driver does not support it + - add parameter to select whether STA or P2P connection is + preferred if the driver cannot support both at the same time + - allow driver to indicate channel changes + - added optional delay=<search delay in milliseconds> parameter + for p2p_find to avoid taking all radio resources + - use 500 ms p2p_find search delay by default during concurrent + operations + - allow all channels in GO Negotiation if the driver supports + multi-channel concurrency + * added number of small changes to make it easier for static + analyzers to understand the implementation + * fixed number of small bugs (see git logs for more details) + * nl80211: number of updates to use new cfg80211/nl80211 + functionality + - replace monitor interface with nl80211 commands for AP mode + - additional information for driver-based AP SME + - STA entry authorization in RSN IBSS + * EAP-pwd: + - fixed KDF for group 21 and zero-padding + - added support for fragmentation + - increased maximum number of hunting-and-pecking iterations + * avoid excessive Probe Response retries for broadcast Probe + Request frames (only with drivers using wpa_supplicant AP mode + SME/MLME) + * added "GET country" ctrl_iface command + * do not save an invalid network block in wpa_supplicant.conf to + avoid problems reading the file on next start + * send STA connected/disconnected ctrl_iface events to both the + P2P group and parent interfaces + * added preliminary support for using TLS v1.2 (CONFIG_TLSV12=y) + * added "SET pno <1/0>" ctrl_iface command to start/stop + preferred network offload with sched_scan driver command + * merged in number of changes from Android repository for P2P, + nl80211, and build parameters + * changed P2P GO mode configuration to use driver capabilities + to automatically enable HT operations when supported + * added "wpa_cli status wps" command to fetch WPA2-Personal + passhrase for WPS use cases in AP mode + * EAP-AKA: keep pseudonym identity across EAP exchanges to match + EAP-SIM behavior + * improved reassociation behavior in cases where association is + rejected or when an AP disconnects us to handle common load + balancing mechanisms + - try to avoid extra scans when the needed information is + available + * added optional "join" argument for p2p_prov_disc ctrl_iface + command + * added group ifname to P2P-PROV-DISC-* events + * added P2P Device Address to AP-STA-DISCONNECTED event and use + p2p_dev_addr parameter name with AP-STA-CONNECTED + * added workarounds for WPS PBC overlap detection for some P2P + use cases where deployed stations work incorrectly + * optimize WPS connection speed by disconnecting prior to WPS + scan and by using single channel scans when AP channel is + known + * PCSC and SIM/USIM improvements: + - accept 0x67 (Wrong length) as a response to READ RECORD to + fix issues with some USIM cards + - try to read MNC length from SIM/USIM + - build realm according to 3GPP TS 23.003 with identity from + the SIM + - allow T1 protocol to be enabled + * added more WPS and P2P information available through D-Bus + * improve P2P negotiation robustness + - extra waits to get ACK frames through + - longer timeouts for cases where deployed devices have been + identified have issues meeting the specification + requirements + - more retries for some P2P frames + - handle race conditions in GO Negotiation start by both + devices + - ignore unexpected GO Negotiation Response frame + * added support for libnl 3.2 and newer + * added P2P persistent group info to P2P_PEER data + * maintain a list of P2P Clients for persistent group on GO + * AP: increased initial group key handshake retransmit timeout to + 500 ms + * added optional dev_id parameter for p2p_find + * added P2P-FIND-STOPPED ctrl_iface event + * fixed issues in WPA/RSN element validation when roaming with + ap_scan=1 and driver-based BSS selection + * do not expire P2P peer entries while connected with the peer in a + group + * fixed WSC element inclusion in cases where P2P is disabled + * AP: added a WPS workaround for mixed mode AP Settings with + Windows 7 + * EAP-SIM: fixed AT_COUNTER_TOO_SMALL use + * EAP-SIM/AKA: append realm to pseudonym identity + * EAP-SIM/AKA: store pseudonym identity in network configuration + to allow it to persist over multiple EAP sessions and + wpa_supplicant restarts + * EAP-AKA': updated to RFC 5448 (username prefixes changed); + note: this breaks interoperability with older versions + * added support for WFA Hotspot 2.0 + - GAS/ANQP to fetch network information + - credential configuration and automatic network selections + based on credential match with ANQP information + * limited PMKSA cache entries to be used only with the network + context that was used to create them + * improved PMKSA cache expiration to avoid unnecessary + disconnections + * adjusted bgscan_simple fast-scan backoff to avoid too frequent + background scans + * removed ctrl_iface event on P2P PD Response in join-group case + * added option to fetch BSS table entry based on P2P Device + Address ("BSS p2p_dev_addr=<P2P Device Address>") + * added BSS entry age to ctrl_iface BSS command output + * added optional MASK=0xH option for ctrl_iface BSS command to + select which fields are included in the response + * added optional RANGE=ALL|N1-N2 option for ctrl_iface BSS + command to fetch information about several BSSes in one call + * simplified licensing terms by selecting the BSD license as the + only alternative + * added "P2P_SET disallow_freq <freq list>" ctrl_iface command + to disable channels from P2P use + * added p2p_pref_chan configuration parameter to allow preferred + P2P channels to be specified + * added support for advertising immediate availability of a WPS + credential for P2P use cases + * optimized scan operations for P2P use cases (use single channel + scan for a specific SSID when possible) + * EAP-TTLS: fixed peer challenge generation for MSCHAPv2 + * SME: do not use reassociation after explicit disconnection + request (local or a notification from an AP) + * added support for sending debug info to Linux tracing (-T on + command line) + * added support for using Deauthentication reason code 3 as an + indication of P2P group termination + * added wps_vendor_ext_m1 configuration parameter to allow + vendor specific attributes to be added to WPS M1 + * started using separate TLS library context for tunneled TLS + (EAP-PEAP/TLS, EAP-TTLS/TLS, EAP-FAST/TLS) to support different + CA certificate configuration between Phase 1 and Phase 2 + * added optional "auto" parameter for p2p_connect to request + automatic GO Negotiation vs. join-a-group selection + * added disabled_scan_offload parameter to disable automatic scan + offloading (sched_scan) + * added optional persistent=<network id> parameter for + p2p_connect to allow forcing of a specific SSID/passphrase for + GO Negotiation + * added support for OBSS scan requests and 20/40 BSS coexistence + reports + * reject PD Request for unknown group + * removed scripts and notes related to Windows binary releases + (which have not been used starting from 1.x) + * added initial support for WNM operations + - Keep-alive based on BSS max idle period + - WNM-Sleep Mode + - minimal BSS Transition Management processing + * added autoscan module to control scanning behavior while not ++++ 1158 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:13.1:Update/.wpa_supplicant.3727.new/wpa_supplicant.changes New: ---- 0001-Add-os_exec-helper-to-run-external-programs.patch 0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch 0002-wpa_cli-Use-os_exec-for-action-script-execution.patch config fi.epitest.hostap.WPASupplicant.service fi.w1.wpa_supplicant1.service logrotate.wpa_supplicant wpa_supplicant-2.0.tar.gz wpa_supplicant-driver-wext-debug.patch wpa_supplicant-errormsg.patch wpa_supplicant-flush-debug-output.patch wpa_supplicant-sigusr1-changes-debuglevel.patch wpa_supplicant.changes wpa_supplicant.conf wpa_supplicant.service wpa_supplicant.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wpa_supplicant.spec ++++++ # # spec file for package wpa_supplicant # # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: wpa_supplicant BuildRequires: dbus-1-devel BuildRequires: libqt4 BuildRequires: libqt4-devel BuildRequires: openssl-devel BuildRequires: pkg-config BuildRequires: readline-devel %if 0%{?suse_version} > 1230 BuildRequires: systemd-rpm-macros %systemd_requires %endif %if 0%{?suse_version} > 1140 BuildRequires: libnl-1_1-devel BuildRequires: libnl3-devel %else BuildRequires: libnl-devel %endif Url: http://hostap.epitest.fi/wpa_supplicant/ Version: 2.0 Release: 0 Summary: WPA supplicant implementation License: BSD-3-Clause and GPL-2.0+ Group: Productivity/Networking/Other Source: http://hostap.epitest.fi/releases/wpa_supplicant-%{version}.tar.gz Source1: config Source2: %{name}.conf Source3: fi.epitest.hostap.WPASupplicant.service Source4: logrotate.wpa_supplicant Source5: fi.w1.wpa_supplicant1.service Source6: wpa_supplicant.service Patch0: wpa_supplicant-driver-wext-debug.patch # wpa_supplicant-flush-debug-output.patch won't go upstream as it might # change timings Patch1: wpa_supplicant-flush-debug-output.patch # wpa_supplicant-sigusr1-changes-debuglevel.patch won't go upstream as it # is not portable Patch2: wpa_supplicant-sigusr1-changes-debuglevel.patch Patch3: wpa_supplicant-errormsg.patch # CVE-2014-3686 Patch4: 0001-Add-os_exec-helper-to-run-external-programs.patch Patch5: 0002-wpa_cli-Use-os_exec-for-action-script-execution.patch # CVE-2015-1863 Patch6: 0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: logrotate %description wpa_supplicant is an implementation of the WPA Supplicant component, i.e., the part that runs in the client stations. It implements key negotiation with a WPA Authenticator and it controls the roaming and IEEE 802.11 authentication/association of the wlan driver. Authors: -------- Jouni Malinen <jkmaline(a)cc.hut.fi> %package gui Summary: WPA supplicant graphical front-end Group: System/Monitoring Requires: wpa_supplicant %description gui This package contains a graphical front-end to wpa_supplicant, an implementation of the WPA Supplicant component. Authors: -------- Jouni Malinen <jkmaline(a)cc.hut.fi> %prep %setup -q -n wpa_supplicant-%{version} rm -rf wpa_supplicant-%{version}/patches cp %{SOURCE1} wpa_supplicant/.config %if 0%{?suse_version} > 1140 echo "CONFIG_LIBNL32=y" >> wpa_supplicant/.config %endif %patch0 -p0 %patch1 -p0 %patch2 -p0 %patch3 -p0 %patch4 -p1 %patch5 -p1 %patch6 -p1 %build cd wpa_supplicant CFLAGS="$RPM_OPT_FLAGS" make V=1 %{?_smp_mflags} cd wpa_gui-qt4 qmake QMAKE_CXXFLAGS="$RPM_OPT_FLAGS" QMAKE_CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags} %install install -d %{buildroot}/%{_sbindir} install -m 0755 wpa_supplicant/wpa_cli %{buildroot}%{_sbindir} install -m 0755 wpa_supplicant/wpa_passphrase %{buildroot}%{_sbindir} install -m 0755 wpa_supplicant/wpa_supplicant %{buildroot}%{_sbindir} install -d %{buildroot}%{_sysconfdir}/dbus-1/system.d install -m 0644 wpa_supplicant/dbus/dbus-wpa_supplicant.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/wpa_supplicant.conf install -d %{buildroot}/%{_sysconfdir}/%{name} install -m 0600 %{SOURCE2} %{buildroot}/%{_sysconfdir}/%{name} install -d %{buildroot}/%{_datadir}/dbus-1/system-services install -m 0644 %{SOURCE3} %{buildroot}/%{_datadir}/dbus-1/system-services install -m 0644 %{SOURCE5} %{buildroot}/%{_datadir}/dbus-1/system-services install -d %{buildroot}/%{_sysconfdir}/logrotate.d/ install -m 644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/logrotate.d/wpa_supplicant install -d %{buildroot}/%{_localstatedir}/run/%{name} install -d %{buildroot}%{_mandir}/man{5,8} install -m 0644 wpa_supplicant/doc/docbook/*.8 %{buildroot}%{_mandir}/man8 install -m 0644 wpa_supplicant/doc/docbook/*.5 %{buildroot}%{_mandir}/man5 install -m 755 wpa_supplicant/wpa_gui-qt4/wpa_gui %{buildroot}%{_sbindir} %if 0%{?suse_version} > 1230 install -d %{buildroot}%{_unitdir} install -m 0644 %{SOURCE6} %{buildroot}%{_unitdir} %endif %if 0%{?suse_version} > 1230 %pre %service_add_pre wpa_supplicant.service %post %service_add_post wpa_supplicant.service systemctl --quiet enable wpa_supplicant.service || : %preun %service_del_preun wpa_supplicant.service %postun %service_del_postun wpa_supplicant.service %endif %files %defattr(-,root,root) %doc wpa_supplicant/ChangeLog COPYING README wpa_supplicant/todo.txt wpa_supplicant/examples wpa_supplicant/wpa_supplicant.conf %{_sbindir}/wpa_cli %{_sbindir}/wpa_passphrase %{_sbindir}/wpa_supplicant %config %{_sysconfdir}/dbus-1/system.d/%{name}.conf %{_datadir}/dbus-1/system-services %config %{_sysconfdir}/%{name}/%{name}.conf %config(noreplace) %{_sysconfdir}/logrotate.d/wpa_supplicant %dir %{_localstatedir}/run/%{name} %if 0%{?suse_version} > 1140 %ghost %{_localstatedir}/run/%{name} %endif %if 0%{?suse_version} > 1230 %{_unitdir}/wpa_supplicant.service %endif %dir %{_sysconfdir}/%{name} %doc %{_mandir}/man8/* %doc %{_mandir}/man5/* %files gui %defattr(-,root,root) /usr/sbin/wpa_gui %changelog ++++++ 0001-Add-os_exec-helper-to-run-external-programs.patch ++++++ >From 89de07a9442072f88d49869d8ecd8d42bae050a0 Mon Sep 17 00:00:00 2001 From: Jouni Malinen <jouni(a)qca.qualcomm.com> Date: Mon, 6 Oct 2014 16:27:44 +0300 Subject: [PATCH 1/3] Add os_exec() helper to run external programs Signed-off-by: Jouni Malinen <jouni(a)qca.qualcomm.com> ================================================================================ --- wpa_supplicant-2.0/src/utils/os.h +++ wpa_supplicant-2.0/src/utils/os.h @@ -506,6 +506,14 @@ */ size_t os_strlcpy(char *dest, const char *src, size_t siz); +/** + * os_exec - Execute an external program + * @program: Path to the program + * @arg: Command line argument string + * @wait_completion: Whether to wait until the program execution completes + * Returns: 0 on success, -1 on error + */ +int os_exec(const char *program, const char *arg, int wait_completion); #ifdef OS_REJECT_C_LIB_FUNCTIONS #define malloc OS_DO_NOT_USE_malloc --- wpa_supplicant-2.0/src/utils/os_unix.c +++ wpa_supplicant-2.0/src/utils/os_unix.c @@ -9,6 +9,7 @@ #include "includes.h" #include <time.h> +#include <sys/wait.h> #ifdef ANDROID #include <linux/capability.h> @@ -486,3 +487,57 @@ } #endif /* WPA_TRACE */ + + +int os_exec(const char *program, const char *arg, int wait_completion) +{ + pid_t pid; + int pid_status; + + pid = fork(); + if (pid < 0) { + perror("fork"); + return -1; + } + + if (pid == 0) { + /* run the external command in the child process */ + const int MAX_ARG = 30; + char *_program, *_arg, *pos; + char *argv[MAX_ARG + 1]; + int i; + + _program = os_strdup(program); + _arg = os_strdup(arg); + + argv[0] = _program; + + i = 1; + pos = _arg; + while (i < MAX_ARG && pos && *pos) { + while (*pos == ' ') + pos++; + if (*pos == '\0') + break; + argv[i++] = pos; + pos = os_strchr(pos, ' '); + if (pos) + *pos++ = '\0'; + } + argv[i] = NULL; + + execv(program, argv); + perror("execv"); + os_free(_program); + os_free(_arg); + exit(0); + return -1; + } + + if (wait_completion) { + /* wait for the child process to complete in the parent */ + waitpid(pid, &pid_status, 0); + } + + return 0; +} --- wpa_supplicant-2.0/src/utils/os_win32.c +++ wpa_supplicant-2.0/src/utils/os_win32.c @@ -233,3 +233,9 @@ return s - src - 1; } + +int os_exec(const char *program, const char *arg, int wait_completion) +{ + return -1; +} + ++++++ 0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch ++++++ >From 2674f84b8fb95d1b79f946e2c51e9d5173305085 Mon Sep 17 00:00:00 2001 From: Jouni Malinen <jouni(a)qca.qualcomm.com> Date: Tue, 7 Apr 2015 11:32:11 +0300 Subject: [PATCH] P2P: Validate SSID element length before copying it (CVE-2015-1863) This fixes a possible memcpy overflow for P2P dev->oper_ssid in p2p_add_device(). The length provided by the peer device (0..255 bytes) was used without proper bounds checking and that could have resulted in arbitrary data of up to 223 bytes being written beyond the end of the dev->oper_ssid[] array (of which about 150 bytes would be beyond the heap allocation) when processing a corrupted management frame for P2P peer discovery purposes. This could result in corrupted state in heap, unexpected program behavior due to corrupted P2P peer device information, denial of service due to process crash, exposure of memory contents during GO Negotiation, and potentially arbitrary code execution. Thanks to Google security team for reporting this issue and smart hardware research group of Alibaba security team for discovering it. Signed-off-by: Jouni Malinen <jouni(a)qca.qualcomm.com> --- src/p2p/p2p.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c index f584fae..a45fe73 100644 --- a/src/p2p/p2p.c +++ b/src/p2p/p2p.c @@ -778,6 +778,7 @@ int p2p_add_device(struct p2p_data *p2p, const u8 *addr, int freq, if (os_memcmp(addr, p2p_dev_addr, ETH_ALEN) != 0) os_memcpy(dev->interface_addr, addr, ETH_ALEN); if (msg.ssid && + msg.ssid[1] <= sizeof(dev->oper_ssid) && (msg.ssid[1] != P2P_WILDCARD_SSID_LEN || os_memcmp(msg.ssid + 2, P2P_WILDCARD_SSID, P2P_WILDCARD_SSID_LEN) != 0)) { -- 1.9.1 ++++++ 0002-wpa_cli-Use-os_exec-for-action-script-execution.patch ++++++ >From c5f258de76dbb67fb64beab39a99e5c5711f41fe Mon Sep 17 00:00:00 2001 From: Jouni Malinen <jouni(a)qca.qualcomm.com> Date: Mon, 6 Oct 2014 17:25:52 +0300 Subject: [PATCH 2/3] wpa_cli: Use os_exec() for action script execution Use os_exec() to run the action script operations to avoid undesired command line processing for control interface event strings. Previously, it could have been possible for some of the event strings to include unsanitized data which is not suitable for system() use. (CVE-2014-3686) Signed-off-by: Jouni Malinen <jouni(a)qca.qualcomm.com> --- wpa_supplicant/wpa_cli.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/wpa_supplicant/wpa_cli.c b/wpa_supplicant/wpa_cli.c index 18b9b77..fe30b41 100644 --- a/wpa_supplicant/wpa_cli.c +++ b/wpa_supplicant/wpa_cli.c @@ -3159,28 +3159,19 @@ static int str_match(const char *a, const char *b) static int wpa_cli_exec(const char *program, const char *arg1, const char *arg2) { - char *cmd; + char *arg; size_t len; int res; - int ret = 0; - len = os_strlen(program) + os_strlen(arg1) + os_strlen(arg2) + 3; - cmd = os_malloc(len); - if (cmd == NULL) - return -1; - res = os_snprintf(cmd, len, "%s %s %s", program, arg1, arg2); - if (res < 0 || (size_t) res >= len) { - os_free(cmd); + len = os_strlen(arg1) + os_strlen(arg2) + 2; + arg = os_malloc(len); + if (arg == NULL) return -1; - } - cmd[len - 1] = '\0'; -#ifndef _WIN32_WCE - if (system(cmd) < 0) - ret = -1; -#endif /* _WIN32_WCE */ - os_free(cmd); + os_snprintf(arg, len, "%s %s", arg1, arg2); + res = os_exec(program, arg, 1); + os_free(arg); - return ret; + return res; } -- 1.9.1 ++++++ config ++++++ # Example wpa_supplicant build time configuration # # This file lists the configuration options that are used when building the # hostapd binary. All lines starting with # are ignored. Configuration option # lines must be commented out complete, if they are not to be included, i.e., # just setting VARIABLE=n is not disabling that variable. # # This file is included in Makefile, so variables like CFLAGS and LIBS can also # be modified from here. In most cases, these lines should use += in order not # to override previous values of the variables. # Uncomment following two lines and fix the paths if you have installed OpenSSL # or GnuTLS in non-default location #CFLAGS += -I/usr/local/openssl/include #LIBS += -L/usr/local/openssl/lib # Some Red Hat versions seem to include kerberos header files from OpenSSL, but # the kerberos files are not in the default include path. Following line can be # used to fix build issues on such systems (krb5.h not found). #CFLAGS += -I/usr/include/kerberos # Example configuration for various cross-compilation platforms #### sveasoft (e.g., for Linksys WRT54G) ###################################### #CC=mipsel-uclibc-gcc #CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc #CFLAGS += -Os #CPPFLAGS += -I../src/include -I../../src/router/openssl/include #LIBS += -L/opt/brcm/hndtools-mipsel-uclibc-0.9.19/lib -lssl ############################################################################### #### openwrt (e.g., for Linksys WRT54G) ####################################### #CC=mipsel-uclibc-gcc #CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc #CFLAGS += -Os #CPPFLAGS=-I../src/include -I../openssl-0.9.7d/include \ # -I../WRT54GS/release/src/include #LIBS = -lssl ############################################################################### # Driver interface for Host AP driver CONFIG_DRIVER_HOSTAP=y # Driver interface for Agere driver #CONFIG_DRIVER_HERMES=y # Change include directories to match with the local setup #CFLAGS += -I../../hcf -I../../include -I../../include/hcf #CFLAGS += -I../../include/wireless # Driver interface for madwifi driver # Deprecated; use CONFIG_DRIVER_WEXT=y instead. #CONFIG_DRIVER_MADWIFI=y # Set include directory to the madwifi source tree #CFLAGS += -I../../madwifi # Driver interface for ndiswrapper # Deprecated; use CONFIG_DRIVER_WEXT=y instead. CONFIG_DRIVER_NDISWRAPPER=y # Driver interface for Atmel driver CONFIG_DRIVER_ATMEL=y # Driver interface for old Broadcom driver # Please note that the newer Broadcom driver ("hybrid Linux driver") supports # Linux wireless extensions and does not need (or even work) with the old # driver wrapper. Use CONFIG_DRIVER_WEXT=y with that driver. #CONFIG_DRIVER_BROADCOM=y # Example path for wlioctl.h; change to match your configuration #CFLAGS += -I/opt/WRT54GS/release/src/include # Driver interface for Intel ipw2100/2200 driver # Deprecated; use CONFIG_DRIVER_WEXT=y instead. #CONFIG_DRIVER_IPW=y # Driver interface for Ralink driver #CONFIG_DRIVER_RALINK=y # Driver interface for generic Linux wireless extensions # Note: WEXT is deprecated in the current Linux kernel version and no new # functionality is added to it. nl80211-based interface is the new # replacement for WEXT and its use allows wpa_supplicant to properly control # the driver to improve existing functionality like roaming and to support new # functionality. CONFIG_DRIVER_WEXT=y # Driver interface for Linux drivers using the nl80211 kernel interface CONFIG_DRIVER_NL80211=y # Driver interface for FreeBSD net80211 layer (e.g., Atheros driver) #CONFIG_DRIVER_BSD=y #CFLAGS += -I/usr/local/include #LIBS += -L/usr/local/lib #LIBS_p += -L/usr/local/lib #LIBS_c += -L/usr/local/lib # Driver interface for Windows NDIS #CONFIG_DRIVER_NDIS=y #CFLAGS += -I/usr/include/w32api/ddk #LIBS += -L/usr/local/lib # For native build using mingw #CONFIG_NATIVE_WINDOWS=y # Additional directories for cross-compilation on Linux host for mingw target #CFLAGS += -I/opt/mingw/mingw32/include/ddk #LIBS += -L/opt/mingw/mingw32/lib #CC=mingw32-gcc # By default, driver_ndis uses WinPcap for low-level operations. This can be # replaced with the following option which replaces WinPcap calls with NDISUIO. # However, this requires that WZC is disabled (net stop wzcsvc) before starting # wpa_supplicant. # CONFIG_USE_NDISUIO=y # Driver interface for development testing #CONFIG_DRIVER_TEST=y # Driver interface for wired Ethernet drivers CONFIG_DRIVER_WIRED=y # Driver interface for the Broadcom RoboSwitch family #CONFIG_DRIVER_ROBOSWITCH=y # Driver interface for no driver (e.g., WPS ER only) #CONFIG_DRIVER_NONE=y # Solaris libraries #LIBS += -lsocket -ldlpi -lnsl #LIBS_c += -lsocket # Enable IEEE 802.1X Supplicant (automatically included if any EAP method is # included) CONFIG_IEEE8021X_EAPOL=y # EAP-MD5 CONFIG_EAP_MD5=y # EAP-MSCHAPv2 CONFIG_EAP_MSCHAPV2=y # EAP-TLS CONFIG_EAP_TLS=y # EAL-PEAP CONFIG_EAP_PEAP=y # EAP-TTLS CONFIG_EAP_TTLS=y # EAP-FAST # Note: Default OpenSSL package does not include support for all the # functionality needed for EAP-FAST. If EAP-FAST is enabled with OpenSSL, # the OpenSSL library must be patched (openssl-0.9.8d-tls-extensions.patch) # to add the needed functions. #CONFIG_EAP_FAST=y # EAP-GTC CONFIG_EAP_GTC=y # EAP-OTP CONFIG_EAP_OTP=y # EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used) #CONFIG_EAP_SIM=y # EAP-PSK (experimental; this is _not_ needed for WPA-PSK) CONFIG_EAP_PSK=y # EAP-pwd (secure authentication using only a password) #CONFIG_EAP_PWD=y # EAP-PAX CONFIG_EAP_PAX=y # LEAP CONFIG_EAP_LEAP=y # EAP-AKA (enable CONFIG_PCSC, if EAP-AKA is used) #CONFIG_EAP_AKA=y # EAP-AKA' (enable CONFIG_PCSC, if EAP-AKA' is used). # This requires CONFIG_EAP_AKA to be enabled, too. #CONFIG_EAP_AKA_PRIME=y # Enable USIM simulator (Milenage) for EAP-AKA #CONFIG_USIM_SIMULATOR=y # EAP-SAKE CONFIG_EAP_SAKE=y # EAP-GPSK CONFIG_EAP_GPSK=y # Include support for optional SHA256 cipher suite in EAP-GPSK CONFIG_EAP_GPSK_SHA256=y # EAP-TNC and related Trusted Network Connect support (experimental) CONFIG_EAP_TNC=y # Wi-Fi Protected Setup (WPS) CONFIG_WPS=y # Enable WSC 2.0 support CONFIG_WPS2=y # Enable WPS external registrar functionality CONFIG_WPS_ER=y # Disable credentials for an open network by default when acting as a WPS # registrar. #CONFIG_WPS_REG_DISABLE_OPEN=y # Enable WPS support with NFC config method #CONFIG_WPS_NFC=y # EAP-IKEv2 CONFIG_EAP_IKEV2=y # PKCS#12 (PFX) support (used to read private key and certificate file from # a file that usually has extension .p12 or .pfx) CONFIG_PKCS12=y # Smartcard support (i.e., private key on a smartcard), e.g., with openssl # engine. CONFIG_SMARTCARD=y # PC/SC interface for smartcards (USIM, GSM SIM) # Enable this if EAP-SIM or EAP-AKA is included #CONFIG_PCSC=y # Support HT overrides (disable HT/HT40, mask MCS rates, etc.) #CONFIG_HT_OVERRIDES=y # Development testing #CONFIG_EAPOL_TEST=y # Select control interface backend for external programs, e.g, wpa_cli: # unix = UNIX domain sockets (default for Linux/*BSD) # udp = UDP sockets using localhost (127.0.0.1) # named_pipe = Windows Named Pipe (default for Windows) # udp-remote = UDP sockets with remote access (only for tests systems/purpose) # y = use default (backwards compatibility) # If this option is commented out, control interface is not included in the # build. CONFIG_CTRL_IFACE=y # Include support for GNU Readline and History Libraries in wpa_cli. # When building a wpa_cli binary for distribution, please note that these # libraries are licensed under GPL and as such, BSD license may not apply for # the resulting binary. #CONFIG_READLINE=y # Include internal line edit mode in wpa_cli. This can be used as a replacement # for GNU Readline to provide limited command line editing and history support. #CONFIG_WPA_CLI_EDIT=y # Remove debugging code that is printing out debug message to stdout. # This can be used to reduce the size of the wpa_supplicant considerably # if debugging code is not needed. The size reduction can be around 35% # (e.g., 90 kB). #CONFIG_NO_STDOUT_DEBUG=y # Remove WPA support, e.g., for wired-only IEEE 802.1X supplicant, to save # 35-50 kB in code size. #CONFIG_NO_WPA=y # Remove WPA2 support. This allows WPA to be used, but removes WPA2 code to # save about 1 kB in code size when building only WPA-Personal (no EAP support) # or 6 kB if building for WPA-Enterprise. #CONFIG_NO_WPA2=y # Remove IEEE 802.11i/WPA-Personal ASCII passphrase support # This option can be used to reduce code size by removing support for # converting ASCII passphrases into PSK. If this functionality is removed, the # PSK can only be configured as the 64-octet hexstring (e.g., from # wpa_passphrase). This saves about 0.5 kB in code size. #CONFIG_NO_WPA_PASSPHRASE=y # Disable scan result processing (ap_mode=1) to save code size by about 1 kB. # This can be used if ap_scan=1 mode is never enabled. #CONFIG_NO_SCAN_PROCESSING=y # Select configuration backend: # file = text file (e.g., wpa_supplicant.conf; note: the configuration file # path is given on command line, not here; this option is just used to # select the backend that allows configuration files to be used) # winreg = Windows registry (see win_example.reg for an example) CONFIG_BACKEND=file # Remove configuration write functionality (i.e., to allow the configuration # file to be updated based on runtime configuration changes). The runtime # configuration can still be changed, the changes are just not going to be # persistent over restarts. This option can be used to reduce code size by # about 3.5 kB. #CONFIG_NO_CONFIG_WRITE=y # Remove support for configuration blobs to reduce code size by about 1.5 kB. #CONFIG_NO_CONFIG_BLOBS=y # Select program entry point implementation: # main = UNIX/POSIX like main() function (default) # main_winsvc = Windows service (read parameters from registry) # main_none = Very basic example (development use only) #CONFIG_MAIN=main # Select wrapper for operatins system and C library specific functions # unix = UNIX/POSIX like systems (default) # win32 = Windows systems # none = Empty template #CONFIG_OS=unix # Select event loop implementation # eloop = select() loop (default) # eloop_win = Windows events and WaitForMultipleObject() loop # eloop_none = Empty template #CONFIG_ELOOP=eloop # Should we use poll instead of select? Select is used by default. #CONFIG_ELOOP_POLL=y # Select layer 2 packet implementation # linux = Linux packet socket (default) # pcap = libpcap/libdnet/WinPcap # freebsd = FreeBSD libpcap # winpcap = WinPcap with receive thread # ndis = Windows NDISUIO (note: requires CONFIG_USE_NDISUIO=y) # none = Empty template #CONFIG_L2_PACKET=linux # PeerKey handshake for Station to Station Link (IEEE 802.11e DLS) CONFIG_PEERKEY=y # IEEE 802.11w (management frame protection), also known as PMF # Driver support is also needed for IEEE 802.11w. CONFIG_IEEE80211W=y # Select TLS implementation # openssl = OpenSSL (default) # gnutls = GnuTLS # internal = Internal TLSv1 implementation (experimental) # none = Empty template #CONFIG_TLS=openssl # TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.1) # can be enabled to get a stronger construction of messages when block ciphers # are used. It should be noted that some existing TLS v1.0 -based # implementation may not be compatible with TLS v1.1 message (ClientHello is # sent prior to negotiating which version will be used) #CONFIG_TLSV11=y # TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.2) # can be enabled to enable use of stronger crypto algorithms. It should be # noted that some existing TLS v1.0 -based implementation may not be compatible # with TLS v1.2 message (ClientHello is sent prior to negotiating which version # will be used) #CONFIG_TLSV12=y # If CONFIG_TLS=internal is used, additional library and include paths are # needed for LibTomMath. Alternatively, an integrated, minimal version of # LibTomMath can be used. See beginning of libtommath.c for details on benefits # and drawbacks of this option. #CONFIG_INTERNAL_LIBTOMMATH=y #ifndef CONFIG_INTERNAL_LIBTOMMATH #LTM_PATH=/usr/src/libtommath-0.39 #CFLAGS += -I$(LTM_PATH) #LIBS += -L$(LTM_PATH) #LIBS_p += -L$(LTM_PATH) #endif # At the cost of about 4 kB of additional binary size, the internal LibTomMath # can be configured to include faster routines for exptmod, sqr, and div to # speed up DH and RSA calculation considerably #CONFIG_INTERNAL_LIBTOMMATH_FAST=y # Include NDIS event processing through WMI into wpa_supplicant/wpasvc. # This is only for Windows builds and requires WMI-related header files and # WbemUuid.Lib from Platform SDK even when building with MinGW. #CONFIG_NDIS_EVENTS_INTEGRATED=y #PLATFORMSDKLIB="/opt/Program Files/Microsoft Platform SDK/Lib" # Add support for old DBus control interface # (fi.epitest.hostap.WPASupplicant) CONFIG_CTRL_IFACE_DBUS=y # Add support for new DBus control interface # (fi.w1.hostap.wpa_supplicant1) CONFIG_CTRL_IFACE_DBUS_NEW=y # Add introspection support for new DBus control interface CONFIG_CTRL_IFACE_DBUS_INTRO=y # Add support for loading EAP methods dynamically as shared libraries. # When this option is enabled, each EAP method can be either included # statically (CONFIG_EAP_<method>=y) or dynamically (CONFIG_EAP_<method>=dyn). # Dynamic EAP methods are build as shared objects (eap_*.so) and they need to # be loaded in the beginning of the wpa_supplicant configuration file # (see load_dynamic_eap parameter in the example file) before being used in # the network blocks. # # Note that some shared parts of EAP methods are included in the main program # and in order to be able to use dynamic EAP methods using these parts, the # main program must have been build with the EAP method enabled (=y or =dyn). # This means that EAP-TLS/PEAP/TTLS/FAST cannot be added as dynamic libraries # unless at least one of them was included in the main build to force inclusion # of the shared code. Similarly, at least one of EAP-SIM/AKA must be included # in the main build to be able to load these methods dynamically. # # Please also note that using dynamic libraries will increase the total binary # size. Thus, it may not be the best option for targets that have limited # amount of memory/flash. #CONFIG_DYNAMIC_EAP_METHODS=y # IEEE Std 802.11r-2008 (Fast BSS Transition) #CONFIG_IEEE80211R=y # Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt) CONFIG_DEBUG_FILE=y # Send debug messages to syslog instead of stdout #CONFIG_DEBUG_SYSLOG=y # Set syslog facility for debug messages #CONFIG_DEBUG_SYSLOG_FACILITY=LOG_DAEMON # Add support for sending all debug messages (regardless of debug verbosity) # to the Linux kernel tracing facility. This helps debug the entire stack by # making it easy to record everything happening from the driver up into the # same file, e.g., using trace-cmd. #CONFIG_DEBUG_LINUX_TRACING=y # Enable privilege separation (see README 'Privilege separation' for details) #CONFIG_PRIVSEP=y # Enable mitigation against certain attacks against TKIP by delaying Michael # MIC error reports by a random amount of time between 0 and 60 seconds #CONFIG_DELAYED_MIC_ERROR_REPORT=y # Enable tracing code for developer debugging # This tracks use of memory allocations and other registrations and reports # incorrect use with a backtrace of call (or allocation) location. #CONFIG_WPA_TRACE=y # For BSD, uncomment these. #LIBS += -lexecinfo #LIBS_p += -lexecinfo #LIBS_c += -lexecinfo # Use libbfd to get more details for developer debugging # This enables use of libbfd to get more detailed symbols for the backtraces # generated by CONFIG_WPA_TRACE=y. #CONFIG_WPA_TRACE_BFD=y # For BSD, uncomment these. #LIBS += -lbfd -liberty -lz #LIBS_p += -lbfd -liberty -lz #LIBS_c += -lbfd -liberty -lz # wpa_supplicant depends on strong random number generation being available # from the operating system. os_get_random() function is used to fetch random # data when needed, e.g., for key generation. On Linux and BSD systems, this # works by reading /dev/urandom. It should be noted that the OS entropy pool # needs to be properly initialized before wpa_supplicant is started. This is # important especially on embedded devices that do not have a hardware random # number generator and may by default start up with minimal entropy available # for random number generation. # # As a safety net, wpa_supplicant is by default trying to internally collect # additional entropy for generating random data to mix in with the data fetched # from the OS. This by itself is not considered to be very strong, but it may # help in cases where the system pool is not initialized properly. However, it # is very strongly recommended that the system pool is initialized with enough # entropy either by using hardware assisted random number generator or by # storing state over device reboots. # # wpa_supplicant can be configured to maintain its own entropy store over # restarts to enhance random number generation. This is not perfect, but it is # much more secure than using the same sequence of random numbers after every # reboot. This can be enabled with -e<entropy file> command line option. The # specified file needs to be readable and writable by wpa_supplicant. # # If the os_get_random() is known to provide strong random data (e.g., on # Linux/BSD, the board in question is known to have reliable source of random # data from /dev/urandom), the internal wpa_supplicant random pool can be # disabled. This will save some in binary size and CPU use. However, this # should only be considered for builds that are known to be used on devices # that meet the requirements described above. #CONFIG_NO_RANDOM_POOL=y # IEEE 802.11n (High Throughput) support (mainly for AP mode) CONFIG_IEEE80211N=y # Wireless Network Management (IEEE Std 802.11v-2011) # Note: This is experimental and not complete implementation. #CONFIG_WNM=y # Interworking (IEEE 802.11u) # This can be used to enable functionality to improve interworking with # external networks (GAS/ANQP to learn more about the networks and network # selection based on available credentials). #CONFIG_INTERWORKING=y # Hotspot 2.0 #CONFIG_HS20=y # AP mode operations with wpa_supplicant # This can be used for controlling AP mode operations with wpa_supplicant. It # should be noted that this is mainly aimed at simple cases like # WPA2-Personal while more complex configurations like WPA2-Enterprise with an # external RADIUS server can be supported with hostapd. CONFIG_AP=y # P2P (Wi-Fi Direct) # This can be used to enable P2P support in wpa_supplicant. See README-P2P for # more information on P2P operations. CONFIG_P2P=y # Autoscan # This can be used to enable automatic scan support in wpa_supplicant. # See wpa_supplicant.conf for more information on autoscan usage. # # Enabling directly a module will enable autoscan support. # For exponential module: #CONFIG_AUTOSCAN_EXPONENTIAL=y # For periodic module: #CONFIG_AUTOSCAN_PERIODIC=y # Password (and passphrase, etc.) backend for external storage # These optional mechanisms can be used to add support for storing passwords # and other secrets in external (to wpa_supplicant) location. This allows, for # example, operating system specific key storage to be used # # External password backend for testing purposes (developer use) #CONFIG_EXT_PASSWORD_TEST=y # Enable background scan to improve roaming CONFIG_BGSCAN_SIMPLE=y # Enable RSN IBSS/AdHoc CONFIG_IBSS_RSN=y ++++++ fi.epitest.hostap.WPASupplicant.service ++++++ [D-BUS Service] Name=fi.epitest.hostap.WPASupplicant Exec=/usr/sbin/wpa_supplicant -c /etc/wpa_supplicant/wpa_supplicant.conf -u -f /var/log/wpa_supplicant.log User=root ++++++ fi.w1.wpa_supplicant1.service ++++++ [D-BUS Service] Name=fi.w1.wpa_supplicant1 Exec=/usr/sbin/wpa_supplicant -c /etc/wpa_supplicant/wpa_supplicant.conf -u -f /var/log/wpa_supplicant.log User=root ++++++ logrotate.wpa_supplicant ++++++ /var/log/wpa_supplicant.log { compress dateext maxage 365 rotate 99 missingok notifempty size +4096k copytruncate } ++++++ wpa_supplicant-driver-wext-debug.patch ++++++ Index: src/drivers/driver_wext.c =================================================================== --- src/drivers/driver_wext.c.orig +++ src/drivers/driver_wext.c @@ -1901,19 +1901,26 @@ int wpa_driver_wext_associate(void *priv * SIOCSIWENCODE here. */ if (drv->auth_alg_fallback && - wpa_driver_wext_auth_alg_fallback(drv, params) < 0) + wpa_driver_wext_auth_alg_fallback(drv, params) < 0) { + wpa_printf(MSG_DEBUG, "%s: assoc failed because auth_alg_fallback failed", __FUNCTION__); ret = -1; + } if (!params->bssid && - wpa_driver_wext_set_bssid(drv, NULL) < 0) + wpa_driver_wext_set_bssid(drv, NULL) < 0) { + wpa_printf(MSG_DEBUG, "%s: assoc failed because set_bssid failed", __FUNCTION__); ret = -1; + } /* TODO: should consider getting wpa version and cipher/key_mgmt suites * from configuration, not from here, where only the selected suite is * available */ if (wpa_driver_wext_set_gen_ie(drv, params->wpa_ie, params->wpa_ie_len) - < 0) + < 0) { + wpa_printf(MSG_DEBUG, "%s: assoc failed because set_gen_ie failed", __FUNCTION__); ret = -1; + } + if (params->wpa_ie == NULL || params->wpa_ie_len == 0) value = IW_AUTH_WPA_VERSION_DISABLED; else if (params->wpa_ie[0] == WLAN_EID_RSN) @@ -1921,27 +1928,41 @@ int wpa_driver_wext_associate(void *priv else value = IW_AUTH_WPA_VERSION_WPA; if (wpa_driver_wext_set_auth_param(drv, - IW_AUTH_WPA_VERSION, value) < 0) + IW_AUTH_WPA_VERSION, value) < 0) { + wpa_printf(MSG_DEBUG, "%s: assoc failed because set_auth_param(WPA_VERSION) failed", __FUNCTION__); ret = -1; + } + value = wpa_driver_wext_cipher2wext(params->pairwise_suite); if (wpa_driver_wext_set_auth_param(drv, - IW_AUTH_CIPHER_PAIRWISE, value) < 0) + IW_AUTH_CIPHER_PAIRWISE, value) < 0) { + wpa_printf(MSG_DEBUG, "%s: assoc failed because set_auth_param(CIPHER_PAIRWISE) failed", __FUNCTION__); ret = -1; + } + value = wpa_driver_wext_cipher2wext(params->group_suite); if (wpa_driver_wext_set_auth_param(drv, - IW_AUTH_CIPHER_GROUP, value) < 0) + IW_AUTH_CIPHER_GROUP, value) < 0) { + wpa_printf(MSG_DEBUG, "%s: assoc failed because set_auth_param(CIPHER_GROUP) failed", __FUNCTION__); ret = -1; + } + value = wpa_driver_wext_keymgmt2wext(params->key_mgmt_suite); if (wpa_driver_wext_set_auth_param(drv, - IW_AUTH_KEY_MGMT, value) < 0) + IW_AUTH_KEY_MGMT, value) < 0) { + wpa_printf(MSG_DEBUG, "%s: assoc failed because set_auth_param(KEY_MGMT) failed", __FUNCTION__); ret = -1; + } + value = params->key_mgmt_suite != KEY_MGMT_NONE || params->pairwise_suite != CIPHER_NONE || params->group_suite != CIPHER_NONE || params->wpa_ie_len; if (wpa_driver_wext_set_auth_param(drv, - IW_AUTH_PRIVACY_INVOKED, value) < 0) + IW_AUTH_PRIVACY_INVOKED, value) < 0) { + wpa_printf(MSG_DEBUG, "%s: assoc failed because set_auth_param(PRIVACY_INVOKED) failed", __FUNCTION__); ret = -1; + } /* Allow unencrypted EAPOL messages even if pairwise keys are set when * not using WPA. IEEE 802.1X specifies that these frames are not @@ -1952,12 +1973,18 @@ int wpa_driver_wext_associate(void *priv else allow_unencrypted_eapol = 1; - if (wpa_driver_wext_set_psk(drv, params->psk) < 0) + if (wpa_driver_wext_set_psk(drv, params->psk) < 0) { + wpa_printf(MSG_DEBUG, "%s: assoc failed because set_psk failed", __FUNCTION__); ret = -1; + } + if (wpa_driver_wext_set_auth_param(drv, IW_AUTH_RX_UNENCRYPTED_EAPOL, - allow_unencrypted_eapol) < 0) + allow_unencrypted_eapol) < 0) { + wpa_printf(MSG_DEBUG, "%s: assoc failed because set_auth_param(RX_UNENCRYPTED_EAPOL) failed", __FUNCTION__); ret = -1; + } + #ifdef CONFIG_IEEE80211W switch (params->mgmt_frame_protection) { case NO_MGMT_FRAME_PROTECTION: @@ -1970,17 +1997,25 @@ int wpa_driver_wext_associate(void *priv value = IW_AUTH_MFP_REQUIRED; break; }; - if (wpa_driver_wext_set_auth_param(drv, IW_AUTH_MFP, value) < 0) + if (wpa_driver_wext_set_auth_param(drv, IW_AUTH_MFP, value) < 0) { + wpa_printf(MSG_DEBUG, "%s: assoc failed because set_auth_param(IW_AUTH_MFP) failed", __FUNCTION__); ret = -1; + } #endif /* CONFIG_IEEE80211W */ - if (params->freq && wpa_driver_wext_set_freq(drv, params->freq) < 0) + if (params->freq && wpa_driver_wext_set_freq(drv, params->freq) < 0) { + wpa_printf(MSG_DEBUG, "%s: assoc failed because set_freq failed", __FUNCTION__); ret = -1; + } if (!drv->cfg80211 && - wpa_driver_wext_set_ssid(drv, params->ssid, params->ssid_len) < 0) + wpa_driver_wext_set_ssid(drv, params->ssid, params->ssid_len) < 0) { + wpa_printf(MSG_DEBUG, "%s: assoc failed because set_ssid failed", __FUNCTION__); ret = -1; + } if (params->bssid && - wpa_driver_wext_set_bssid(drv, params->bssid) < 0) + wpa_driver_wext_set_bssid(drv, params->bssid) < 0) { + wpa_printf(MSG_DEBUG, "%s: assoc failed because set_bssid failed", __FUNCTION__); ret = -1; + } if (drv->cfg80211 && wpa_driver_wext_set_ssid(drv, params->ssid, params->ssid_len) < 0) ret = -1; @@ -2008,6 +2043,10 @@ static int wpa_driver_wext_set_auth_alg( res = wpa_driver_wext_set_auth_param(drv, IW_AUTH_80211_AUTH_ALG, algs); drv->auth_alg_fallback = res == -2; + + if (res == -2) + wpa_printf(MSG_DEBUG, "%s: falling back to ENCODE for AUTH", __FUNCTION__); + return res; } ++++++ wpa_supplicant-errormsg.patch ++++++ Index: src/drivers/driver_wext.c =================================================================== --- src/drivers/driver_wext.c.orig +++ src/drivers/driver_wext.c @@ -54,12 +54,13 @@ int wpa_driver_wext_set_auth_param(struc iwr.u.param.value = value; if (ioctl(drv->ioctl_sock, SIOCSIWAUTH, &iwr) < 0) { + int saved_errno = errno; if (errno != EOPNOTSUPP) { wpa_printf(MSG_DEBUG, "WEXT: SIOCSIWAUTH(param %d " "value 0x%x) failed: %s)", idx, value, strerror(errno)); } - ret = errno == EOPNOTSUPP ? -2 : -1; + ret = saved_errno == EOPNOTSUPP ? -2 : -1; } return ret; ++++++ wpa_supplicant-flush-debug-output.patch ++++++ Index: src/utils/wpa_debug.c =================================================================== --- src/utils/wpa_debug.c.orig +++ src/utils/wpa_debug.c @@ -45,6 +45,7 @@ void wpa_debug_print_timestamp(void) if (out_file) { fprintf(out_file, "%ld.%06u: ", (long) tv.sec, (unsigned int) tv.usec); + fflush(out_file); } else #endif /* CONFIG_DEBUG_FILE */ printf("%ld.%06u: ", (long) tv.sec, (unsigned int) tv.usec); @@ -111,6 +112,7 @@ void wpa_printf(int level, const char *f if (out_file) { vfprintf(out_file, fmt, ap); fprintf(out_file, "\n"); + fflush(out_file); } else { #endif /* CONFIG_DEBUG_FILE */ vprintf(fmt, ap); @@ -146,6 +148,7 @@ static void _wpa_hexdump(int level, cons fprintf(out_file, " [REMOVED]"); } fprintf(out_file, "\n"); + fflush(out_file); } else { #endif /* CONFIG_DEBUG_FILE */ printf("%s - hexdump(len=%lu):", title, (unsigned long) len); @@ -191,12 +194,14 @@ static void _wpa_hexdump_ascii(int level fprintf(out_file, "%s - hexdump_ascii(len=%lu): [REMOVED]\n", title, (unsigned long) len); + fflush(out_file); return; } if (buf == NULL) { fprintf(out_file, "%s - hexdump_ascii(len=%lu): [NULL]\n", title, (unsigned long) len); + fflush(out_file); return; } fprintf(out_file, "%s - hexdump_ascii(len=%lu):\n", @@ -221,6 +226,7 @@ static void _wpa_hexdump_ascii(int level pos += llen; len -= llen; } + fflush(out_file); } else { #endif /* CONFIG_DEBUG_FILE */ if (!show) { ++++++ wpa_supplicant-sigusr1-changes-debuglevel.patch ++++++ Index: wpa_supplicant/wpa_supplicant.c =================================================================== --- wpa_supplicant/wpa_supplicant.c.orig +++ wpa_supplicant/wpa_supplicant.c @@ -139,6 +139,22 @@ int wpa_set_wep_keys(struct wpa_supplica return set; } +static void wpa_supplicant_handle_sigusr1(int sig, void *eloop_ctx, + void *signal_ctx) +{ + /* Increase verbosity (by decreasing the debug level) and wrap back + * to MSG_INFO when needed. + */ + if (wpa_debug_level) + wpa_debug_level--; + else + wpa_debug_level = MSG_INFO; + + wpa_printf(MSG_INFO, "Signal %d received - changing debug level to %s", sig, + (wpa_debug_level == MSG_INFO) ? "INFO" : + ((wpa_debug_level == MSG_DEBUG) ? "DEBUG" : + ((wpa_debug_level == MSG_MSGDUMP) ? "MSGDUMP" : "UNKNOWN"))); +} static int wpa_supplicant_set_wpa_none_key(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid) @@ -2342,6 +2358,8 @@ int wpa_supplicant_run(struct wpa_global eloop_register_signal_terminate(wpa_supplicant_terminate, global); eloop_register_signal_reconfig(wpa_supplicant_reconfig, global); + eloop_register_signal(SIGUSR1, wpa_supplicant_handle_sigusr1, NULL); + eloop_run(); return 0; ++++++ wpa_supplicant.conf ++++++ ctrl_interface=/var/run/wpa_supplicant ctrl_interface_group=wheel ++++++ wpa_supplicant.service ++++++ [Unit] Description=WPA Supplicant daemon Before=network.target [Service] Type=dbus BusName=fi.w1.wpa_supplicant1 ExecStart=/usr/sbin/wpa_supplicant -c /etc/wpa_supplicant/wpa_supplicant.conf -u -f /var/log/wpa_supplicant.log [Install] WantedBy=multi-user.target

1 0