document WPA-PSK support.

"i would really appreciate just something going in" jmc@

1 files changed, 17 insertions, 16 deletions

diff --git a/share/man/man4/malo.4 b/share/man/man4/malo.4
index 584969a023f..c61b6d2257a 100644
--- a/share/man/man4/malo.4
+++ b/share/man/man4/malo.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: malo.4,v 1.26 2008/07/27 13:02:38 mglocker Exp $
+.\"	$OpenBSD: malo.4,v 1.27 2008/07/28 20:10:28 damien Exp $
 .\"
 .\" Copyright (c) 2006 Theo de Raadt.
 .\"
@@ -26,7 +26,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 27 2008 $
+.Dd $Mdocdate: July 28 2008 $
 .Os
 .Dt MALO 4
 .Sh NAME
@@ -73,16 +73,13 @@ capture packets from networks which it wouldn't normally have access to,
 or to scan for access points.
 .El
 .Pp
+The
+.Nm
+driver can be configured to use the WEP, WPA-PSK and WPA2-PSK protocols.
+The
 .Nm
-supports software WEP.
-Wired Equivalent Privacy (WEP) is the de facto encryption standard
-for wireless networks.
-It can be typically configured in one of three modes:
-no encryption; 40-bit encryption; or 104-bit encryption.
-Unfortunately, due to serious weaknesses in WEP protocol
-it is strongly recommended that it not be used as the
-sole mechanism to secure wireless communication.
-WEP is not enabled by default.
+driver relies on the software 802.11 stack for both encryption and decryption
+of data frames.
 .Pp
 The
 .Nm
@@ -148,16 +145,19 @@ dhcp NONE NONE NONE nwkey 0x1deadbeef1 chan 11
 .\"	mediaopt hostap nwid my_net chan 11
 .\".Ed
 .\".Pp
-Configure malo0 for WEP, using hex key
-.Dq 0x1deadbeef1 :
+Configure malo0 to join network
+.Dq my_net
+using WPA-PSK with passphrase
+.Dq my_passphrase :
 .Bd -literal -offset indent
-# ifconfig malo0 nwkey 0x1deadbeef1
+# _psk=$(wpa-psk my_net my_passphrase)
+# ifconfig malo0 nwid my_net wpa wpapsk ${_psk}
 .Ed
 .Pp
 Return malo0 to its default settings:
 .Bd -literal -offset indent
 # ifconfig malo0 -bssid -chan media autoselect \e
-	nwid "" -nwkey
+	nwid "" -nwkey -wpa -wpapsk
 .Ed
 .Pp
 Join an existing BSS network,
@@ -174,7 +174,8 @@ Join an existing BSS network,
 .Xr pci 4 ,
 .Xr hostname.if 5 ,
 .Xr hostapd 8 ,
-.Xr ifconfig 8
+.Xr ifconfig 8 ,
+.Xr wpa-psk 8
 .Sh HISTORY
 The
 .Nm