Updated through tag hostap_2_5 from git://w1.fi/hostap.git

[mech_eap.git] / libeap / wpa_supplicant / config_winreg.c

diff --git a/libeap/wpa_supplicant/config_winreg.c b/libeap/wpa_supplicant/config_winreg.c
index deebbd9..199f04f 100644 (file)
--- a/libeap/wpa_supplicant/config_winreg.c
+++ b/libeap/wpa_supplicant/config_winreg.c
@@ -2,14 +2,8 @@
  * WPA Supplicant / Configuration backend: Windows registry
  * Copyright (c) 2003-2008, Jouni Malinen <j@w1.fi>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * Alternatively, this software may be distributed under the terms of BSD
- * license.
- *
- * See README and COPYING for more details.
+ * This software may be distributed under the terms of the BSD license.
+ * See README for more details.
  *
  * This file implements a configuration backend for Windows registry. All the
  * configuration information is stored in the registry and the format for
@@ -208,6 +202,7 @@ static int wpa_config_read_global_os_version(struct wpa_config *config,
 static int wpa_config_read_global(struct wpa_config *config, HKEY hk)
 {
        int errors = 0;
+       int val;
 
        wpa_config_read_reg_dword(hk, TEXT("ap_scan"), &config->ap_scan);
        wpa_config_read_reg_dword(hk, TEXT("fast_reauth"),
@@ -247,8 +242,13 @@ static int wpa_config_read_global(struct wpa_config *config, HKEY hk)
                hk, TEXT("model_name"));
        config->serial_number = wpa_config_read_reg_string(
                hk, TEXT("serial_number"));
-       config->device_type = wpa_config_read_reg_string(
-               hk, TEXT("device_type"));
+       {
+               char *t = wpa_config_read_reg_string(
+                       hk, TEXT("device_type"));
+               if (t && wps_dev_type_str2bin(t, config->device_type))
+                       errors++;
+               os_free(t);
+       }
        config->config_methods = wpa_config_read_reg_string(
                hk, TEXT("config_methods"));
        if (wpa_config_read_global_os_version(config, hk))
@@ -259,12 +259,22 @@ static int wpa_config_read_global(struct wpa_config *config, HKEY hk)
 #ifdef CONFIG_P2P
        config->p2p_ssid_postfix = wpa_config_read_reg_string(
                hk, TEXT("p2p_ssid_postfix"));
+       wpa_config_read_reg_dword(hk, TEXT("p2p_group_idle"),
+                                 (int *) &config->p2p_group_idle);
 #endif /* CONFIG_P2P */
 
        wpa_config_read_reg_dword(hk, TEXT("bss_max_count"),
                                  (int *) &config->bss_max_count);
        wpa_config_read_reg_dword(hk, TEXT("filter_ssids"),
                                  &config->filter_ssids);
+       wpa_config_read_reg_dword(hk, TEXT("max_num_sta"),
+                                 (int *) &config->max_num_sta);
+       wpa_config_read_reg_dword(hk, TEXT("disassoc_low_ack"),
+                                 (int *) &config->disassoc_low_ack);
+
+       wpa_config_read_reg_dword(hk, TEXT("okc"), &config->okc);
+       wpa_config_read_reg_dword(hk, TEXT("pmf"), &val);
+       config->pmf = val;
 
        return errors ? -1 : 0;
 }
@@ -292,6 +302,7 @@ static struct wpa_ssid * wpa_config_read_network(HKEY hk, const TCHAR *netw,
                RegCloseKey(nhk);
                return NULL;
        }
+       dl_list_init(&ssid->psk_list);
        ssid->id = id;
 
        wpa_config_set_network_defaults(ssid);
@@ -339,15 +350,6 @@ static struct wpa_ssid * wpa_config_read_network(HKEY hk, const TCHAR *netw,
                wpa_config_update_psk(ssid);
        }
 
-       if ((ssid->key_mgmt & (WPA_KEY_MGMT_PSK | WPA_KEY_MGMT_FT_PSK |
-                              WPA_KEY_MGMT_PSK_SHA256)) &&
-           !ssid->psk_set) {
-               wpa_printf(MSG_ERROR, "WPA-PSK accepted for key management, "
-                          "but no PSK configured for network '" TSTR "'.",
-                          netw);
-               errors++;
-       }
-
        if ((ssid->group_cipher & WPA_CIPHER_CCMP) &&
            !(ssid->pairwise_cipher & WPA_CIPHER_CCMP) &&
            !(ssid->pairwise_cipher & WPA_CIPHER_NONE)) {
@@ -433,7 +435,7 @@ static int wpa_config_read_networks(struct wpa_config *config, HKEY hk)
 }
 
 
-struct wpa_config * wpa_config_read(const char *name)
+struct wpa_config * wpa_config_read(const char *name, struct wpa_config *cfgp)
 {
        TCHAR buf[256];
        int errors = 0;
@@ -441,7 +443,12 @@ struct wpa_config * wpa_config_read(const char *name)
        HKEY hk;
        LONG ret;
 
-       config = wpa_config_alloc_empty(NULL, NULL);
+       if (name == NULL)
+               return NULL;
+       if (cfgp)
+               config = cfgp;
+       else
+               config = wpa_config_alloc_empty(NULL, NULL);
        if (config == NULL)
                return NULL;
        wpa_printf(MSG_DEBUG, "Reading configuration profile '%s'", name);
@@ -579,7 +586,12 @@ static int wpa_config_write_global(struct wpa_config *config, HKEY hk)
        wpa_config_write_reg_string(hk, "model_number", config->model_number);
        wpa_config_write_reg_string(hk, "serial_number",
                                    config->serial_number);
-       wpa_config_write_reg_string(hk, "device_type", config->device_type);
+       {
+               char _buf[WPS_DEV_TYPE_BUFSIZE], *buf;
+               buf = wps_dev_type_bin2str(config->device_type,
+                                          _buf, sizeof(_buf));
+               wpa_config_write_reg_string(hk, "device_type", buf);
+       }
        wpa_config_write_reg_string(hk, "config_methods",
                                    config->config_methods);
        if (WPA_GET_BE32(config->os_version)) {
@@ -594,6 +606,8 @@ static int wpa_config_write_global(struct wpa_config *config, HKEY hk)
 #ifdef CONFIG_P2P
        wpa_config_write_reg_string(hk, "p2p_ssid_postfix",
                                    config->p2p_ssid_postfix);
+       wpa_config_write_reg_dword(hk, TEXT("p2p_group_idle"),
+                                  config->p2p_group_idle, 0);
 #endif /* CONFIG_P2P */
 
        wpa_config_write_reg_dword(hk, TEXT("bss_max_count"),
@@ -601,6 +615,16 @@ static int wpa_config_write_global(struct wpa_config *config, HKEY hk)
                                   DEFAULT_BSS_MAX_COUNT);
        wpa_config_write_reg_dword(hk, TEXT("filter_ssids"),
                                   config->filter_ssids, 0);
+       wpa_config_write_reg_dword(hk, TEXT("max_num_sta"),
+                                  config->max_num_sta, DEFAULT_MAX_NUM_STA);
+       wpa_config_write_reg_dword(hk, TEXT("disassoc_low_ack"),
+                                  config->disassoc_low_ack, 0);
+
+       wpa_config_write_reg_dword(hk, TEXT("okc"), config->okc, 0);
+       wpa_config_write_reg_dword(hk, TEXT("pmf"), config->pmf, 0);
+
+       wpa_config_write_reg_dword(hk, TEXT("external_sim"),
+                                  config->external_sim, 0);
 
        return 0;
 }
@@ -897,13 +921,18 @@ static int wpa_config_write_network(HKEY hk, struct wpa_ssid *ssid, int id)
        INT_DEFe(fragment_size, DEFAULT_FRAGMENT_SIZE);
 #endif /* IEEE8021X_EAPOL */
        INT(mode);
-       INT(proactive_key_caching);
+       write_int(netw, "proactive_key_caching", ssid->proactive_key_caching,
+                 -1);
        INT(disabled);
        INT(peerkey);
 #ifdef CONFIG_IEEE80211W
-       INT(ieee80211w);
+       write_int(netw, "ieee80211w", ssid->ieee80211w,
+                 MGMT_FRAME_PROTECTION_DEFAULT);
 #endif /* CONFIG_IEEE80211W */
        STR(id_str);
+#ifdef CONFIG_HS20
+       INT(update_identifier);
+#endif /* CONFIG_HS20 */
 
 #undef STR
 #undef INT