diff options
| author | Assaf Krauss <assaf.krauss@intel.com> | 2012-08-01 15:12:48 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2012-10-23 19:52:52 +0200 |
| commit | 5d0d04e477c44993f995f35b728ce9dd57a4615e (patch) | |
| tree | 4f6ce81d78efc9f139ec25bc9f3c56a193d88ec2 | |
| parent | 9a90bc81914ee77edcd6eb7e881639b7f7bf1667 (diff) | |
| download | linux-3.10-5d0d04e477c44993f995f35b728ce9dd57a4615e.tar.gz linux-3.10-5d0d04e477c44993f995f35b728ce9dd57a4615e.tar.bz2 linux-3.10-5d0d04e477c44993f995f35b728ce9dd57a4615e.zip | |
mac80211: expose AES-CMAC subkey calculation
Expose a function for the AES-CMAC subkey calculation
to drivers. This is the first step of the AES-CMAC
cipher key setup and may be required for CMAC hardware
offloading.
Signed-off-by: Assaf Krauss <assaf.krauss@intel.com>
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
| -rw-r--r-- | include/net/mac80211.h | 13 | ||||
| -rw-r--r-- | net/mac80211/aes_cmac.c | 17 |
2 files changed, 30 insertions, 0 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 71c2f9c2f5b..00b7204708b 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -3223,6 +3223,19 @@ void ieee80211_get_tkip_p2k(struct ieee80211_key_conf *keyconf, struct sk_buff *skb, u8 *p2k); /** + * ieee80211_aes_cmac_calculate_k1_k2 - calculate the AES-CMAC sub keys + * + * This function computes the two AES-CMAC sub-keys, based on the + * previously installed master key. + * + * @keyconf: the parameter passed with the set key + * @k1: a buffer to be filled with the 1st sub-key + * @k2: a buffer to be filled with the 2nd sub-key + */ +void ieee80211_aes_cmac_calculate_k1_k2(struct ieee80211_key_conf *keyconf, + u8 *k1, u8 *k2); + +/** * struct ieee80211_key_seq - key sequence counter * * @tkip: TKIP data, containing IV32 and IV16 in host byte order diff --git a/net/mac80211/aes_cmac.c b/net/mac80211/aes_cmac.c index a04752e9102..493353534a0 100644 --- a/net/mac80211/aes_cmac.c +++ b/net/mac80211/aes_cmac.c @@ -126,3 +126,20 @@ void ieee80211_aes_cmac_key_free(struct crypto_cipher *tfm) { crypto_free_cipher(tfm); } + +void ieee80211_aes_cmac_calculate_k1_k2(struct ieee80211_key_conf *keyconf, + u8 *k1, u8 *k2) +{ + u8 l[AES_BLOCK_SIZE] = {}; + struct ieee80211_key *key = + container_of(keyconf, struct ieee80211_key, conf); + + crypto_cipher_encrypt_one(key->u.aes_cmac.tfm, l, l); + + memcpy(k1, l, AES_BLOCK_SIZE); + gf_mulx(k1); + + memcpy(k2, k1, AES_BLOCK_SIZE); + gf_mulx(k2); +} +EXPORT_SYMBOL(ieee80211_aes_cmac_calculate_k1_k2); |