Revert "nl80211: Share the same routine for NL80211_ATTR_KEY_CIPHER setup"

This reverts commit 5aa9cb5cca24268ae3a8cc35c85215b4a9a513b6.

The nested key attribute is using different attribute values
(NL80211_KEY_* vs. NL80211_ATTR_KEY_*), so cannot share the same routine
for these purposes..

diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
index 8fb71cf..5f7d681 100644 (file)
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -1754,41 +1754,6 @@ nla_put_failure:
 }
 
 
-static int nl_put_key_cipher(struct nl_msg *msg, wpa_alg alg, size_t key_len)
-{
-       switch (alg) {
-       case WPA_ALG_WEP:
-               if (key_len == 5)
-                       NLA_PUT_U32(msg, NL80211_ATTR_KEY_CIPHER,
-                                   WLAN_CIPHER_SUITE_WEP40);
-               else
-                       NLA_PUT_U32(msg, NL80211_ATTR_KEY_CIPHER,
-                                   WLAN_CIPHER_SUITE_WEP104);
-               break;
-       case WPA_ALG_TKIP:
-               NLA_PUT_U32(msg, NL80211_ATTR_KEY_CIPHER,
-                           WLAN_CIPHER_SUITE_TKIP);
-               break;
-       case WPA_ALG_CCMP:
-               NLA_PUT_U32(msg, NL80211_ATTR_KEY_CIPHER,
-                           WLAN_CIPHER_SUITE_CCMP);
-               break;
-       case WPA_ALG_IGTK:
-               NLA_PUT_U32(msg, NL80211_ATTR_KEY_CIPHER,
-                           WLAN_CIPHER_SUITE_AES_CMAC);
-               break;
-       default:
-               wpa_printf(MSG_ERROR, "%s: Unsupported encryption algorithm "
-                          "%d", __func__, alg);
-               return -1;
-       }
-       return 0;
-
-nla_put_failure:
-       return -ENOBUFS;
-}
-
-
 static int nl_set_encr(int ifindex, struct wpa_driver_nl80211_data *drv,
                       wpa_alg alg, const u8 *addr, int key_idx, int set_tx,
                       const u8 *seq, size_t seq_len,
@@ -1813,7 +1778,30 @@ static int nl_set_encr(int ifindex, struct wpa_driver_nl80211_data *drv,
                genlmsg_put(msg, 0, 0, genl_family_get_id(drv->nl80211), 0,
                            0, NL80211_CMD_NEW_KEY, 0);
                NLA_PUT(msg, NL80211_ATTR_KEY_DATA, key_len, key);
-               if (nl_put_key_cipher(msg, alg, key_len)) {
+               switch (alg) {
+               case WPA_ALG_WEP:
+                       if (key_len == 5)
+                               NLA_PUT_U32(msg, NL80211_ATTR_KEY_CIPHER,
+                                           WLAN_CIPHER_SUITE_WEP40);
+                       else
+                               NLA_PUT_U32(msg, NL80211_ATTR_KEY_CIPHER,
+                                           WLAN_CIPHER_SUITE_WEP104);
+                       break;
+               case WPA_ALG_TKIP:
+                       NLA_PUT_U32(msg, NL80211_ATTR_KEY_CIPHER,
+                                   WLAN_CIPHER_SUITE_TKIP);
+                       break;
+               case WPA_ALG_CCMP:
+                       NLA_PUT_U32(msg, NL80211_ATTR_KEY_CIPHER,
+                                   WLAN_CIPHER_SUITE_CCMP);
+                       break;
+               case WPA_ALG_IGTK:
+                       NLA_PUT_U32(msg, NL80211_ATTR_KEY_CIPHER,
+                                   WLAN_CIPHER_SUITE_AES_CMAC);
+                       break;
+               default:
+                       wpa_printf(MSG_ERROR, "%s: Unsupported encryption "
+                                  "algorithm %d", __func__, alg);
                        nlmsg_free(msg);
                        return -1;
                }
@@ -1891,8 +1879,27 @@ static int nl_add_key(struct nl_msg *msg, wpa_alg alg,
 
        NLA_PUT_U8(msg, NL80211_KEY_IDX, key_idx);
 
-       if (nl_put_key_cipher(msg, alg, key_len))
+       switch (alg) {
+       case WPA_ALG_WEP:
+               if (key_len == 5)
+                       NLA_PUT_U32(msg, NL80211_KEY_CIPHER, 0x000FAC01);
+               else
+                       NLA_PUT_U32(msg, NL80211_KEY_CIPHER, 0x000FAC05);
+               break;
+       case WPA_ALG_TKIP:
+               NLA_PUT_U32(msg, NL80211_KEY_CIPHER, 0x000FAC02);
+               break;
+       case WPA_ALG_CCMP:
+               NLA_PUT_U32(msg, NL80211_KEY_CIPHER, 0x000FAC04);
+               break;
+       case WPA_ALG_IGTK:
+               NLA_PUT_U32(msg, NL80211_KEY_CIPHER, 0x000FAC06);
+               break;
+       default:
+               wpa_printf(MSG_ERROR, "%s: Unsupported encryption "
+                          "algorithm %d", __func__, alg);
                return -1;
+       }
 
        if (seq && seq_len)
                NLA_PUT(msg, NL80211_KEY_SEQ, seq_len, seq);