WPS ER: Add command for configuring an AP

[mech_eap.git] / wpa_supplicant / wps_supplicant.c

diff --git a/wpa_supplicant/wps_supplicant.c b/wpa_supplicant/wps_supplicant.c
index 28526da..2b90e57 100644 (file)
--- a/wpa_supplicant/wps_supplicant.c
+++ b/wpa_supplicant/wps_supplicant.c
@@ -468,6 +468,32 @@ static void wpa_supplicant_wps_event_er_enrollee_remove(
 }
 
 
+static void wpa_supplicant_wps_event_er_ap_settings(
+       struct wpa_supplicant *wpa_s,
+       struct wps_event_er_ap_settings *ap_settings)
+{
+       char uuid_str[100];
+       char key_str[65];
+       const struct wps_credential *cred = ap_settings->cred;
+
+       key_str[0] = '\0';
+       if (cred->auth_type & (WPS_AUTH_WPAPSK | WPS_AUTH_WPA2PSK)) {
+               if (cred->key_len >= 8 && cred->key_len <= 64) {
+                       os_memcpy(key_str, cred->key, cred->key_len);
+                       key_str[cred->key_len] = '\0';
+               }
+       }
+
+       uuid_bin2str(ap_settings->uuid, uuid_str, sizeof(uuid_str));
+       /* Use wpa_msg_ctrl to avoid showing the key in debug log */
+       wpa_msg_ctrl(wpa_s, MSG_INFO, WPS_EVENT_ER_AP_SETTINGS
+                    "uuid=%s ssid=%s auth_type=0x%04x encr_type=0x%04x "
+                    "key=%s",
+                    uuid_str, wpa_ssid_txt(cred->ssid, cred->ssid_len),
+                    cred->auth_type, cred->encr_type, key_str);
+}
+
+
 static void wpa_supplicant_wps_event(void *ctx, enum wps_event event,
                                     union wps_event_data *data)
 {
@@ -502,6 +528,10 @@ static void wpa_supplicant_wps_event(void *ctx, enum wps_event event,
                wpa_supplicant_wps_event_er_enrollee_remove(wpa_s,
                                                            &data->enrollee);
                break;
+       case WPS_EV_ER_AP_SETTINGS:
+               wpa_supplicant_wps_event_er_ap_settings(wpa_s,
+                                                       &data->ap_settings);
+               break;
        }
 }
 
@@ -1164,6 +1194,57 @@ int wpas_wps_er_learn(struct wpa_supplicant *wpa_s, const char *uuid,
 }
 
 
+int wpas_wps_er_config(struct wpa_supplicant *wpa_s, const char *uuid,
+                      const char *pin, struct wps_new_ap_settings *settings)
+{
+       u8 u[UUID_LEN];
+       struct wps_credential cred;
+       size_t len;
+
+       if (uuid_str2bin(uuid, u))
+               return -1;
+       if (settings->ssid_hex == NULL || settings->auth == NULL ||
+           settings->encr == NULL || settings->key_hex == NULL)
+               return -1;
+
+       os_memset(&cred, 0, sizeof(cred));
+       len = os_strlen(settings->ssid_hex);
+       if ((len & 1) || len > 2 * sizeof(cred.ssid) ||
+           hexstr2bin(settings->ssid_hex, cred.ssid, len / 2))
+               return -1;
+       cred.ssid_len = len / 2;
+
+       len = os_strlen(settings->key_hex);
+       if ((len & 1) || len > 2 * sizeof(cred.key) ||
+           hexstr2bin(settings->key_hex, cred.key, len / 2))
+               return -1;
+       cred.key_len = len / 2;
+
+       if (os_strcmp(settings->auth, "OPEN") == 0)
+               cred.auth_type = WPS_AUTH_OPEN;
+       else if (os_strcmp(settings->auth, "WPAPSK") == 0)
+               cred.auth_type = WPS_AUTH_WPAPSK;
+       else if (os_strcmp(settings->auth, "WPA2PSK") == 0)
+               cred.auth_type = WPS_AUTH_WPA2PSK;
+       else
+               return -1;
+
+       if (os_strcmp(settings->encr, "NONE") == 0)
+               cred.encr_type = WPS_ENCR_NONE;
+       else if (os_strcmp(settings->encr, "WEP") == 0)
+               cred.encr_type = WPS_ENCR_WEP;
+       else if (os_strcmp(settings->encr, "TKIP") == 0)
+               cred.encr_type = WPS_ENCR_TKIP;
+       else if (os_strcmp(settings->encr, "CCMP") == 0)
+               cred.encr_type = WPS_ENCR_AES;
+       else
+               return -1;
+
+       return wps_er_config(wpa_s->wps_er, u, (const u8 *) pin,
+                            os_strlen(pin), &cred);
+}
+
+
 static void wpas_wps_terminate_cb(void *ctx)
 {
        wpa_printf(MSG_DEBUG, "WPS ER: Terminated");