CVS commit: src/external/bsd/wpa/bin

2023-05-09 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Tue May  9 21:05:25 UTC 2023

Modified Files:
src/external/bsd/wpa/bin/hostapd: Makefile
src/external/bsd/wpa/bin/wpa_passphrase: Makefile
src/external/bsd/wpa/bin/wpa_supplicant: Makefile

Log Message:
Handle OpenSSL-3.x


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/wpa/bin/hostapd/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/wpa/bin/wpa_passphrase/Makefile
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/wpa/bin/wpa_supplicant/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/wpa/bin/hostapd/Makefile
diff -u src/external/bsd/wpa/bin/hostapd/Makefile:1.15 src/external/bsd/wpa/bin/hostapd/Makefile:1.16
--- src/external/bsd/wpa/bin/hostapd/Makefile:1.15	Sun Feb 28 22:42:57 2021
+++ src/external/bsd/wpa/bin/hostapd/Makefile	Tue May  9 17:05:24 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2021/03/01 03:42:57 christos Exp $
+# $NetBSD: Makefile,v 1.16 2023/05/09 21:05:24 christos Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -247,5 +247,9 @@ SRCS+= sha1-pbkdf2.c sha1.c md5.c
 .endif
 
 CWARNFLAGS.gcc+=	${GCC_NO_ADDR_OF_PACKED_MEMBER}
+COPTS.dpp.c+= -Wno-error=deprecated-declarations
+COPTS.crypto_openssl.c+= -Wno-error=deprecated-declarations
+COPTS.fips_prf_openssl.c+= -Wno-error=deprecated-declarations
+COPTS.tls_openssl.c+= -Wno-error=deprecated-declarations
 
 .include 

Index: src/external/bsd/wpa/bin/wpa_passphrase/Makefile
diff -u src/external/bsd/wpa/bin/wpa_passphrase/Makefile:1.5 src/external/bsd/wpa/bin/wpa_passphrase/Makefile:1.6
--- src/external/bsd/wpa/bin/wpa_passphrase/Makefile:1.5	Sat Jan  5 00:40:00 2019
+++ src/external/bsd/wpa/bin/wpa_passphrase/Makefile	Tue May  9 17:05:24 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/01/05 05:40:00 christos Exp $
+# $NetBSD: Makefile,v 1.6 2023/05/09 21:05:24 christos Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -25,5 +25,6 @@ SRCS+= sha1-pbkdf2.c sha1.c md5.c
 
 
 MAN=	wpa_passphrase.8
+COPTS.crypto_openssl.c+= -Wno-error=deprecated-declarations
 
 .include 

Index: src/external/bsd/wpa/bin/wpa_supplicant/Makefile
diff -u src/external/bsd/wpa/bin/wpa_supplicant/Makefile:1.10 src/external/bsd/wpa/bin/wpa_supplicant/Makefile:1.11
--- src/external/bsd/wpa/bin/wpa_supplicant/Makefile:1.10	Fri Jan  4 16:22:20 2019
+++ src/external/bsd/wpa/bin/wpa_supplicant/Makefile	Tue May  9 17:05:24 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/01/04 21:22:20 christos Exp $
+# $NetBSD: Makefile,v 1.11 2023/05/09 21:05:24 christos Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -148,4 +148,7 @@ SRCS+= sha1-pbkdf2.c sha1.c md5.c
 
 .endif
 
+COPTS.crypto_openssl.c+= -Wno-error=deprecated-declarations
+COPTS.tls_openssl.c+= -Wno-error=deprecated-declarations
+
 .include

CVS commit: src/external/bsd/wpa/bin

2023-05-09 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Tue May  9 21:05:25 UTC 2023

Modified Files:
src/external/bsd/wpa/bin/hostapd: Makefile
src/external/bsd/wpa/bin/wpa_passphrase: Makefile
src/external/bsd/wpa/bin/wpa_supplicant: Makefile

Log Message:
Handle OpenSSL-3.x


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/wpa/bin/hostapd/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/wpa/bin/wpa_passphrase/Makefile
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/wpa/bin/wpa_supplicant/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/wpa/bin/wpa_supplicant

2022-09-10 Thread Roland Illig 
Module Name:src
Committed By:   rillig
Date:   Sat Sep 10 12:39:06 UTC 2022

Modified Files:
src/external/bsd/wpa/bin/wpa_supplicant: wpa_supplicant.8

Log Message:
wpa_supplicant.8: fix typo


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8
diff -u src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8:1.9 src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8:1.10
--- src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8:1.9	Wed Jun 19 03:27:38 2019
+++ src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8	Sat Sep 10 12:39:06 2022
@@ -1,4 +1,4 @@
-.\" $NetBSD: wpa_supplicant.8,v 1.9 2019/06/19 03:27:38 gutteridge Exp $
+.\" $NetBSD: wpa_supplicant.8,v 1.10 2022/09/10 12:39:06 rillig Exp $
 .\"
 .\" Copyright (c) 2005 Sam Leffler 
 .\" All rights reserved.
@@ -157,7 +157,7 @@ will manage them all with a single proce
 .It Fl O Ar override-ctrl
 Override ctrl_interface parameter for new interface.
 .It Fl o Ar override-driver
-Override driver paramter for new interface.
+Override driver parameter for new interface.
 .It Fl P Ar pidfile
 File in which to save the process PID.
 .It Fl p Ar parameters

CVS commit: src/external/bsd/wpa/bin/wpa_supplicant

2022-09-10 Thread Roland Illig 
Module Name:src
Committed By:   rillig
Date:   Sat Sep 10 12:39:06 UTC 2022

Modified Files:
src/external/bsd/wpa/bin/wpa_supplicant: wpa_supplicant.8

Log Message:
wpa_supplicant.8: fix typo


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/wpa/bin/hostapd

2021-02-28 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Mon Mar  1 03:42:57 UTC 2021

Modified Files:
src/external/bsd/wpa/bin/hostapd: Makefile

Log Message:
Enable more options.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/wpa/bin/hostapd/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/wpa/bin/hostapd

2021-02-28 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Mon Mar  1 03:42:57 UTC 2021

Modified Files:
src/external/bsd/wpa/bin/hostapd: Makefile

Log Message:
Enable more options.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/wpa/bin/hostapd/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/wpa/bin/hostapd/Makefile
diff -u src/external/bsd/wpa/bin/hostapd/Makefile:1.14 src/external/bsd/wpa/bin/hostapd/Makefile:1.15
--- src/external/bsd/wpa/bin/hostapd/Makefile:1.14	Sun Sep  6 03:20:26 2020
+++ src/external/bsd/wpa/bin/hostapd/Makefile	Sun Feb 28 22:42:57 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2020/09/06 07:20:26 mrg Exp $
+# $NetBSD: Makefile,v 1.15 2021/03/01 03:42:57 christos Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -16,12 +16,18 @@ authsrv.c \
 beacon.c \
 bss_load.c \
 ctrl_iface_ap.c \
+dpp.c \
+dpp_hostapd.c \
 drv_callbacks.c \
 eap_user_db.c \
+gas.c \
+gas_query_ap.c \
+gas_serv.c \
 hostapd.c \
 ieee802_11_auth.c \
 ieee802_11_shared.c \
 ieee802_1x.c \
+mbo_ap.c \
 neighbor_db.c \
 pmksa_cache_auth.c \
 preauth_auth.c \
@@ -65,6 +71,7 @@ SRCS+= \
 base64.c \
 common.c \
 eloop.c \
+json.c \
 ip_addr.c \
 os_unix.c \
 wpa_debug.c \
@@ -94,8 +101,15 @@ eap_server_methods.c
 
 # crypto
 SRCS+= \
+aes-siv.c \
 random.c \
-sha1-prf.c
+sha1-prf.c \
+sha256-kdf.c \
+sha256-prf.c \
+sha384-kdf.c \
+sha384-prf.c \
+sha512-kdf.c \
+sha512-prf.c \
 
 # crypto for non-openssl
 NO_SRCS+= \
@@ -131,6 +145,21 @@ CPPFLAGS+= -DCONFIG_IPV6
 .endif
 CPPFLAGS+= -DCONFIG_PEERKEY
 CPPFLAGS+= -DCONFIG_RSN_PREAUTH
+CPPFLAGS+= -DCONFIG_DPP
+CPPFLAGS+= -DCONFIG_DPP2
+CPPFLAGS+= -DCONFIG_ECC
+#CPPFLAGS+= -DCONFIG_OWE
+#CPPFLAGS+= -DCONFIG_SAE
+#CPPFLAGS+= -DCONFIG_AIRTIME_POLICY
+#CPPFLAGS+= -DCONFIG_FILS
+#CPPFLAGS+= -DCONFIG_OCV
+#CPPFLAGS+= -DCONFIG_IEEE80211AX
+CPPFLAGS+= -DCONFIG_IEEE80211W
+#CPPFLAGS+= -DCONFIG_IEEE80211R_AP
+CPPFLAGS+= -DCONFIG_MBO
+#CPPFLAGS+= -DCONFIG_NO_VLAN
+#CPPFLAGS+= -DCONFIG_SQLITE
+#CPPFLAGS+= -DCONFIG_SHA256 -DCONFIG_SHA484 -DCONFIG_SHA512
 
 DPADD+= ${LIBPCAP}
 LDADD+= -lpcap
@@ -169,6 +198,8 @@ fips_prf_openssl.c \
 ms_funcs.c \
 sha1-tlsprf.c \
 sha256.c \
+sha384.c \
+sha512.c \
 tls_openssl.c
 
 # eap_common

CVS commit: src/external/bsd/wpa/bin/hostapd

2020-02-03 Thread Roy Marples 
Module Name:src
Committed By:   roy
Date:   Mon Feb  3 09:10:47 UTC 2020

Modified Files:
src/external/bsd/wpa/bin/hostapd: Makefile

Log Message:
Enable syslog support for hostapd


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/wpa/bin/hostapd/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/wpa/bin/hostapd

2020-02-03 Thread Roy Marples 
Module Name:src
Committed By:   roy
Date:   Mon Feb  3 09:10:47 UTC 2020

Modified Files:
src/external/bsd/wpa/bin/hostapd: Makefile

Log Message:
Enable syslog support for hostapd


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/wpa/bin/hostapd/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/wpa/bin/hostapd/Makefile
diff -u src/external/bsd/wpa/bin/hostapd/Makefile:1.12 src/external/bsd/wpa/bin/hostapd/Makefile:1.13
--- src/external/bsd/wpa/bin/hostapd/Makefile:1.12	Fri Jan  4 21:22:20 2019
+++ src/external/bsd/wpa/bin/hostapd/Makefile	Mon Feb  3 09:10:47 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/01/04 21:22:20 christos Exp $
+# $NetBSD: Makefile,v 1.13 2020/02/03 09:10:47 roy Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -120,6 +120,7 @@ CPPFLAGS+= -DALL_DH_GROUPS
 CPPFLAGS+= -DRADIUS_SERVER
 CPPFLAGS+= -DCONFIG_CTRL_IFACE
 CPPFLAGS+= -DCONFIG_CTRL_IFACE_UNIX
+CPPFLAGS+= -DCONFIG_DEBUG_SYSLOG
 CPPFLAGS+= -DCONFIG_DRIVER_BSD
 CPPFLAGS+= -DCONFIG_DRIVER_NONE
 CPPFLAGS+= -DCONFIG_DRIVER_WIRED

CVS commit: src/external/bsd/wpa/bin/wpa_supplicant

2019-06-18 Thread David H. Gutteridge 
Module Name:src
Committed By:   gutteridge
Date:   Wed Jun 19 03:27:39 UTC 2019

Modified Files:
src/external/bsd/wpa/bin/wpa_supplicant: wpa_supplicant.8

Log Message:
wpa_supplicant.8: add xref to wpa_passphrase.8


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/wpa/bin/wpa_supplicant

2019-06-18 Thread David H. Gutteridge 
Module Name:src
Committed By:   gutteridge
Date:   Wed Jun 19 03:27:39 UTC 2019

Modified Files:
src/external/bsd/wpa/bin/wpa_supplicant: wpa_supplicant.8

Log Message:
wpa_supplicant.8: add xref to wpa_passphrase.8


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8
diff -u src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8:1.8 src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8:1.9
--- src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8:1.8	Fri Mar 25 07:48:16 2016
+++ src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8	Wed Jun 19 03:27:38 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: wpa_supplicant.8,v 1.8 2016/03/25 07:48:16 wiz Exp $
+.\" $NetBSD: wpa_supplicant.8,v 1.9 2019/06/19 03:27:38 gutteridge Exp $
 .\"
 .\" Copyright (c) 2005 Sam Leffler 
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" Based on:
 .\" $FreeBSD: /repoman/r/ncvs/src/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8,v 1.2 2005/06/27 06:40:43 ru Exp $
 .\"
-.Dd March 23, 2016
+.Dd June 19, 2019
 .Dt WPA_SUPPLICANT 8
 .Os
 .Sh NAME
@@ -190,7 +190,8 @@ Wait for a control interface monitor bef
 .Xr zyd 4 ,
 .Xr wpa_supplicant.conf 5 ,
 .Xr ifconfig 8 ,
-.Xr wpa_cli 8
+.Xr wpa_cli 8 ,
+.Xr wpa_passphrase 8
 .Sh HISTORY
 The
 .Nm

CVS commit: src/external/bsd/wpa/bin/wpa_cli

2019-06-18 Thread David H. Gutteridge 
Module Name:src
Committed By:   gutteridge
Date:   Wed Jun 19 03:23:56 UTC 2019

Modified Files:
src/external/bsd/wpa/bin/wpa_cli: wpa_cli.8

Log Message:
wpa_cli.8: add xref to wpa_passphrase.8


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/wpa/bin/wpa_cli/wpa_cli.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/wpa/bin/wpa_cli

2019-06-18 Thread David H. Gutteridge 
Module Name:src
Committed By:   gutteridge
Date:   Wed Jun 19 03:23:56 UTC 2019

Modified Files:
src/external/bsd/wpa/bin/wpa_cli: wpa_cli.8

Log Message:
wpa_cli.8: add xref to wpa_passphrase.8


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/wpa/bin/wpa_cli/wpa_cli.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/wpa/bin/wpa_cli/wpa_cli.8
diff -u src/external/bsd/wpa/bin/wpa_cli/wpa_cli.8:1.4 src/external/bsd/wpa/bin/wpa_cli/wpa_cli.8:1.5
--- src/external/bsd/wpa/bin/wpa_cli/wpa_cli.8:1.4	Tue Jun 18 14:28:40 2019
+++ src/external/bsd/wpa/bin/wpa_cli/wpa_cli.8	Wed Jun 19 03:23:56 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: wpa_cli.8,v 1.4 2019/06/18 14:28:40 maya Exp $
+.\" $NetBSD: wpa_cli.8,v 1.5 2019/06/19 03:23:56 gutteridge Exp $
 .\"
 .\" Copyright (c) 2005 Sam Leffler 
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" Based on:
 .\" $FreeBSD: /repoman/r/ncvs/src/usr.sbin/wpa/wpa_cli/wpa_cli.8,v 1.2 2005/06/27 06:40:43 ru Exp $
 .\"
-.Dd June 18, 2019
+.Dd June 19, 2019
 .Dt WPA_CLI 8
 .Os
 .Sh NAME
@@ -224,6 +224,7 @@ Exit
 .El
 .Sh SEE ALSO
 .Xr wpa_supplicant.conf 5 ,
+.Xr wpa_passphrase 8 ,
 .Xr wpa_supplicant 8
 .Sh EXAMPLES
 A sample run of discovering and connecting to a network

CVS commit: src/external/bsd/wpa/bin/wpa_cli

2019-06-18 Thread Maya Rashish 
Module Name:src
Committed By:   maya
Date:   Tue Jun 18 14:28:41 UTC 2019

Modified Files:
src/external/bsd/wpa/bin/wpa_cli: wpa_cli.8

Log Message:
Add more information about commands. Add a working, annotated example.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/wpa/bin/wpa_cli/wpa_cli.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/wpa/bin/wpa_cli/wpa_cli.8
diff -u src/external/bsd/wpa/bin/wpa_cli/wpa_cli.8:1.3 src/external/bsd/wpa/bin/wpa_cli/wpa_cli.8:1.4
--- src/external/bsd/wpa/bin/wpa_cli/wpa_cli.8:1.3	Tue Mar 18 18:20:36 2014
+++ src/external/bsd/wpa/bin/wpa_cli/wpa_cli.8	Tue Jun 18 14:28:40 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: wpa_cli.8,v 1.3 2014/03/18 18:20:36 riastradh Exp $
+.\" $NetBSD: wpa_cli.8,v 1.4 2019/06/18 14:28:40 maya Exp $
 .\"
 .\" Copyright (c) 2005 Sam Leffler 
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" Based on:
 .\" $FreeBSD: /repoman/r/ncvs/src/usr.sbin/wpa/wpa_cli/wpa_cli.8,v 1.2 2005/06/27 06:40:43 ru Exp $
 .\"
-.Dd October 1, 2005
+.Dd June 18, 2019
 .Dt WPA_CLI 8
 .Os
 .Sh NAME
@@ -159,6 +159,21 @@ Report the current WPA/EAPOL/EAP status 
 Report MIB variables (dot1x, dot11) for the current interface.
 .It Ic help
 Show usage help.
+.It Ic status
+Get current WPA/EAPOL/EAP status.
+.It Ic add_network
+Add a network. Returns a number to be used in set_network commands.
+.It Ic set_network Ar network_id ssid Ar my_ssid_name
+Make network_id use the SSID my_ssid_name.
+.It Ic set_network Ar network_id psk Ar my_ssid_password
+Make network_id use the password my_ssid_password
+.It Ic enable_network Ar network_id
+Begin using the network at network_id.
+.It Ic list_network
+List the networks configured.
+.It Ic scan
+Begin a scan of nearby APs. Results can be obtained with
+.Ic scan_results .
 .It Ic interface Op Ar ifname
 Show available interfaces and/or set the current interface
 when multiple are available.
@@ -210,6 +225,38 @@ Exit
 .Sh SEE ALSO
 .Xr wpa_supplicant.conf 5 ,
 .Xr wpa_supplicant 8
+.Sh EXAMPLES
+A sample run of discovering and connecting to a network
+with SSID "MyWifiNetwork" and with a password "MyWifiPassword".
+.Pp
+If wpa_supplicant isn't already running, start it with the command
+.Ic service wpa_supplicant onestart .
+.Pp
+Find the network
+.Bd -literal -offset indent
+.Ic scan
+.Ic scan_results
+17:07:08.868: bssid / frequency / signal level / flags / ssid
+14:aa:ff:ee:aa:cc	2437	187	[WPA-PSK-CCMP+TKIP][ESS]	MyWifiNetwork
+44:ee:ff:bb:33:33	2452	168	[WPA2-PSK-CCMP][ESS]	SomeOtherNetwork
+.Ed
+.Pp
+Now, let's create a network and configure it.
+.Bd -literal -offset indent
+.Ic add_network
+17:08:13.047: 1
+.Ed
+.Pp
+That means the new network_id we should use is 1.
+.Bd -literal -offset indent
+.Ic set_network 1 ssid \[dq]MyWifiNetwork\[dq]
+.Ic set_network 1 psk \[dq]MyWifiPassword\[dq]
+.Ic enable_network 1
+.Ed
+.Pp
+After this point, you should be connected, but no IP address
+is configured. You will likely want to configure the address using
+.Xr dhcpcd 8 .
 .Sh HISTORY
 The
 .Nm

CVS commit: src/external/bsd/wpa/bin/wpa_cli

2019-06-18 Thread Maya Rashish 
Module Name:src
Committed By:   maya
Date:   Tue Jun 18 14:28:41 UTC 2019

Modified Files:
src/external/bsd/wpa/bin/wpa_cli: wpa_cli.8

Log Message:
Add more information about commands. Add a working, annotated example.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/wpa/bin/wpa_cli/wpa_cli.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/wpa/bin

2019-01-04 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sat Jan  5 05:40:00 UTC 2019

Modified Files:
src/external/bsd/wpa/bin/hostapd_cli: Makefile
src/external/bsd/wpa/bin/wpa_cli: Makefile
src/external/bsd/wpa/bin/wpa_passphrase: Makefile

Log Message:
include common path in the rest of the Makefiles


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/wpa/bin/hostapd_cli/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/wpa/bin/wpa_cli/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/wpa/bin/wpa_passphrase/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/wpa/bin

2019-01-04 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sat Jan  5 05:40:00 UTC 2019

Modified Files:
src/external/bsd/wpa/bin/hostapd_cli: Makefile
src/external/bsd/wpa/bin/wpa_cli: Makefile
src/external/bsd/wpa/bin/wpa_passphrase: Makefile

Log Message:
include common path in the rest of the Makefiles


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/wpa/bin/hostapd_cli/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/wpa/bin/wpa_cli/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/wpa/bin/wpa_passphrase/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/wpa/bin/hostapd_cli/Makefile
diff -u src/external/bsd/wpa/bin/hostapd_cli/Makefile:1.3 src/external/bsd/wpa/bin/hostapd_cli/Makefile:1.4
--- src/external/bsd/wpa/bin/hostapd_cli/Makefile:1.3	Mon Nov 21 15:15:16 2016
+++ src/external/bsd/wpa/bin/hostapd_cli/Makefile	Sat Jan  5 00:40:00 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2016/11/21 20:15:16 christos Exp $
+# $NetBSD: Makefile,v 1.4 2019/01/05 05:40:00 christos Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
-.PATH.c: ${HOSTAPD_DISTDIR}
+.PATH.c: ${HOSTAPD_DISTDIR} ${COMMON_PATH}
 
 PROG=	hostapd_cli
 SRCS=	hostapd_cli.c wpa_ctrl.c os_unix.c eloop.c edit.c wpa_debug.c

Index: src/external/bsd/wpa/bin/wpa_cli/Makefile
diff -u src/external/bsd/wpa/bin/wpa_cli/Makefile:1.5 src/external/bsd/wpa/bin/wpa_cli/Makefile:1.6
--- src/external/bsd/wpa/bin/wpa_cli/Makefile:1.5	Mon Nov 21 15:15:16 2016
+++ src/external/bsd/wpa/bin/wpa_cli/Makefile	Sat Jan  5 00:40:00 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2016/11/21 20:15:16 christos Exp $
+# $NetBSD: Makefile,v 1.6 2019/01/05 05:40:00 christos Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
-.PATH.c: ${WPA_SUPPLICANT_DISTDIR}
+.PATH.c: ${WPA_SUPPLICANT_DISTDIR} ${COMMON_PATH}
 
 PROG=	wpa_cli
 SRCS=	wpa_cli.c wpa_ctrl.c os_unix.c eloop.c edit.c wpa_debug.c common.c

Index: src/external/bsd/wpa/bin/wpa_passphrase/Makefile
diff -u src/external/bsd/wpa/bin/wpa_passphrase/Makefile:1.4 src/external/bsd/wpa/bin/wpa_passphrase/Makefile:1.5
--- src/external/bsd/wpa/bin/wpa_passphrase/Makefile:1.4	Wed Jun 29 15:16:23 2016
+++ src/external/bsd/wpa/bin/wpa_passphrase/Makefile	Sat Jan  5 00:40:00 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2016/06/29 19:16:23 christos Exp $
+# $NetBSD: Makefile,v 1.5 2019/01/05 05:40:00 christos Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
-.PATH.c: ${WPA_SUPPLICANT_DISTDIR} ${.CURDIR}/../wpa_supplicant
+.PATH.c: ${WPA_SUPPLICANT_DISTDIR} ${.CURDIR}/../wpa_supplicant ${COMMON_PATH}
 
 PROG=	wpa_passphrase
 SRCS= \

CVS commit: src/external/bsd/wpa/bin/hostapd

2018-01-13 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sun Jan 14 03:05:06 UTC 2018

Modified Files:
src/external/bsd/wpa/bin/hostapd: Makefile

Log Message:
Add the NONE/WIRED drivers.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/wpa/bin/hostapd/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/wpa/bin/hostapd/Makefile
diff -u src/external/bsd/wpa/bin/hostapd/Makefile:1.10 src/external/bsd/wpa/bin/hostapd/Makefile:1.11
--- src/external/bsd/wpa/bin/hostapd/Makefile:1.10	Mon Nov 21 15:15:16 2016
+++ src/external/bsd/wpa/bin/hostapd/Makefile	Sat Jan 13 22:05:06 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2016/11/21 20:15:16 christos Exp $
+# $NetBSD: Makefile,v 1.11 2018/01/14 03:05:06 christos Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -47,6 +47,8 @@ wpa_ctrl.c
 # drivers
 SRCS+= \
 driver_bsd.c \
+driver_none.c \
+driver_wired.c \
 driver_common.c \
 drivers.c
 
@@ -117,6 +119,9 @@ CPPFLAGS+= -DRADIUS_SERVER
 CPPFLAGS+= -DCONFIG_CTRL_IFACE
 CPPFLAGS+= -DCONFIG_CTRL_IFACE_UNIX
 CPPFLAGS+= -DCONFIG_DRIVER_BSD
+CPPFLAGS+= -DCONFIG_DRIVER_NONE
+CPPFLAGS+= -DCONFIG_DRIVER_WIRED
+CPPFLAGS+= -DCONFIG_DRIVER_WPA
 .if ${MKINET6} != "no"
 CPPFLAGS+= -DCONFIG_IPV6
 .endif

CVS commit: src/external/bsd/wpa/bin/hostapd

2018-01-13 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sun Jan 14 03:05:06 UTC 2018

Modified Files:
src/external/bsd/wpa/bin/hostapd: Makefile

Log Message:
Add the NONE/WIRED drivers.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/wpa/bin/hostapd/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/wpa/bin

2016-06-29 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Jun 29 19:16:23 UTC 2016

Modified Files:
src/external/bsd/wpa/bin/hostapd: Makefile aes-xinternal.c
src/external/bsd/wpa/bin/wpa_passphrase: Makefile
src/external/bsd/wpa/bin/wpa_supplicant: Makefile aes-xinternal.c

Log Message:
Fix MKCRYPTO=no build.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/wpa/bin/hostapd/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/wpa/bin/hostapd/aes-xinternal.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/wpa/bin/wpa_passphrase/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/wpa/bin/wpa_supplicant/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/wpa/bin/wpa_supplicant/aes-xinternal.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/wpa/bin

2016-06-29 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Jun 29 19:16:23 UTC 2016

Modified Files:
src/external/bsd/wpa/bin/hostapd: Makefile aes-xinternal.c
src/external/bsd/wpa/bin/wpa_passphrase: Makefile
src/external/bsd/wpa/bin/wpa_supplicant: Makefile aes-xinternal.c

Log Message:
Fix MKCRYPTO=no build.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/wpa/bin/hostapd/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/wpa/bin/hostapd/aes-xinternal.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/wpa/bin/wpa_passphrase/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/wpa/bin/wpa_supplicant/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/wpa/bin/wpa_supplicant/aes-xinternal.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/wpa/bin/hostapd/Makefile
diff -u src/external/bsd/wpa/bin/hostapd/Makefile:1.8 src/external/bsd/wpa/bin/hostapd/Makefile:1.9
--- src/external/bsd/wpa/bin/hostapd/Makefile:1.8	Wed Apr  1 15:45:14 2015
+++ src/external/bsd/wpa/bin/hostapd/Makefile	Wed Jun 29 15:16:23 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2015/04/01 19:45:14 christos Exp $
+# $NetBSD: Makefile,v 1.9 2016/06/29 19:16:23 christos Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -86,7 +86,6 @@ eap_server_methods.c
 
 # crypto
 SRCS+= \
-crypto_openssl.c \
 random.c \
 sha1-prf.c
 
@@ -150,6 +149,7 @@ aes-ctr.c \
 aes-eax.c \
 aes-encblock.c \
 aes-omac1.c \
+crypto_openssl.c \
 dh_groups.c \
 fips_prf_openssl.c \
 ms_funcs.c \
@@ -196,7 +196,9 @@ DPADD+= ${LIBSSL} ${LIBCRYPTO} ${LIBDES}
 LDADD+= -lssl -lcrypto -ldes
 .else
 CPPFLAGS+= -DINTERNAL_AES -DINTERNAL_MD5 -DINTERNAL_SHA1 -DCONFIG_NO_PBKDF2
+CPPFLAGS+= -DCONFIG_CRYPTO_INTERNAL
 SRCS+=  tls_none.c sha1-internal.c md5-internal.c aes-xinternal.c rc4.c
+SRCS+= sha1-pbkdf2.c sha1.c md5.c
 .endif
 
 .include 

Index: src/external/bsd/wpa/bin/hostapd/aes-xinternal.c
diff -u src/external/bsd/wpa/bin/hostapd/aes-xinternal.c:1.1 src/external/bsd/wpa/bin/hostapd/aes-xinternal.c:1.2
--- src/external/bsd/wpa/bin/hostapd/aes-xinternal.c:1.1	Wed Aug  4 13:12:33 2010
+++ src/external/bsd/wpa/bin/hostapd/aes-xinternal.c	Wed Jun 29 15:16:23 2016
@@ -4,7 +4,7 @@
 #include "aes.h"
 #include "aes_wrap.h"
 
-int aes_wrap(const u8 *kek, int n, const u8 *cipher, u8 *plain)
+int aes_wrap(const u8 *kek, size_t kek_len, int n, const u8 *cipher, u8 *plain)
 {
 	return -1;
 }

Index: src/external/bsd/wpa/bin/wpa_passphrase/Makefile
diff -u src/external/bsd/wpa/bin/wpa_passphrase/Makefile:1.3 src/external/bsd/wpa/bin/wpa_passphrase/Makefile:1.4
--- src/external/bsd/wpa/bin/wpa_passphrase/Makefile:1.3	Wed Apr  1 15:45:14 2015
+++ src/external/bsd/wpa/bin/wpa_passphrase/Makefile	Wed Jun 29 15:16:23 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/04/01 19:45:14 christos Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/29 19:16:23 christos Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -18,7 +18,9 @@ DPADD+= ${LIBSSL} ${LIBCRYPTO} ${LIBDES}
 LDADD+= -lssl -lcrypto -ldes
 .else
 CPPFLAGS+= -DINTERNAL_AES -DINTERNAL_MD5 -DINTERNAL_SHA1
+CPPFLAGS+= -DCONFIG_CRYPTO_INTERNAL
 SRCS+=	tls_none.c md5-internal.c sha1-internal.c
+SRCS+= sha1-pbkdf2.c sha1.c md5.c
 .endif
 
 

Index: src/external/bsd/wpa/bin/wpa_supplicant/Makefile
diff -u src/external/bsd/wpa/bin/wpa_supplicant/Makefile:1.7 src/external/bsd/wpa/bin/wpa_supplicant/Makefile:1.8
--- src/external/bsd/wpa/bin/wpa_supplicant/Makefile:1.7	Wed Mar 23 05:35:25 2016
+++ src/external/bsd/wpa/bin/wpa_supplicant/Makefile	Wed Jun 29 15:16:23 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/03/23 09:35:25 roy Exp $
+# $NetBSD: Makefile,v 1.8 2016/06/29 19:16:23 christos Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -33,6 +33,7 @@ pmksa_cache.c \
 preauth.c \
 random.c \
 scan.c \
+sha1-prf.c \
 wmm_ac.c \
 wpa.c \
 wpa_common.c \
@@ -102,7 +103,6 @@ eap_ttls.c \
 ms_funcs.c \
 mschapv2.c \
 sha1-tlsprf.c \
-sha1-prf.c \
 tls_openssl.c
 
 SRCS+=aes-ctr.c \
@@ -119,7 +119,9 @@ LDADD+= -lssl -lcrypto -ldes
 .else
 CPPFLAGS+= -DINTERNAL_AES -DINTERNAL_MD5 -DINTERNAL_SHA1 -DCONFIG_NO_PBKDF2
 SRCS+= tls_none.c sha1-internal.c md5-internal.c aes-xinternal.c rc4.c
-SRCS+= aes-unwrap.c md5.c
+CPPFLAGS+= -DCONFIG_CRYPTO_INTERNAL
+#SRCS+= aes-unwrap.c md5.c
+SRCS+= sha1-pbkdf2.c sha1.c md5.c
 .endif
 
 .endif

Index: src/external/bsd/wpa/bin/wpa_supplicant/aes-xinternal.c
diff -u src/external/bsd/wpa/bin/wpa_supplicant/aes-xinternal.c:1.1 src/external/bsd/wpa/bin/wpa_supplicant/aes-xinternal.c:1.2
--- src/external/bsd/wpa/bin/wpa_supplicant/aes-xinternal.c:1.1	Wed Aug  4 13:12:34 2010
+++ src/external/bsd/wpa/bin/wpa_supplicant/aes-xinternal.c	Wed Jun 29 15:16:23 2016
@@ -4,7 +4,7 @@
 #include "aes.h"
 #include "aes_wrap.h"
 
-int aes_unwrap(const u8 *kek, int n, const u8 *cipher, u8 *plain)
+int aes_unwrap(const u8 *kek, size_t kek_len, int n, const u8 *cipher, u8

CVS commit: src/external/bsd/wpa/bin/wpa_supplicant

2016-03-25 Thread Thomas Klausner 
Module Name:src
Committed By:   wiz
Date:   Fri Mar 25 07:48:16 UTC 2016

Modified Files:
src/external/bsd/wpa/bin/wpa_supplicant: wpa_supplicant.8

Log Message:
Sort SYNOPSIS. Fix xref.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/wpa/bin/wpa_supplicant

2016-03-25 Thread Thomas Klausner 
Module Name:src
Committed By:   wiz
Date:   Fri Mar 25 07:48:16 UTC 2016

Modified Files:
src/external/bsd/wpa/bin/wpa_supplicant: wpa_supplicant.8

Log Message:
Sort SYNOPSIS. Fix xref.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8
diff -u src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8:1.7 src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8:1.8
--- src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8:1.7	Wed Mar 23 10:14:07 2016
+++ src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8	Fri Mar 25 07:48:16 2016
@@ -1,4 +1,4 @@
-.\" $NetBSD: wpa_supplicant.8,v 1.7 2016/03/23 10:14:07 roy Exp $
+.\" $NetBSD: wpa_supplicant.8,v 1.8 2016/03/25 07:48:16 wiz Exp $
 .\"
 .\" Copyright (c) 2005 Sam Leffler 
 .\" All rights reserved.
@@ -50,8 +50,8 @@
 .Op Fl o Ar override-driver
 .Op Fl P Ar pidfile
 .Op Fl p Ar parameters
-.Op Fl N Fl i Ar ifname Fl c Ar config-file ...
 .Op Fl M Oo Fl i Ar ifname Oc Fl c Ar config-file ...
+.Op Fl N Fl i Ar ifname Fl c Ar config-file ...
 .Sh DESCRIPTION
 The
 .Nm
@@ -142,7 +142,7 @@ Include key information in debugging out
 Display the license for this program on the terminal and exit.
 .It Fl M Oo Fl i Ar matchifname Oc Fl c Ar config-file ...
 Matches the interface name using
-.Xr fnmatch(3) ,
+.Xr fnmatch 3 ,
 or all interfaces if
 .Fl i
 is not specified.

CVS commit: src/external/bsd/wpa/bin/wpa_supplicant

2016-03-23 Thread Roy Marples 
Module Name:src
Committed By:   roy
Date:   Wed Mar 23 10:14:07 UTC 2016

Modified Files:
src/external/bsd/wpa/bin/wpa_supplicant: wpa_supplicant.8

Log Message:
Describe -M


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8
diff -u src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8:1.6 src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8:1.7
--- src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8:1.6	Sun Jan 10 20:31:13 2016
+++ src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8	Wed Mar 23 10:14:07 2016
@@ -1,4 +1,4 @@
-.\" $NetBSD: wpa_supplicant.8,v 1.6 2016/01/10 20:31:13 wiz Exp $
+.\" $NetBSD: wpa_supplicant.8,v 1.7 2016/03/23 10:14:07 roy Exp $
 .\"
 .\" Copyright (c) 2005 Sam Leffler 
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" Based on:
 .\" $FreeBSD: /repoman/r/ncvs/src/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8,v 1.2 2005/06/27 06:40:43 ru Exp $
 .\"
-.Dd January 9, 2016
+.Dd March 23, 2016
 .Dt WPA_SUPPLICANT 8
 .Os
 .Sh NAME
@@ -45,12 +45,13 @@
 .Op Fl G Ar global-ctrl-group
 .Op Fl g Ar global-ctrl
 .Op Fl I Ar additional-config-file
-.Fl i Ar ifname
+.Op Fl i Ar ifname
 .Op Fl O Ar override-ctrl
 .Op Fl o Ar override-driver
 .Op Fl P Ar pidfile
 .Op Fl p Ar parameters
-.Op Fl N i Ar ifname Fl c Ar config-file ...
+.Op Fl N Fl i Ar ifname Fl c Ar config-file ...
+.Op Fl M Oo Fl i Ar ifname Oc Fl c Ar config-file ...
 .Sh DESCRIPTION
 The
 .Nm
@@ -139,6 +140,15 @@ Additional configuration file.
 Include key information in debugging output.
 .It Fl L
 Display the license for this program on the terminal and exit.
+.It Fl M Oo Fl i Ar matchifname Oc Fl c Ar config-file ...
+Matches the interface name using
+.Xr fnmatch(3) ,
+or all interfaces if
+.Fl i
+is not specified.
+If multiple interfaces are matched then
+.Nm
+will manage them all with a single process.
 .It Fl N i Ar ifname Fl c Ar config-file ...
 Specify an additional interface and configuration file.
 If multiple interfaces are specified then
@@ -168,6 +178,7 @@ Display version information on the termi
 Wait for a control interface monitor before starting.
 .El
 .Sh SEE ALSO
+.Xr fnmatch 3 ,
 .Xr ath 4 ,
 .Xr ipw 4 ,
 .Xr iwi 4 ,

CVS commit: src/external/bsd/wpa/bin/wpa_supplicant

2016-03-23 Thread Roy Marples 
Module Name:src
Committed By:   roy
Date:   Wed Mar 23 10:14:07 UTC 2016

Modified Files:
src/external/bsd/wpa/bin/wpa_supplicant: wpa_supplicant.8

Log Message:
Describe -M


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/wpa/bin/wpa_supplicant

2016-03-23 Thread Roy Marples 
Module Name:src
Committed By:   roy
Date:   Wed Mar 23 09:35:25 UTC 2016

Modified Files:
src/external/bsd/wpa/bin/wpa_supplicant: Makefile

Log Message:
Build with interface matching support.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/wpa/bin/wpa_supplicant/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/wpa/bin/wpa_supplicant

2016-03-23 Thread Roy Marples 
Module Name:src
Committed By:   roy
Date:   Wed Mar 23 09:35:25 UTC 2016

Modified Files:
src/external/bsd/wpa/bin/wpa_supplicant: Makefile

Log Message:
Build with interface matching support.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/wpa/bin/wpa_supplicant/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/wpa/bin/wpa_supplicant/Makefile
diff -u src/external/bsd/wpa/bin/wpa_supplicant/Makefile:1.6 src/external/bsd/wpa/bin/wpa_supplicant/Makefile:1.7
--- src/external/bsd/wpa/bin/wpa_supplicant/Makefile:1.6	Fri Jan  8 23:31:29 2016
+++ src/external/bsd/wpa/bin/wpa_supplicant/Makefile	Wed Mar 23 09:35:25 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/01/08 23:31:29 roy Exp $
+# $NetBSD: Makefile,v 1.7 2016/03/23 09:35:25 roy Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -57,13 +57,14 @@ CPPFLAGS+= \
 
 CPPFLAGS+=-DCONFIG_BACKEND_FILE
 CPPFLAGS+=-DCONFIG_PEERKEY
-CPPFLAGS+=-DCONFIG_DEBUG_SYSLOG
-CPPFLAGS+=-DCONFIG_DRIVER_WIRED
+CPPFLAGS+=-DCONFIG_MATCH_IFACE
 CPPFLAGS+=-DCONFIG_DRIVER_BSD
+CPPFLAGS+=-DCONFIG_DRIVER_WIRED
 CPPFLAGS+=-DCONFIG_CTRL_IFACE
 CPPFLAGS+=-DCONFIG_CTRL_IFACE_UNIX
 CPPFLAGS+=-DCONFIG_SMARTCARD
 CPPFLAGS+=-DCONFIG_DEBUG_FILE
+CPPFLAGS+=-DCONFIG_DEBUG_SYSLOG
 
 DPADD+=	${LIBPCAP}
 LDADD+=	-lpcap

CVS commit: src/external/bsd/wpa/bin

2016-01-24 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sun Jan 24 18:49:05 UTC 2016

Modified Files:
src/external/bsd/wpa/bin: Makefile.inc

Log Message:
the eloop hack should not be needed anymore.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/wpa/bin/Makefile.inc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/wpa/bin

2016-01-24 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sun Jan 24 18:49:05 UTC 2016

Modified Files:
src/external/bsd/wpa/bin: Makefile.inc

Log Message:
the eloop hack should not be needed anymore.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/wpa/bin/Makefile.inc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/wpa/bin/Makefile.inc
diff -u src/external/bsd/wpa/bin/Makefile.inc:1.3 src/external/bsd/wpa/bin/Makefile.inc:1.4
--- src/external/bsd/wpa/bin/Makefile.inc:1.3	Fri Jan 22 12:56:20 2016
+++ src/external/bsd/wpa/bin/Makefile.inc	Sun Jan 24 13:49:05 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.3 2016/01/22 17:56:20 roy Exp $
+# $NetBSD: Makefile.inc,v 1.4 2016/01/24 18:49:05 christos Exp $
 
 BINDIR?=	/usr/sbin
 
@@ -8,9 +8,6 @@ WPA_DISTDIR?=			${.CURDIR}/../../dist
 WPA_SUPPLICANT_DISTDIR?=	${WPA_DISTDIR}/wpa_supplicant
 HOSTAPD_DISTDIR?=		${WPA_DISTDIR}/hostapd
 
-# clang dislikes the NetBSD specific kevent header
-COPTS.eloop.c =			-Wno-int-conversion
-
 .PATH.c: \
 	${WPA_DISTDIR}/src/ap \
 	${WPA_DISTDIR}/src/common \

CVS commit: src/external/bsd/wpa/bin

2016-01-22 Thread Roy Marples 
Module Name:src
Committed By:   roy
Date:   Fri Jan 22 17:56:20 UTC 2016

Modified Files:
src/external/bsd/wpa/bin: Makefile.inc

Log Message:
Fix build for clang and kqueue


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/wpa/bin/Makefile.inc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/wpa/bin/Makefile.inc
diff -u src/external/bsd/wpa/bin/Makefile.inc:1.2 src/external/bsd/wpa/bin/Makefile.inc:1.3
--- src/external/bsd/wpa/bin/Makefile.inc:1.2	Wed Jan 20 15:08:44 2016
+++ src/external/bsd/wpa/bin/Makefile.inc	Fri Jan 22 17:56:20 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.2 2016/01/20 15:08:44 roy Exp $
+# $NetBSD: Makefile.inc,v 1.3 2016/01/22 17:56:20 roy Exp $
 
 BINDIR?=	/usr/sbin
 
@@ -8,6 +8,9 @@ WPA_DISTDIR?=			${.CURDIR}/../../dist
 WPA_SUPPLICANT_DISTDIR?=	${WPA_DISTDIR}/wpa_supplicant
 HOSTAPD_DISTDIR?=		${WPA_DISTDIR}/hostapd
 
+# clang dislikes the NetBSD specific kevent header
+COPTS.eloop.c =			-Wno-int-conversion
+
 .PATH.c: \
 	${WPA_DISTDIR}/src/ap \
 	${WPA_DISTDIR}/src/common \

CVS commit: src/external/bsd/wpa/bin

2016-01-22 Thread Roy Marples 
Module Name:src
Committed By:   roy
Date:   Fri Jan 22 17:56:20 UTC 2016

Modified Files:
src/external/bsd/wpa/bin: Makefile.inc

Log Message:
Fix build for clang and kqueue


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/wpa/bin/Makefile.inc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/wpa/bin

2016-01-20 Thread Roy Marples 
Module Name:src
Committed By:   roy
Date:   Wed Jan 20 15:08:44 UTC 2016

Modified Files:
src/external/bsd/wpa/bin: Makefile.inc

Log Message:
Build with kqueue(2) support


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/wpa/bin/Makefile.inc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/wpa/bin/wpa_supplicant

2016-01-10 Thread Roy Marples 
Module Name:src
Committed By:   roy
Date:   Sun Jan 10 15:52:36 UTC 2016

Modified Files:
src/external/bsd/wpa/bin/wpa_supplicant: wpa_supplicant.8

Log Message:
Fixup SYNOPSIS some more.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8
diff -u src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8:1.4 src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8:1.5
--- src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8:1.4	Fri Jan  8 23:37:58 2016
+++ src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8	Sun Jan 10 15:52:36 2016
@@ -1,4 +1,4 @@
-.\" $NetBSD: wpa_supplicant.8,v 1.4 2016/01/08 23:37:58 roy Exp $
+.\" $NetBSD: wpa_supplicant.8,v 1.5 2016/01/10 15:52:36 roy Exp $
 .\"
 .\" Copyright (c) 2005 Sam Leffler 
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" Based on:
 .\" $FreeBSD: /repoman/r/ncvs/src/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8,v 1.2 2005/06/27 06:40:43 ru Exp $
 .\"
-.Dd January 8, 2016
+.Dd January 9, 2016
 .Dt WPA_SUPPLICANT 8
 .Os
 .Sh NAME
@@ -35,7 +35,7 @@
 .Nd WPA/802.11i Supplicant for wireless network devices
 .Sh SYNOPSIS
 .Nm
-.Op Fl BdhLqstuvW
+.Op Fl BdhKLqstvW
 .Op Fl b Ar br_ifname
 .Op Fl C Ar ctrl
 .Fl c Ar config-file
@@ -44,10 +44,12 @@
 .Op Fl f Ar debug-file
 .Op Fl G Ar global-ctrl-group
 .Op Fl g Ar global-ctrl
+.Op Fl I Ar additional-config-file
 .Fl i Ar ifname
 .Op Fl O Ar override-ctrl
 .Op Fl o Ar override-driver
 .Op Fl P Ar pidfile
+.Op Fl p Ar parameters
 .Op Fl N i Ar ifname Fl c Ar config-file ...
 .Sh DESCRIPTION
 The
@@ -119,6 +121,8 @@ Messages are sent to stdout by default, 
 This can be changed with the
 .Fl f
 flag.
+.It Fl e
+Specifies a file to store entropy.
 .It Fl f
 Specifies a file to send debug messages to when enabled with the
 .Fl d

CVS commit: src/external/bsd/wpa/bin/wpa_supplicant

2016-01-10 Thread Roy Marples 
Module Name:src
Committed By:   roy
Date:   Sun Jan 10 15:52:36 UTC 2016

Modified Files:
src/external/bsd/wpa/bin/wpa_supplicant: wpa_supplicant.8

Log Message:
Fixup SYNOPSIS some more.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/wpa/bin/wpa_supplicant

2016-01-10 Thread Thomas Klausner 
Module Name:src
Committed By:   wiz
Date:   Sun Jan 10 20:31:13 UTC 2016

Modified Files:
src/external/bsd/wpa/bin/wpa_supplicant: wpa_supplicant.8

Log Message:
Add arguments to options in description.
Replace manual xref with Xr.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8
diff -u src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8:1.5 src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8:1.6
--- src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8:1.5	Sun Jan 10 15:52:36 2016
+++ src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8	Sun Jan 10 20:31:13 2016
@@ -1,4 +1,4 @@
-.\" $NetBSD: wpa_supplicant.8,v 1.5 2016/01/10 15:52:36 roy Exp $
+.\" $NetBSD: wpa_supplicant.8,v 1.6 2016/01/10 20:31:13 wiz Exp $
 .\"
 .\" Copyright (c) 2005 Sam Leffler 
 .\" All rights reserved.
@@ -108,11 +108,11 @@ The following options are available:
 .It Fl B
 Detach from the controlling terminal and run as a daemon process
 in the background.
-.It Fl b
+.It Fl b Ar br_ifname
 Optional bridge interface name.
-.It Fl C
+.It Fl C Ar ctrl
 Control interface parameter.
-.It Fl D
+.It Fl D Ar driver
 Driver name (can be either bsd or wired)
 .It Fl d
 Enable debugging messages.
@@ -121,19 +121,19 @@ Messages are sent to stdout by default, 
 This can be changed with the
 .Fl f
 flag.
-.It Fl e
+.It Fl e Ar entropy-file
 Specifies a file to store entropy.
-.It Fl f
+.It Fl f Ar debug-file
 Specifies a file to send debug messages to when enabled with the
 .Fl d
 flag.
-.It Fl G
+.It Fl G Ar global-ctrl-group
 Global control interface group.
-.It Fl g
+.It Fl g Ar global-ctrl
 Global control interface.
 .It Fl h
 Show help text.
-.It Fl I
+.It Fl I Ar additional-config-file
 Additional configuration file.
 .It Fl K
 Include key information in debugging output.
@@ -144,20 +144,22 @@ Specify an additional interface and conf
 If multiple interfaces are specified then
 .Nm
 will manage them all with a single process.
-.It Fl O
+.It Fl O Ar override-ctrl
 Override ctrl_interface parameter for new interface.
-.It Fl o
+.It Fl o Ar override-driver
 Override driver paramter for new interface.
-.It Fl P
+.It Fl P Ar pidfile
 File in which to save the process PID.
-.It Fl p
+.It Fl p Ar parameters
 Specify driver parameters.
 .It Fl q
 Decrease debugging verbosity (i.e., counteract the use of the
 .Fl d
 flag).
 .It Fl s
-Send log messages through syslog(3) instead of to the terminal.
+Send log messages through
+.Xr syslog 3
+instead of to the terminal.
 .It Fl t
 Include timestamp in debug messages.
 .It Fl v

Re: CVS commit: src/external/bsd/wpa/bin/wpa_supplicant

2016-01-09 Thread Thomas Klausner 
Hi Roy!

Thanks for that.

Can you please go over the SYNOPSIS again? The changes there and the
changes in the long descriptions below don't match up.

E.g. -I is not in SYNOPSIS; -u is not in DESCRIPTION.

And then there's the usage of wpa_supplicant, which is
unsorted and also match up (e.g. missing -s, -t, -u, ...)

Thanks,
 Thomas

On Fri, Jan 08, 2016 at 11:37:58PM +, Roy Marples wrote:
> Module Name:  src
> Committed By: roy
> Date: Fri Jan  8 23:37:58 UTC 2016
> 
> Modified Files:
>   src/external/bsd/wpa/bin/wpa_supplicant: wpa_supplicant.8
> 
> Log Message:
> Update wpa_supplicant(8) to what it actually does.
> 
> 
> To generate a diff of this commit:
> cvs rdiff -u -r1.3 -r1.4 \
> src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8
> 
> Please note that diffs are not public domain; they are subject to the
> copyright notices on the relevant files.
>

CVS commit: src/external/bsd/wpa/bin/wpa_supplicant

2016-01-08 Thread Roy Marples 
Module Name:src
Committed By:   roy
Date:   Fri Jan  8 23:31:29 UTC 2016

Modified Files:
src/external/bsd/wpa/bin/wpa_supplicant: Makefile

Log Message:
Enable syslog support


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/wpa/bin/wpa_supplicant/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/wpa/bin/wpa_supplicant/Makefile
diff -u src/external/bsd/wpa/bin/wpa_supplicant/Makefile:1.5 src/external/bsd/wpa/bin/wpa_supplicant/Makefile:1.6
--- src/external/bsd/wpa/bin/wpa_supplicant/Makefile:1.5	Wed Apr  1 19:45:14 2015
+++ src/external/bsd/wpa/bin/wpa_supplicant/Makefile	Fri Jan  8 23:31:29 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2015/04/01 19:45:14 christos Exp $
+# $NetBSD: Makefile,v 1.6 2016/01/08 23:31:29 roy Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -57,6 +57,7 @@ CPPFLAGS+= \
 
 CPPFLAGS+=-DCONFIG_BACKEND_FILE
 CPPFLAGS+=-DCONFIG_PEERKEY
+CPPFLAGS+=-DCONFIG_DEBUG_SYSLOG
 CPPFLAGS+=-DCONFIG_DRIVER_WIRED
 CPPFLAGS+=-DCONFIG_DRIVER_BSD
 CPPFLAGS+=-DCONFIG_CTRL_IFACE

CVS commit: src/external/bsd/wpa/bin/wpa_supplicant

2016-01-08 Thread Roy Marples 
Module Name:src
Committed By:   roy
Date:   Fri Jan  8 23:31:29 UTC 2016

Modified Files:
src/external/bsd/wpa/bin/wpa_supplicant: Makefile

Log Message:
Enable syslog support


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/wpa/bin/wpa_supplicant/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/wpa/bin/wpa_supplicant

2016-01-08 Thread Roy Marples 
Module Name:src
Committed By:   roy
Date:   Fri Jan  8 23:37:58 UTC 2016

Modified Files:
src/external/bsd/wpa/bin/wpa_supplicant: wpa_supplicant.8

Log Message:
Update wpa_supplicant(8) to what it actually does.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/wpa/bin/wpa_supplicant

2016-01-08 Thread Roy Marples 
Module Name:src
Committed By:   roy
Date:   Fri Jan  8 23:37:58 UTC 2016

Modified Files:
src/external/bsd/wpa/bin/wpa_supplicant: wpa_supplicant.8

Log Message:
Update wpa_supplicant(8) to what it actually does.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8
diff -u src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8:1.3 src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8:1.4
--- src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8:1.3	Tue Mar 18 18:20:36 2014
+++ src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8	Fri Jan  8 23:37:58 2016
@@ -1,4 +1,4 @@
-.\" $NetBSD: wpa_supplicant.8,v 1.3 2014/03/18 18:20:36 riastradh Exp $
+.\" $NetBSD: wpa_supplicant.8,v 1.4 2016/01/08 23:37:58 roy Exp $
 .\"
 .\" Copyright (c) 2005 Sam Leffler 
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" Based on:
 .\" $FreeBSD: /repoman/r/ncvs/src/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8,v 1.2 2005/06/27 06:40:43 ru Exp $
 .\"
-.Dd January 22, 2010
+.Dd January 8, 2016
 .Dt WPA_SUPPLICANT 8
 .Os
 .Sh NAME
@@ -35,10 +35,19 @@
 .Nd WPA/802.11i Supplicant for wireless network devices
 .Sh SYNOPSIS
 .Nm
-.Op Fl BdehLqvw
+.Op Fl BdhLqstuvW
+.Op Fl b Ar br_ifname
+.Op Fl C Ar ctrl
+.Fl c Ar config-file
+.Op Fl D Ar driver
+.Op Fl e Ar entropy-file
 .Op Fl f Ar debug-file
+.Op Fl G Ar global-ctrl-group
+.Op Fl g Ar global-ctrl
 .Fl i Ar ifname
-.Fl c Ar config-file
+.Op Fl O Ar override-ctrl
+.Op Fl o Ar override-driver
+.Op Fl P Ar pidfile
 .Op Fl N i Ar ifname Fl c Ar config-file ...
 .Sh DESCRIPTION
 The
@@ -97,6 +106,12 @@ The following options are available:
 .It Fl B
 Detach from the controlling terminal and run as a daemon process
 in the background.
+.It Fl b
+Optional bridge interface name.
+.It Fl C
+Control interface parameter.
+.It Fl D
+Driver name (can be either bsd or wired)
 .It Fl d
 Enable debugging messages.
 If this option is supplied twice, more verbose messages are displayed.
@@ -104,16 +119,18 @@ Messages are sent to stdout by default, 
 This can be changed with the
 .Fl f
 flag.
-.It Fl e
-Use an external IEEE 802.1X Supplicant program and disable the
-internal Supplicant.
-This option is not normally used.
 .It Fl f
 Specifies a file to send debug messages to when enabled with the
 .Fl d
 flag.
+.It Fl G
+Global control interface group.
+.It Fl g
+Global control interface.
 .It Fl h
 Show help text.
+.It Fl I
+Additional configuration file.
 .It Fl K
 Include key information in debugging output.
 .It Fl L
@@ -123,27 +140,37 @@ Specify an additional interface and conf
 If multiple interfaces are specified then
 .Nm
 will manage them all with a single process.
+.It Fl O
+Override ctrl_interface parameter for new interface.
+.It Fl o
+Override driver paramter for new interface.
+.It Fl P
+File in which to save the process PID.
+.It Fl p
+Specify driver parameters.
 .It Fl q
 Decrease debugging verbosity (i.e., counteract the use of the
 .Fl d
 flag).
+.It Fl s
+Send log messages through syslog(3) instead of to the terminal.
+.It Fl t
+Include timestamp in debug messages.
 .It Fl v
 Display version information on the terminal and exit.
-.It Fl w
-If the specified interface is not present, wait for it to be
-added; e.g.\& a cardbus device to be inserted.
-.\" This option is not normally used; instead,
-.\" .Xr devd 8
-.\" should be configured to launch
-.\" .Nm
-.\" when a device is created.
+.It Fl W
+Wait for a control interface monitor before starting.
 .El
 .Sh SEE ALSO
 .Xr ath 4 ,
 .Xr ipw 4 ,
 .Xr iwi 4 ,
+.Xr iwn 4 ,
 .Xr ral 4 ,
+.Xr rum 4 ,
 .Xr wi 4 ,
+.Xr wpi 4 ,
+.Xr zyd 4 ,
 .Xr wpa_supplicant.conf 5 ,
 .Xr ifconfig 8 ,
 .Xr wpa_cli 8

CVS commit: src/external/bsd/wpa/bin/hostapd

2015-01-22 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Fri Jan 23 02:57:34 UTC 2015

Modified Files:
src/external/bsd/wpa/bin/hostapd: Makefile

Log Message:
move crypto file to the right group


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/wpa/bin/hostapd/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/wpa/bin/hostapd/Makefile
diff -u src/external/bsd/wpa/bin/hostapd/Makefile:1.6 src/external/bsd/wpa/bin/hostapd/Makefile:1.7
--- src/external/bsd/wpa/bin/hostapd/Makefile:1.6	Thu Oct 16 15:29:29 2014
+++ src/external/bsd/wpa/bin/hostapd/Makefile	Thu Jan 22 21:57:34 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/10/16 19:29:29 christos Exp $
+# $NetBSD: Makefile,v 1.7 2015/01/23 02:57:34 christos Exp $
 
 .include ${.CURDIR}/../Makefile.inc
 
@@ -84,6 +84,7 @@ eap_server_methods.c
 
 # crypto
 SRCS+= \
+crypto_openssl.c \
 md5.c \
 random.c \
 sha1-prf.c
@@ -144,7 +145,6 @@ aes-eax.c \
 aes-encblock.c \
 aes-omac1.c \
 aes-wrap.c \
-crypto_openssl.c \
 dh_groups.c \
 fips_prf_openssl.c \
 ms_funcs.c \

CVS commit: src/external/bsd/wpa/bin/hostapd

2015-01-22 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Fri Jan 23 02:57:34 UTC 2015

Modified Files:
src/external/bsd/wpa/bin/hostapd: Makefile

Log Message:
move crypto file to the right group


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/wpa/bin/hostapd/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/wpa/bin

2014-01-02 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Fri Jan  3 02:07:31 UTC 2014

Modified Files:
src/external/bsd/wpa/bin/hostapd: Makefile
src/external/bsd/wpa/bin/wpa_passphrase: Makefile
src/external/bsd/wpa/bin/wpa_supplicant: Makefile

Log Message:
update for 2.0


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/wpa/bin/hostapd/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/wpa/bin/wpa_passphrase/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/wpa/bin/wpa_supplicant/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/wpa/bin/hostapd/Makefile
diff -u src/external/bsd/wpa/bin/hostapd/Makefile:1.3 src/external/bsd/wpa/bin/hostapd/Makefile:1.4
--- src/external/bsd/wpa/bin/hostapd/Makefile:1.3	Sun Oct  7 20:03:20 2012
+++ src/external/bsd/wpa/bin/hostapd/Makefile	Thu Jan  2 21:07:31 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/10/08 00:03:20 christos Exp $
+# $NetBSD: Makefile,v 1.4 2014/01/03 02:07:31 christos Exp $
 
 .include ${.CURDIR}/../Makefile.inc
 
@@ -15,6 +15,7 @@ authsrv.c \
 beacon.c \
 ctrl_iface_ap.c \
 drv_callbacks.c \
+eap_user_db.c \
 hostapd.c \
 ieee802_11_auth.c \
 ieee802_11_shared.c \
@@ -39,11 +40,13 @@ wpa_ctrl.c
 # drivers
 SRCS+= \
 driver_bsd.c \
+driver_common.c \
 drivers.c
 
 # radius
 SRCS+= \
 radius.c \
+radius_das.c \
 radius_client.c \
 radius_server.c
 
@@ -82,10 +85,10 @@ eap_server_methods.c
 
 # crypto
 SRCS+= \
+crypto_openssl.c \
 md5.c \
 random.c \
-sha1.c \
-sha1-pbkdf2.c
+sha1-prf.c
 
 .PATH.c: \
 	${HOSTAPD_DISTDIR} \
@@ -143,7 +146,6 @@ aes-eax.c \
 aes-encblock.c \
 aes-omac1.c \
 aes-wrap.c \
-crypto_openssl.c \
 dh_groups.c \
 fips_prf_openssl.c \
 ms_funcs.c \

Index: src/external/bsd/wpa/bin/wpa_passphrase/Makefile
diff -u src/external/bsd/wpa/bin/wpa_passphrase/Makefile:1.1 src/external/bsd/wpa/bin/wpa_passphrase/Makefile:1.2
--- src/external/bsd/wpa/bin/wpa_passphrase/Makefile:1.1	Wed Aug  4 13:12:34 2010
+++ src/external/bsd/wpa/bin/wpa_passphrase/Makefile	Thu Jan  2 21:07:31 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/08/04 17:12:34 christos Exp $
+# $NetBSD: Makefile,v 1.2 2014/01/03 02:07:31 christos Exp $
 
 .include ${.CURDIR}/../Makefile.inc
 
@@ -8,8 +8,6 @@ PROG=	wpa_passphrase
 SRCS= \
 md5.c \
 os_unix.c \
-sha1-pbkdf2.c \
-sha1.c \
 wpa_debug.c \
 wpa_passphrase.c \
 wpabuf.c 

Index: src/external/bsd/wpa/bin/wpa_supplicant/Makefile
diff -u src/external/bsd/wpa/bin/wpa_supplicant/Makefile:1.2 src/external/bsd/wpa/bin/wpa_supplicant/Makefile:1.3
--- src/external/bsd/wpa/bin/wpa_supplicant/Makefile:1.2	Sun Oct  7 20:03:20 2012
+++ src/external/bsd/wpa/bin/wpa_supplicant/Makefile	Thu Jan  2 21:07:31 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/10/08 00:03:20 christos Exp $
+# $NetBSD: Makefile,v 1.3 2014/01/03 02:07:31 christos Exp $
 
 .include ${.CURDIR}/../Makefile.inc
 
@@ -32,7 +32,6 @@ pmksa_cache.c \
 preauth.c \
 random.c \
 scan.c \
-sha1.c \
 wpa.c \
 wpa_common.c \
 wpa_debug.c \
@@ -98,8 +97,8 @@ eap_tls_common.c \
 eap_ttls.c \
 ms_funcs.c \
 mschapv2.c \
-sha1-pbkdf2.c \
 sha1-tlsprf.c \
+sha1-prf.c \
 tls_openssl.c
 
 SRCS+=aes-ctr.c \

CVS commit: src/external/bsd/wpa/bin/hostapd

2014-01-02 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Fri Jan  3 02:15:43 UTC 2014

Modified Files:
src/external/bsd/wpa/bin/hostapd: Makefile

Log Message:
move crypto_openssl.c back into the right room.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/wpa/bin/hostapd/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/wpa/bin/hostapd/Makefile
diff -u src/external/bsd/wpa/bin/hostapd/Makefile:1.4 src/external/bsd/wpa/bin/hostapd/Makefile:1.5
--- src/external/bsd/wpa/bin/hostapd/Makefile:1.4	Thu Jan  2 21:07:31 2014
+++ src/external/bsd/wpa/bin/hostapd/Makefile	Thu Jan  2 21:15:43 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/01/03 02:07:31 christos Exp $
+# $NetBSD: Makefile,v 1.5 2014/01/03 02:15:43 christos Exp $
 
 .include ${.CURDIR}/../Makefile.inc
 
@@ -85,7 +85,6 @@ eap_server_methods.c
 
 # crypto
 SRCS+= \
-crypto_openssl.c \
 md5.c \
 random.c \
 sha1-prf.c
@@ -146,6 +145,7 @@ aes-eax.c \
 aes-encblock.c \
 aes-omac1.c \
 aes-wrap.c \
+crypto_openssl.c \
 dh_groups.c \
 fips_prf_openssl.c \
 ms_funcs.c \

CVS commit: src/external/bsd/wpa/bin

2014-01-02 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Fri Jan  3 02:07:31 UTC 2014

Modified Files:
src/external/bsd/wpa/bin/hostapd: Makefile
src/external/bsd/wpa/bin/wpa_passphrase: Makefile
src/external/bsd/wpa/bin/wpa_supplicant: Makefile

Log Message:
update for 2.0


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/wpa/bin/hostapd/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/wpa/bin/wpa_passphrase/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/wpa/bin/wpa_supplicant/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/wpa/bin/hostapd

2014-01-02 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Fri Jan  3 02:15:43 UTC 2014

Modified Files:
src/external/bsd/wpa/bin/hostapd: Makefile

Log Message:
move crypto_openssl.c back into the right room.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/wpa/bin/hostapd/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/wpa/bin/hostapd

2013-03-30 Thread Thomas Klausner 
Module Name:src
Committed By:   wiz
Date:   Sat Mar 30 08:24:18 UTC 2013

Modified Files:
src/external/bsd/wpa/bin/hostapd: hostapd.8

Log Message:
Remove '???' after Xr.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/wpa/bin/hostapd/hostapd.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/wpa/bin/hostapd/hostapd.8
diff -u src/external/bsd/wpa/bin/hostapd/hostapd.8:1.2 src/external/bsd/wpa/bin/hostapd/hostapd.8:1.3
--- src/external/bsd/wpa/bin/hostapd/hostapd.8:1.2	Sat Mar 30 02:38:58 2013
+++ src/external/bsd/wpa/bin/hostapd/hostapd.8	Sat Mar 30 08:24:17 2013
@@ -1,4 +1,4 @@
-.\	$NetBSD: hostapd.8,v 1.2 2013/03/30 02:38:58 christos Exp $
+.\	$NetBSD: hostapd.8,v 1.3 2013/03/30 08:24:17 wiz Exp $
 .\
 .\ Copyright (c) 2005 Sam Leffler s...@errno.com
 .\ All rights reserved.
@@ -116,7 +116,7 @@ Include key information in debugging out
 .Xr ral 4 ,
 .Xr rtw 4 ,
 .Xr rum 4 ,
-.Xr run 4 ,	???
+.Xr run 4 ,
 .Xr wi 4 ,
 .Xr hostapd.conf 5 ,
 .Xr hostapd_cli 8 ,

CVS commit: src/external/bsd/wpa/bin/hostapd

2013-03-30 Thread Thomas Klausner 
Module Name:src
Committed By:   wiz
Date:   Sat Mar 30 08:24:18 UTC 2013

Modified Files:
src/external/bsd/wpa/bin/hostapd: hostapd.8

Log Message:
Remove '???' after Xr.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/wpa/bin/hostapd/hostapd.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/wpa/bin/hostapd

2010-08-29 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sun Aug 29 15:53:01 UTC 2010

Modified Files:
src/external/bsd/wpa/bin/hostapd: Makefile

Log Message:
don't compile in ipv6 support unconditionally.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/wpa/bin/hostapd/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/wpa/bin/hostapd/Makefile
diff -u src/external/bsd/wpa/bin/hostapd/Makefile:1.1 src/external/bsd/wpa/bin/hostapd/Makefile:1.2
--- src/external/bsd/wpa/bin/hostapd/Makefile:1.1	Wed Aug  4 13:12:33 2010
+++ src/external/bsd/wpa/bin/hostapd/Makefile	Sun Aug 29 11:53:01 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/08/04 17:12:33 christos Exp $
+# $NetBSD: Makefile,v 1.2 2010/08/29 15:53:01 christos Exp $
 
 .include ${.CURDIR}/../Makefile.inc
 
@@ -101,7 +101,9 @@
 CPPFLAGS+= -DCONFIG_CTRL_IFACE
 CPPFLAGS+= -DCONFIG_CTRL_IFACE_UNIX
 CPPFLAGS+= -DCONFIG_DRIVER_BSD
+.if ${MKINET6} != no
 CPPFLAGS+= -DCONFIG_IPV6
+.endif
 CPPFLAGS+= -DCONFIG_PEERKEY
 CPPFLAGS+= -DCONFIG_RSN_PREAUTH

CVS commit: src/external/bsd/wpa/bin/wpa_supplicant

2010-08-04 Thread Thomas Klausner 
Module Name:src
Committed By:   wiz
Date:   Wed Aug  4 19:11:15 UTC 2010

Modified Files:
src/external/bsd/wpa/bin/wpa_supplicant: wpa_supplicant.conf.5

Log Message:
Comment out recommendation what to use with wlan(4) for ap_scan.

XXX: recommend something for NetBSD!


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.conf.5

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.conf.5
diff -u src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.conf.5:1.1 src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.conf.5:1.2
--- src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.conf.5:1.1	Wed Aug  4 17:12:34 2010
+++ src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.conf.5	Wed Aug  4 19:11:14 2010
@@ -1,4 +1,4 @@
-.\ $NetBSD: wpa_supplicant.conf.5,v 1.1 2010/08/04 17:12:34 christos Exp $
+.\ $NetBSD: wpa_supplicant.conf.5,v 1.2 2010/08/04 19:11:14 wiz Exp $
 .\
 .\ Copyright (c) 2005 Sam Leffler s...@errno.com
 .\ All rights reserved.
@@ -99,9 +99,10 @@
 access point, this value may be set to 2.
 .It Va ap_scan
 Access point scanning and selection control; one of 0, 1 (default), or 2.
-Only setting 1 should be used with the
-.Xr wlan 4
-module; the other settings are for use on other operating systems.
+.\ XXX: which one is good for NetBSD?
+.\Only setting 1 should be used with the
+.\.Xr wlan 4
+.\module; the other settings are for use on other operating systems.
 .It Va fast_reauth
 EAP fast re-authentication; either 1 (default) or 0.
 Control fast re-authentication support in EAP methods that support it.

CVS commit: src/external/bsd/wpa/bin/wpa_cli

2010-08-04 Thread Matthias Scheler 
Module Name:src
Committed By:   tron
Date:   Wed Aug  4 19:23:15 UTC 2010

Modified Files:
src/external/bsd/wpa/bin/wpa_cli: Makefile

Log Message:
Don't enable readline support for wpa_cli as libedit doesn't provide
the necessary rl_on_new_line function.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/wpa/bin/wpa_cli/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/wpa/bin/wpa_cli/Makefile
diff -u src/external/bsd/wpa/bin/wpa_cli/Makefile:1.1 src/external/bsd/wpa/bin/wpa_cli/Makefile:1.2
--- src/external/bsd/wpa/bin/wpa_cli/Makefile:1.1	Wed Aug  4 17:12:34 2010
+++ src/external/bsd/wpa/bin/wpa_cli/Makefile	Wed Aug  4 19:23:15 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/08/04 17:12:34 christos Exp $
+# $NetBSD: Makefile,v 1.2 2010/08/04 19:23:15 tron Exp $
 
 .include ${.CURDIR}/../Makefile.inc
 
@@ -7,7 +7,7 @@
 PROG=	wpa_cli
 SRCS=	wpa_cli.c wpa_ctrl.c os_unix.c
 
-CPPFLAGS+=-DCONFIG_READLINE
+#CPPFLAGS+=-DCONFIG_READLINE
 LDADD+=-ledit -lterminfo
 DPADD+=${LIBEDIT} ${LIBTERMINFO}

CVS commit: src/external/bsd/wpa/bin/wpa_cli

2010-08-04 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Aug  4 20:29:54 UTC 2010

Modified Files:
src/external/bsd/wpa/bin/wpa_cli: Makefile

Log Message:
put back libedit support.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/wpa/bin/wpa_cli/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/wpa/bin/wpa_cli/Makefile
diff -u src/external/bsd/wpa/bin/wpa_cli/Makefile:1.2 src/external/bsd/wpa/bin/wpa_cli/Makefile:1.3
--- src/external/bsd/wpa/bin/wpa_cli/Makefile:1.2	Wed Aug  4 15:23:15 2010
+++ src/external/bsd/wpa/bin/wpa_cli/Makefile	Wed Aug  4 16:29:54 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/08/04 19:23:15 tron Exp $
+# $NetBSD: Makefile,v 1.3 2010/08/04 20:29:54 christos Exp $
 
 .include ${.CURDIR}/../Makefile.inc
 
@@ -7,7 +7,7 @@
 PROG=	wpa_cli
 SRCS=	wpa_cli.c wpa_ctrl.c os_unix.c
 
-#CPPFLAGS+=-DCONFIG_READLINE
+CPPFLAGS+=-DCONFIG_READLINE
 LDADD+=-ledit -lterminfo
 DPADD+=${LIBEDIT} ${LIBTERMINFO}

CVS commit: src/external/bsd/wpa/bin/wpa_passphrase

2010-08-04 Thread Thomas Klausner 
Module Name:src
Committed By:   wiz
Date:   Wed Aug  4 19:10:50 UTC 2010

Modified Files:
src/external/bsd/wpa/bin/wpa_passphrase: wpa_passphrase.8

Log Message:
New sentence, new line.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/wpa/bin/wpa_passphrase/wpa_passphrase.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/wpa/bin/wpa_supplicant

2010-08-04 Thread Thomas Klausner 
Module Name:src
Committed By:   wiz
Date:   Wed Aug  4 19:11:15 UTC 2010

Modified Files:
src/external/bsd/wpa/bin/wpa_supplicant: wpa_supplicant.conf.5

Log Message:
Comment out recommendation what to use with wlan(4) for ap_scan.

XXX: recommend something for NetBSD!


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.conf.5

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/wpa/bin/wpa_cli

2010-08-04 Thread Matthias Scheler 
Module Name:src
Committed By:   tron
Date:   Wed Aug  4 19:23:15 UTC 2010

Modified Files:
src/external/bsd/wpa/bin/wpa_cli: Makefile

Log Message:
Don't enable readline support for wpa_cli as libedit doesn't provide
the necessary rl_on_new_line function.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/wpa/bin/wpa_cli/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.