jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update IBSS documentation to include RSN option

Browse source 
Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2013-12-23 20:21:17 +02:00
parent 3208c3e970
commit b2838baf6a
2 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
wpa_supplicant/config_ssid.h
View file

@ -315,12 +315,13 @@ struct wpa_ssid {
* 4 = P2P Group Formation (used internally; not in configuration * 4 = P2P Group Formation (used internally; not in configuration
* files) * files)
* *
* Note: IBSS can only be used with key_mgmt NONE (plaintext and * Note: IBSS can only be used with key_mgmt NONE (plaintext and static
* static WEP) and key_mgmt=WPA-NONE (fixed group key TKIP/CCMP). In * WEP) and WPA-PSK (with proto=RSN). In addition, key_mgmt=WPA-NONE
* addition, ap_scan has to be set to 2 for IBSS. WPA-None requires * (fixed group key TKIP/CCMP) is available for backwards compatibility,
* following network block options: proto=WPA, key_mgmt=WPA-NONE, * but its use is deprecated. WPA-None requires following network block
* pairwise=NONE, group=TKIP (or CCMP, but not both), and psk must also * options: proto=WPA, key_mgmt=WPA-NONE, pairwise=NONE, group=TKIP (or
* be set (either directly or using ASCII passphrase). * CCMP, but not both), and psk must also be set (either directly or
* using ASCII passphrase).
*/ */
enum wpas_mode { enum wpas_mode {
WPAS_MODE_INFRA = 0, WPAS_MODE_INFRA = 0,

21
wpa_supplicant/wpa_supplicant.conf
View file

@ -506,9 +506,10 @@ fast_reauth=1
# 0 = infrastructure (Managed) mode, i.e., associate with an AP (default) # 0 = infrastructure (Managed) mode, i.e., associate with an AP (default)
# 1 = IBSS (ad-hoc, peer-to-peer) # 1 = IBSS (ad-hoc, peer-to-peer)
# 2 = AP (access point) # 2 = AP (access point)
# Note: IBSS can only be used with key_mgmt NONE (plaintext and static WEP) # Note: IBSS can only be used with key_mgmt NONE (plaintext and static WEP) and
# and key_mgmt=WPA-NONE (fixed group key TKIP/CCMP). WPA-None requires # WPA-PSK (with proto=RSN). In addition, key_mgmt=WPA-NONE (fixed group key
# following network block options: # TKIP/CCMP) is available for backwards compatibility, but its use is
# deprecated. WPA-None requires following network block options:
# proto=WPA, key_mgmt=WPA-NONE, pairwise=NONE, group=TKIP (or CCMP, but not # proto=WPA, key_mgmt=WPA-NONE, pairwise=NONE, group=TKIP (or CCMP, but not
# both), and psk must also be set. # both), and psk must also be set.
# #
@ -1163,7 +1164,19 @@ network={
} }
# IBSS/ad-hoc network with WPA-None/TKIP. # IBSS/ad-hoc network with RSN
network={
ssid="ibss-rsn"
key_mgmt=WPA-PSK
proto=RSN
psk="12345678"
mode=1
frequency=2412
pairwise=CCMP
group=CCMP
}
# IBSS/ad-hoc network with WPA-None/TKIP (deprecated)
network={ network={
ssid="test adhoc" ssid="test adhoc"
mode=1 mode=1