aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Leffler <sam@FreeBSD.org>2006-12-23 22:44:47 +0000
committerSam Leffler <sam@FreeBSD.org>2006-12-23 22:44:47 +0000
commit53c9d997b5cf96913dee11a1004403af0dab0127 (patch)
tree4832fc3793583256f771269b31a615f80a3cbf73
parent1e489b3760270043fec133b90c69ddc11a06b7be (diff)
Notes
-rw-r--r--usr.sbin/wpa/Makefile4
-rw-r--r--usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.58
2 files changed, 10 insertions, 2 deletions
diff --git a/usr.sbin/wpa/Makefile b/usr.sbin/wpa/Makefile
index 31b3c746cb41..5d746e975305 100644
--- a/usr.sbin/wpa/Makefile
+++ b/usr.sbin/wpa/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
-SUBDIR= wpa_supplicant wpa_cli hostapd hostapd_cli ndis_events
+SUBDIR= wpa_supplicant wpa_cli wpa_passphrase
+SUBDIR+= hostapd hostapd_cli
+SUBDIR+= ndis_events
.include <bsd.subdir.mk>
diff --git a/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5 b/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5
index e1fb040ec85d..68c176f0f12b 100644
--- a/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5
+++ b/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5
@@ -218,7 +218,12 @@ an 8-63 character
.Tn ASCII
passphrase.
.Tn ASCII
-passphrases are converted to a 256-bit key using the network SSID.
+passphrases are dynamically converted to a 256-bit key at runtime
+using the network SSID, or they can be statically converted at
+configuration time using
+the
+.Xr wpa_passphrase 8
+utility.
.It Va eapol_flags
Dynamic WEP key usage for non-WPA mode, specified as a bit field.
Bit 0 (1) forces dynamically generated unicast WEP keys to be used.
@@ -511,6 +516,7 @@ network={
.Ed
.Sh SEE ALSO
.Xr wpa_cli 8 ,
+.Xr wpa_passphrase 8 ,
.Xr wpa_supplicant 8
.Sh HISTORY
The