Browse Source

nl80211: Use defines for NL80211_KEY_CIPHER values

Jouni Malinen 15 years ago
parent
commit
2aa5f84709
1 changed files with 8 additions and 5 deletions
  1. 8 5
      src/drivers/driver_nl80211.c

+ 8 - 5
src/drivers/driver_nl80211.c

@@ -1882,18 +1882,21 @@ static int nl_add_key(struct nl_msg *msg, wpa_alg alg,
 	switch (alg) {
 	switch (alg) {
 	case WPA_ALG_WEP:
 	case WPA_ALG_WEP:
 		if (key_len == 5)
 		if (key_len == 5)
-			NLA_PUT_U32(msg, NL80211_KEY_CIPHER, 0x000FAC01);
+			NLA_PUT_U32(msg, NL80211_KEY_CIPHER,
+				    WLAN_CIPHER_SUITE_WEP40);
 		else
 		else
-			NLA_PUT_U32(msg, NL80211_KEY_CIPHER, 0x000FAC05);
+			NLA_PUT_U32(msg, NL80211_KEY_CIPHER,
+				    WLAN_CIPHER_SUITE_WEP104);
 		break;
 		break;
 	case WPA_ALG_TKIP:
 	case WPA_ALG_TKIP:
-		NLA_PUT_U32(msg, NL80211_KEY_CIPHER, 0x000FAC02);
+		NLA_PUT_U32(msg, NL80211_KEY_CIPHER, WLAN_CIPHER_SUITE_TKIP);
 		break;
 		break;
 	case WPA_ALG_CCMP:
 	case WPA_ALG_CCMP:
-		NLA_PUT_U32(msg, NL80211_KEY_CIPHER, 0x000FAC04);
+		NLA_PUT_U32(msg, NL80211_KEY_CIPHER, WLAN_CIPHER_SUITE_CCMP);
 		break;
 		break;
 	case WPA_ALG_IGTK:
 	case WPA_ALG_IGTK:
-		NLA_PUT_U32(msg, NL80211_KEY_CIPHER, 0x000FAC06);
+		NLA_PUT_U32(msg, NL80211_KEY_CIPHER,
+			    WLAN_CIPHER_SUITE_AES_CMAC);
 		break;
 		break;
 	default:
 	default:
 		wpa_printf(MSG_ERROR, "%s: Unsupported encryption "
 		wpa_printf(MSG_ERROR, "%s: Unsupported encryption "