Rename WPA_ALG_IGTK to use the correct cipher name for BIP

IGTK is the key that is used a BIP cipher. WPA_ALG_IGTK was the
historical name used for this enum value when only the AES-128-CMAC
based BIP algorithm was supported. Rename this to match the style used
with the other BIP options.

Signed-off-by: Jouni Malinen <j@w1.fi>

diff --git a/src/ap/wpa_auth_glue.c b/src/ap/wpa_auth_glue.c
index 169be37ab056f92cd267ffa30554ccb2fcb0d1fc..05d87ac5045beaacaddad10b8f6803a97a99cf55 100644 (file)
--- a/src/ap/wpa_auth_glue.c
+++ b/src/ap/wpa_auth_glue.c
@@ -453,7 +453,7 @@ static int hostapd_wpa_auth_set_key(void *ctx, int vlan_id, enum wpa_alg alg,
                                os_memcpy(sta->last_tk, key, key_len);
                        sta->last_tk_len = key_len;
                }
-       } else if (alg == WPA_ALG_IGTK ||
+       } else if (alg == WPA_ALG_BIP_CMAC_128 ||
                   alg == WPA_ALG_BIP_GMAC_128 ||
                   alg == WPA_ALG_BIP_GMAC_256 ||
                   alg == WPA_ALG_BIP_CMAC_256) {

diff --git a/src/common/defs.h b/src/common/defs.h
index bcf6f543b96d24bee3738e785d21ffb2252b7994..27c55de055481bb1d9a42f13a4fecb6155513013 100644 (file)
--- a/src/common/defs.h
+++ b/src/common/defs.h
@@ -190,7 +190,7 @@ enum wpa_alg {
        WPA_ALG_WEP,
        WPA_ALG_TKIP,
        WPA_ALG_CCMP,
-       WPA_ALG_IGTK,
+       WPA_ALG_BIP_CMAC_128,
        WPA_ALG_GCMP,
        WPA_ALG_SMS4,
        WPA_ALG_KRK,

diff --git a/src/common/wpa_common.c b/src/common/wpa_common.c
index bddc696cf10582779e76e79226ae0d3dcf0930bb..1e7498a9eeaa346cc911830206d6826d2dce37f2 100644 (file)
--- a/src/common/wpa_common.c
+++ b/src/common/wpa_common.c
@@ -2305,7 +2305,7 @@ enum wpa_alg wpa_cipher_to_alg(int cipher)
        case WPA_CIPHER_TKIP:
                return WPA_ALG_TKIP;
        case WPA_CIPHER_AES_128_CMAC:
-               return WPA_ALG_IGTK;
+               return WPA_ALG_BIP_CMAC_128;
        case WPA_CIPHER_BIP_GMAC_128:
                return WPA_ALG_BIP_GMAC_128;
        case WPA_CIPHER_BIP_GMAC_256:

diff --git a/src/drivers/driver.h b/src/drivers/driver.h
index b0713249f49dd8fafb24d04986e7b4fea3ab6143..782725efb672fd48e5ed3234e6d0b1c451fb532b 100644 (file)
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
@@ -1553,8 +1553,9 @@ struct wpa_driver_set_key_params {
         * alg - Encryption algorithm
         *
         * (%WPA_ALG_NONE, %WPA_ALG_WEP, %WPA_ALG_TKIP, %WPA_ALG_CCMP,
-        * %WPA_ALG_IGTK, %WPA_ALG_GCMP, %WPA_ALG_GCMP_256, %WPA_ALG_CCMP_256,
-        * %WPA_ALG_BIP_GMAC_128, %WPA_ALG_BIP_GMAC_256, %WPA_ALG_BIP_CMAC_256);
+        * %WPA_ALG_BIP_AES_CMAC_128, %WPA_ALG_GCMP, %WPA_ALG_GCMP_256,
+        * %WPA_ALG_CCMP_256, %WPA_ALG_BIP_GMAC_128, %WPA_ALG_BIP_GMAC_256,
+        * %WPA_ALG_BIP_CMAC_256);
         * %WPA_ALG_NONE clears the key. */
        enum wpa_alg alg;
 

diff --git a/src/drivers/driver_atheros.c b/src/drivers/driver_atheros.c
index d630c3dc43d484e69dc8511ef466a68cf23f11e1..9b4166d22947ef8a48eddc40a133b1f4a7fcd6d5 100644 (file)
--- a/src/drivers/driver_atheros.c
+++ b/src/drivers/driver_atheros.c
@@ -532,7 +532,7 @@ atheros_set_key(void *priv, struct wpa_driver_set_key_params *params)
                cipher = IEEE80211_CIPHER_AES_GCM_256;
                break;
 #endif /* ATH_GCM_SUPPORT */
-       case WPA_ALG_IGTK:
+       case WPA_ALG_BIP_CMAC_128:
                cipher = IEEE80211_CIPHER_AES_CMAC;
                break;
 #ifdef ATH_GCM_SUPPORT

diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
index 2790346f4bea1c221752494fbf79e2f527293bec..017cc30d59c5afcb12d1060a8becef385c5602e1 100644 (file)
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -2927,7 +2927,7 @@ static u32 wpa_alg_to_cipher_suite(enum wpa_alg alg, size_t key_len)
                return RSN_CIPHER_SUITE_CCMP_256;
        case WPA_ALG_GCMP_256:
                return RSN_CIPHER_SUITE_GCMP_256;
-       case WPA_ALG_IGTK:
+       case WPA_ALG_BIP_CMAC_128:
                return RSN_CIPHER_SUITE_AES_128_CMAC;
        case WPA_ALG_BIP_GMAC_128:
                return RSN_CIPHER_SUITE_BIP_GMAC_128;
@@ -3284,7 +3284,7 @@ static int wpa_driver_nl80211_set_key(struct i802_bss *bss,
                goto fail2;
        if (!key_msg ||
            nla_put_u8(key_msg, NL80211_KEY_IDX, key_idx) ||
-           nla_put_flag(key_msg, (alg == WPA_ALG_IGTK ||
+           nla_put_flag(key_msg, (alg == WPA_ALG_BIP_CMAC_128 ||
                                   alg == WPA_ALG_BIP_GMAC_128 ||
                                   alg == WPA_ALG_BIP_GMAC_256 ||
                                   alg == WPA_ALG_BIP_CMAC_256) ?
@@ -3356,7 +3356,7 @@ static int nl_add_key(struct nl_msg *msg, enum wpa_alg alg,
        if (!suite)
                return -1;
 
-       if (defkey && alg == WPA_ALG_IGTK) {
+       if (defkey && alg == WPA_ALG_BIP_CMAC_128) {
                if (nla_put_flag(msg, NL80211_KEY_DEFAULT_MGMT))
                        return -1;
        } else if (defkey) {

diff --git a/src/drivers/driver_wext.c b/src/drivers/driver_wext.c
index 8a3adee05241178f49fe623b659c0da3b9abfad5..0f0ad1f537faa5a3865c89b275ddc8b98528c491 100644 (file)
--- a/src/drivers/driver_wext.c
+++ b/src/drivers/driver_wext.c
@@ -1773,7 +1773,7 @@ static int wpa_driver_wext_set_key_ext(void *priv, enum wpa_alg alg,
                case WPA_ALG_CCMP:
                        ext->alg = IW_ENCODE_ALG_CCMP;
                        break;
-               case WPA_ALG_IGTK:
+               case WPA_ALG_BIP_CMAC_128:
                        ext->alg = IW_ENCODE_ALG_AES_CMAC;
                        break;
                default: