mac80211: aead api to reduce redundancy
Currently, the aes_ccm.c and aes_gcm.c are almost line by line copy of each other. This patch reduce code redundancy by moving the code in these two files to crypto/aead_api.c to make it a higher level aead api. The file aes_ccm.c and aes_gcm.c are removed and all the functions there are now implemented in their headers using the newly added aead api. Signed-off-by: Xiang Gao <qasdfgtyuiop@gmail.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
@@ -9,16 +9,38 @@
|
||||
#ifndef AES_GCM_H
|
||||
#define AES_GCM_H
|
||||
|
||||
#include <linux/crypto.h>
|
||||
#include "aead_api.h"
|
||||
|
||||
#define GCM_AAD_LEN 32
|
||||
|
||||
int ieee80211_aes_gcm_encrypt(struct crypto_aead *tfm, u8 *j_0, u8 *aad,
|
||||
u8 *data, size_t data_len, u8 *mic);
|
||||
int ieee80211_aes_gcm_decrypt(struct crypto_aead *tfm, u8 *j_0, u8 *aad,
|
||||
u8 *data, size_t data_len, u8 *mic);
|
||||
struct crypto_aead *ieee80211_aes_gcm_key_setup_encrypt(const u8 key[],
|
||||
size_t key_len);
|
||||
void ieee80211_aes_gcm_key_free(struct crypto_aead *tfm);
|
||||
static inline int ieee80211_aes_gcm_encrypt(struct crypto_aead *tfm,
|
||||
u8 *j_0, u8 *aad, u8 *data,
|
||||
size_t data_len, u8 *mic)
|
||||
{
|
||||
return aead_encrypt(tfm, j_0, aad + 2,
|
||||
be16_to_cpup((__be16 *)aad),
|
||||
data, data_len, mic);
|
||||
}
|
||||
|
||||
static inline int ieee80211_aes_gcm_decrypt(struct crypto_aead *tfm,
|
||||
u8 *j_0, u8 *aad, u8 *data,
|
||||
size_t data_len, u8 *mic)
|
||||
{
|
||||
return aead_decrypt(tfm, j_0, aad + 2,
|
||||
be16_to_cpup((__be16 *)aad),
|
||||
data, data_len, mic);
|
||||
}
|
||||
|
||||
static inline struct crypto_aead *
|
||||
ieee80211_aes_gcm_key_setup_encrypt(const u8 key[], size_t key_len)
|
||||
{
|
||||
return aead_key_setup_encrypt("gcm(aes)", key,
|
||||
key_len, IEEE80211_GCMP_MIC_LEN);
|
||||
}
|
||||
|
||||
static inline void ieee80211_aes_gcm_key_free(struct crypto_aead *tfm)
|
||||
{
|
||||
return aead_key_free(tfm);
|
||||
}
|
||||
|
||||
#endif /* AES_GCM_H */
|
||||
|
Reference in New Issue
Block a user