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

mka: Remove references to macsec_qca from wpa_supplicant.conf

Browse source 
Make the documentation generic, as this is no longer the only macsec
driver.

Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
This commit is contained in:
Sabrina Dubroca 2016-11-27 20:08:56 +01:00 committed by Jouni Malinen
parent f014d9dbf0
commit ba5ea11687
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
wpa_supplicant/wpa_supplicant.conf
View file

@ -98,9 +98,7 @@ eapol_version=1
# parameters (e.g., WPA IE generation); this mode can also be used with # parameters (e.g., WPA IE generation); this mode can also be used with
# non-WPA drivers when using IEEE 802.1X mode; do not try to associate with # non-WPA drivers when using IEEE 802.1X mode; do not try to associate with
# APs (i.e., external program needs to control association). This mode must # APs (i.e., external program needs to control association). This mode must
# also be used when using wired Ethernet drivers. # also be used when using wired Ethernet drivers (including MACsec).
# Note: macsec_qca driver is one type of Ethernet driver which implements
# macsec feature.
# 2: like 0, but associate with APs using security policy and SSID (but not # 2: like 0, but associate with APs using security policy and SSID (but not
# BSSID); this can be used, e.g., with ndiswrapper and NDIS drivers to # BSSID); this can be used, e.g., with ndiswrapper and NDIS drivers to
# enable operation with hidden SSIDs and optimized roaming; in this mode, # enable operation with hidden SSIDs and optimized roaming; in this mode,
@ -881,13 +879,13 @@ fast_reauth=1
# bit0 (1): require dynamically generated unicast WEP key # bit0 (1): require dynamically generated unicast WEP key
# bit1 (2): require dynamically generated broadcast WEP key # bit1 (2): require dynamically generated broadcast WEP key
# (3 = require both keys; default) # (3 = require both keys; default)
# Note: When using wired authentication (including macsec_qca driver), # Note: When using wired authentication (including MACsec drivers),
# eapol_flags must be set to 0 for the authentication to be completed # eapol_flags must be set to 0 for the authentication to be completed
# successfully. # successfully.
# #
# macsec_policy: IEEE 802.1X/MACsec options # macsec_policy: IEEE 802.1X/MACsec options
# This determines how sessions are secured with MACsec. It is currently # This determines how sessions are secured with MACsec (only for MACsec
# applicable only when using the macsec_qca driver interface. # drivers).
# 0: MACsec not in use (default) # 0: MACsec not in use (default)
# 1: MACsec enabled - Should secure, accept key server's advice to # 1: MACsec enabled - Should secure, accept key server's advice to
# determine whether to use a secure session or not. # determine whether to use a secure session or not.