Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-22 06:29:23 +01:00
Code Releases Activity

crypto: Rename BIP to BIP_CMAC

Browse Source 
To match the spec more closely.  Several additional BIP algorithms are
being introduced, including BIP_GMAC_128|256 and BIP_CMAC_256.
This commit is contained in:
Denis Kenzior 2022-10-19 16:21:34 -05:00
parent b85b92b3ee
commit 201b85e8da
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/crypto.c
View File

@ -501,7 +501,7 @@ int crypto_cipher_key_len(enum crypto_cipher cipher)
return 32; return 32;
case CRYPTO_CIPHER_CCMP: case CRYPTO_CIPHER_CCMP:
return 16; return 16;
case CRYPTO_CIPHER_BIP: case CRYPTO_CIPHER_BIP_CMAC:
return 16; return 16;
} }

2
src/crypto.h
View File

@ -30,7 +30,7 @@ enum crypto_cipher {
CRYPTO_CIPHER_WEP104 = 0x000fac05, CRYPTO_CIPHER_WEP104 = 0x000fac05,
CRYPTO_CIPHER_TKIP = 0x000fac02, CRYPTO_CIPHER_TKIP = 0x000fac02,
CRYPTO_CIPHER_CCMP = 0x000fac04, CRYPTO_CIPHER_CCMP = 0x000fac04,
CRYPTO_CIPHER_BIP = 0x000fac06, CRYPTO_CIPHER_BIP_CMAC = 0x000fac06,
}; };
enum crypto_akm { enum crypto_akm {

2
src/ie.c
View File

@ -429,7 +429,7 @@ uint32_t ie_rsn_cipher_suite_to_cipher(enum ie_rsn_cipher_suite suite)
case IE_RSN_CIPHER_SUITE_WEP104: case IE_RSN_CIPHER_SUITE_WEP104:
return CRYPTO_CIPHER_WEP104; return CRYPTO_CIPHER_WEP104;
case IE_RSN_CIPHER_SUITE_BIP: case IE_RSN_CIPHER_SUITE_BIP:
return CRYPTO_CIPHER_BIP; return CRYPTO_CIPHER_BIP_CMAC;
default: default:
return 0; return 0;
} }

2
src/netdev.c
View File

@ -1684,7 +1684,7 @@ static void netdev_set_igtk(struct handshake_state *hs, uint16_t key_index,
} }
switch (cipher) { switch (cipher) {
case CRYPTO_CIPHER_BIP: case CRYPTO_CIPHER_BIP_CMAC:
memcpy(igtk_buf, igtk, 16); memcpy(igtk_buf, igtk, 16);
break; break;
default: default:

2
src/wiphy.c
View File

@ -1215,7 +1215,7 @@ static void parse_supported_ciphers(struct wiphy *wiphy, const void *data,
case CRYPTO_CIPHER_WEP104: case CRYPTO_CIPHER_WEP104:
wiphy->supported_ciphers |= IE_RSN_CIPHER_SUITE_WEP104; wiphy->supported_ciphers |= IE_RSN_CIPHER_SUITE_WEP104;
break; break;
case CRYPTO_CIPHER_BIP: case CRYPTO_CIPHER_BIP_CMAC:
wiphy->supported_ciphers |= IE_RSN_CIPHER_SUITE_BIP; wiphy->supported_ciphers |= IE_RSN_CIPHER_SUITE_BIP;
break; break;
default: /* TODO: Support other ciphers */ default: /* TODO: Support other ciphers */

4
tools/hwsim.c
View File

@ -175,7 +175,7 @@ static const uint32_t hwsim_supported_ciphers[] = {
CRYPTO_CIPHER_WEP104, CRYPTO_CIPHER_WEP104,
CRYPTO_CIPHER_TKIP, CRYPTO_CIPHER_TKIP,
CRYPTO_CIPHER_CCMP, CRYPTO_CIPHER_CCMP,
CRYPTO_CIPHER_BIP, CRYPTO_CIPHER_BIP_CMAC,
}; };
static uint32_t hwsim_ciphers[L_ARRAY_SIZE(hwsim_supported_ciphers)]; static uint32_t hwsim_ciphers[L_ARRAY_SIZE(hwsim_supported_ciphers)];
static int hwsim_num_ciphers = 0; static int hwsim_num_ciphers = 0;
@ -196,7 +196,7 @@ static const struct hwsim_support cipher_map[] = {
{ "wep104", CRYPTO_CIPHER_WEP104 }, { "wep104", CRYPTO_CIPHER_WEP104 },
{ "tkip", CRYPTO_CIPHER_TKIP }, { "tkip", CRYPTO_CIPHER_TKIP },
{ "ccmp", CRYPTO_CIPHER_CCMP }, { "ccmp", CRYPTO_CIPHER_CCMP },
{ "bip", CRYPTO_CIPHER_BIP }, { "bip", CRYPTO_CIPHER_BIP_CMAC },
{ } { }
}; };