CHROMIUMOS: wpa_supplicant: Accept raw PMK in new DBus API

wpa_supplicant/dbus/dbus_new_handlers.c

 /*
  * WPA Supplicant / dbus-based control interface
  * Copyright (c) 2006, Dan Williams <dcbw@redhat.com> and Red Hat, Inc.
  * Copyright (c) 2009-2010, Witold Sowa <witold.sowa@gmail.com>
  * Copyright (c) 2009, 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.
  *
@@ skipping 177 matching lines @@
         return reply;
 }
 
 
 static const char *dont_quote[] = {
         "key_mgmt", "proto", "pairwise", "auth_alg", "group", "eap",
         "opensc_engine_path", "pkcs11_engine_path", "pkcs11_module_path",
         "bssid", NULL
 };
 
-static dbus_bool_t should_quote_opt(const char *key)
+static dbus_bool_t should_quote_opt(const char *key,
+                                    size_t value_length,
+                                    char *value)
 {
         int i = 0;
         while (dont_quote[i] != NULL) {
                 if (os_strcmp(key, dont_quote[i]) == 0)
                         return FALSE;
                 i++;
         }
+
+        /*
+         * Do not quote psk value which is a raw key.
+         */
+        if ((os_strcmp(key, "psk") == 0) && (value_length == PMK_LEN*2)) {
+                u8 tmp_buf[PMK_LEN];
+
+                if (hexstr2bin(value, tmp_buf, PMK_LEN) == 0)
+                        return FALSE;
+        }
+
         return TRUE;
 }
 
 /**
  * get_iface_by_dbus_path - Get a new network interface
  * @global: Pointer to global data from wpa_supplicant_init()
  * @path: Pointer to a dbus object path representing an interface
  * Returns: Pointer to the interface or %NULL if not found
  */
 static struct wpa_supplicant * get_iface_by_dbus_path(
@@ skipping 50 matching lines @@
                         value = os_zalloc(size);
                         if (value == NULL)
                                 goto error;
 
                         ret = wpa_snprintf_hex(value, size,
                                                (u8 *) entry.bytearray_value,
                                                entry.array_len);
                         if (ret <= 0)
                                 goto error;
                 } else if (entry.type == DBUS_TYPE_STRING) {
-                        if (should_quote_opt(entry.key)) {
-                                size = os_strlen(entry.str_value);
-                                if (size <= 0)
-                                        goto error;
+                        size = os_strlen(entry.str_value);
+                        if (size <= 0)
+                                goto error;
 
+                        if (should_quote_opt(entry.key, size,
+                                             entry.str_value)) {
                                 size += 3;
                                 value = os_zalloc(size);
                                 if (value == NULL)
                                         goto error;
 
                                 ret = os_snprintf(value, size, "\"%s\"",
                                                   entry.str_value);
                                 if (ret < 0 || (size_t) ret != (size - 1))
                                         goto error;
                         } else {
@@ skipping 2870 matching lines @@
         dbus_message_iter_recurse(&iter, &variant_iter);
 
         reply = set_network_properties(message, net->wpa_s, ssid,
                                        &variant_iter);
         if (reply)
                 wpa_printf(MSG_DEBUG, "dbus control interface couldn't set "
                            "network properties");
 
         return reply;
 }