hostapd: Fix internal crypto build without TLS

[wpasupplicant] / hostapd / wps_hostapd.c

diff --git a/hostapd/wps_hostapd.c b/hostapd/wps_hostapd.c
index e0e7c0d..15cb7a1 100644 (file)
--- a/hostapd/wps_hostapd.c
+++ b/hostapd/wps_hostapd.c
@@ -26,6 +26,7 @@
 #include "wps/wps_defs.h"
 #include "wps/wps_dev_attr.h"
 #include "wps_hostapd.h"
+#include "dh_groups.h"
 
 
 #ifdef CONFIG_WPS_UPNP
@@ -219,13 +220,13 @@ static int hostapd_wps_cred_cb(void *ctx, const struct wps_credential *cred)
        if ((hapd->conf->wps_cred_processing == 1 ||
             hapd->conf->wps_cred_processing == 2) && cred->cred_attr) {
                size_t blen = cred->cred_attr_len * 2 + 1;
-               char *buf = os_malloc(blen);
-               if (buf) {
-                       wpa_snprintf_hex(buf, blen,
+               char *_buf = os_malloc(blen);
+               if (_buf) {
+                       wpa_snprintf_hex(_buf, blen,
                                         cred->cred_attr, cred->cred_attr_len);
                        wpa_msg(hapd, MSG_INFO, "%s%s",
-                               WPS_EVENT_NEW_AP_SETTINGS, buf);
-                       os_free(buf);
+                               WPS_EVENT_NEW_AP_SETTINGS, _buf);
+                       os_free(_buf);
                }
        } else
                wpa_msg(hapd, MSG_INFO, WPS_EVENT_NEW_AP_SETTINGS);
@@ -233,6 +234,28 @@ static int hostapd_wps_cred_cb(void *ctx, const struct wps_credential *cred)
        if (hapd->conf->wps_cred_processing == 1)
                return 0;
 
+       os_memcpy(hapd->wps->ssid, cred->ssid, cred->ssid_len);
+       hapd->wps->ssid_len = cred->ssid_len;
+       hapd->wps->encr_types = cred->encr_type;
+       hapd->wps->auth_types = cred->auth_type;
+       if (cred->key == NULL) {
+               os_free(hapd->wps->network_key);
+               hapd->wps->network_key = NULL;
+               hapd->wps->network_key_len = 0;
+       } else {
+               if (hapd->wps->network_key == NULL ||
+                   hapd->wps->network_key_len < cred->key_len) {
+                       hapd->wps->network_key_len = 0;
+                       os_free(hapd->wps->network_key);
+                       hapd->wps->network_key = os_malloc(cred->key_len);
+                       if (hapd->wps->network_key == NULL)
+                               return -1;
+               }
+               hapd->wps->network_key_len = cred->key_len;
+               os_memcpy(hapd->wps->network_key, cred->key, cred->key_len);
+       }
+       hapd->wps->wps_state = WPS_STATE_CONFIGURED;
+
        len = os_strlen(hapd->iface->config_fname) + 5;
        tmp_fname = os_malloc(len);
        if (tmp_fname == NULL)
@@ -332,12 +355,15 @@ static int hostapd_wps_cred_cb(void *ctx, const struct wps_credential *cred)
                                key_idx--;
                        fprintf(nconf, "wep_default_key=%d\n", key_idx);
                        fprintf(nconf, "wep_key%d=", key_idx);
-                       if (cred->key_len != 10 && cred->key_len != 26)
-                               fputc('"', nconf);
-                       for (i = 0; i < cred->key_len; i++)
-                               fputc(cred->key[i], nconf);
-                       if (cred->key_len != 10 && cred->key_len != 26)
-                               fputc('"', nconf);
+                       if (cred->key_len == 10 || cred->key_len == 26) {
+                               /* WEP key as a hex string */
+                               for (i = 0; i < cred->key_len; i++)
+                                       fputc(cred->key[i], nconf);
+                       } else {
+                               /* Raw WEP key; convert to hex */
+                               for (i = 0; i < cred->key_len; i++)
+                                       fprintf(nconf, "%02x", cred->key[i]);
+                       }
                        fprintf(nconf, "\n");
                }
        }
@@ -623,6 +649,8 @@ int hostapd_init_wps(struct hostapd_data *hapd,
        cfg.extra_cred_len = conf->extra_cred_len;
        cfg.disable_auto_conf = (hapd->conf->wps_cred_processing == 1) &&
                conf->skip_cred_build;
+       if (conf->ssid.security_policy == SECURITY_STATIC_WEP)
+               cfg.static_wep_only = 1;
 
        wps->registrar = wps_registrar_init(wps, &cfg);
        if (wps->registrar == NULL) {
@@ -664,6 +692,10 @@ void hostapd_deinit_wps(struct hostapd_data *hapd)
        wps_registrar_deinit(hapd->wps->registrar);
        os_free(hapd->wps->network_key);
        wps_device_data_free(&hapd->wps->dev);
+       wpabuf_free(hapd->wps->dh_pubkey);
+       wpabuf_free(hapd->wps->dh_privkey);
+       wpabuf_free(hapd->wps->oob_conf.pubkey_hash);
+       wpabuf_free(hapd->wps->oob_conf.dev_password);
        wps_free_pending_msgs(hapd->wps->upnp_msgs);
        os_free(hapd->wps);
        hapd->wps = NULL;
@@ -696,6 +728,59 @@ int hostapd_wps_button_pushed(struct hostapd_data *hapd)
 }
 
 
+#ifdef CONFIG_WPS_OOB
+int hostapd_wps_start_oob(struct hostapd_data *hapd, char *device_type,
+                         char *path, char *method, char *name)
+{
+       struct wps_context *wps = hapd->wps;
+       struct oob_device_data *oob_dev;
+
+       oob_dev = wps_get_oob_device(device_type);
+       if (oob_dev == NULL)
+               return -1;
+       oob_dev->device_path = path;
+       oob_dev->device_name = name;
+       wps->oob_conf.oob_method = wps_get_oob_method(method);
+
+       if (wps->oob_conf.oob_method == OOB_METHOD_DEV_PWD_R) {
+               /*
+                * Use pre-configured DH keys in order to be able to write the
+                * key hash into the OOB file.
+                */
+               wpabuf_free(wps->dh_pubkey);
+               wpabuf_free(wps->dh_privkey);
+               wps->dh_privkey = NULL;
+               wps->dh_pubkey = dh_init(dh_groups_get(WPS_DH_GROUP),
+                                        &wps->dh_privkey);
+               wps->dh_pubkey = wpabuf_zeropad(wps->dh_pubkey, 192);
+               if (wps->dh_pubkey == NULL) {
+                       wpa_printf(MSG_ERROR, "WPS: Failed to initialize "
+                                  "Diffie-Hellman handshake");
+                       return -1;
+               }
+       }
+
+       if (wps_process_oob(wps, oob_dev, 1) < 0)
+               goto error;
+
+       if ((wps->oob_conf.oob_method == OOB_METHOD_DEV_PWD_E ||
+            wps->oob_conf.oob_method == OOB_METHOD_DEV_PWD_R) &&
+           hostapd_wps_add_pin(hapd, "any",
+                               wpabuf_head(wps->oob_conf.dev_password)) < 0)
+               goto error;
+
+       return 0;
+
+error:
+       wpabuf_free(wps->dh_pubkey);
+       wps->dh_pubkey = NULL;
+       wpabuf_free(wps->dh_privkey);
+       wps->dh_privkey = NULL;
+       return -1;
+}
+#endif /* CONFIG_WPS_OOB */
+
+
 void hostapd_wps_probe_req_rx(struct hostapd_data *hapd, const u8 *addr,
                              const u8 *ie, size_t ie_len)
 {