DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

dbus: Document more possible BSS/RSA/KeyMgmt values

Browse source 
This is probably not ideal, since it would be better if it ended up
being autogenerated somehow, but at least it's somewhat of an
improvement.

Also added a comment that encourages keeping the docs in sync.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
This commit is contained in:
Lubomir Rintel 2019-01-23 10:38:49 +01:00 committed by Jouni Malinen
parent 1e591df063
commit 98251c6f21
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/dbus.doxygen
View file

@ -2028,7 +2028,7 @@ scan results.
<h3>RSN - a{sv} - (read)</h3> <h3>RSN - a{sv} - (read)</h3>
<p>RSN information of the BSS. Empty dictionary indicates no RSN support. Dictionary entries are:</p> <p>RSN information of the BSS. Empty dictionary indicates no RSN support. Dictionary entries are:</p>
<table> <table>
<tr><td>KeyMgmt</td><td>as</td><td>Key management suite. Possible array elements: "wpa-psk", "wpa-eap", "wpa-ft-psk", "wpa-ft-eap", "wpa-psk-sha256", "wpa-eap-sha256",</td> <tr><td>KeyMgmt</td><td>as</td><td>Key management suite. Possible array elements: "wpa-psk", "wpa-ft-psk", "wpa-psk-sha256", "wpa-eap", "wpa-ft-eap", "wpa-eap-sha256", "wpa-eap-suite-b", "wpa-eap-suite-b-192", "wpa-fils-sha256", "wpa-fils-sha384", "wpa-ft-fils-sha256", "wpa-ft-fils-sha384", "sae", "ft-sae", "wpa-none"</td>
<tr><td>Pairwise</td><td>as</td><td>Pairwise cipher suites. Possible array elements: "ccmp", "tkip"</td> <tr><td>Pairwise</td><td>as</td><td>Pairwise cipher suites. Possible array elements: "ccmp", "tkip"</td>
<tr><td>Group</td><td>s</td><td>Group cipher suite. Possible values are: "ccmp", "tkip", "wep104", "wep40"</td> <tr><td>Group</td><td>s</td><td>Group cipher suite. Possible values are: "ccmp", "tkip", "wep104", "wep40"</td>
<tr><td>MgmtGroup</td><td>s</td><td>Mangement frames cipher suite. Possible values are: "aes128cmac"</td> <tr><td>MgmtGroup</td><td>s</td><td>Mangement frames cipher suite. Possible values are: "aes128cmac"</td>

7
wpa_supplicant/dbus/dbus_new_handlers.c
View file

@ -4507,7 +4507,12 @@ static dbus_bool_t wpas_dbus_get_bss_security_prop(
if (!wpa_dbus_dict_open_write(&variant_iter, &iter_dict)) if (!wpa_dbus_dict_open_write(&variant_iter, &iter_dict))
goto nomem; goto nomem;
/* KeyMgmt */ /*
* KeyMgmt
*
* When adding a new entry here, please take care to extend key_mgmt[]
* and keep documentation in doc/dbus.doxygen up to date.
*/
n = 0; n = 0;
if (ie_data->key_mgmt & WPA_KEY_MGMT_PSK) if (ie_data->key_mgmt & WPA_KEY_MGMT_PSK)
key_mgmt[n++] = "wpa-psk"; key_mgmt[n++] = "wpa-psk";