Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto updates from Herbert Xu: "Here is the crypto update for 5.3: API: - Test shash interface directly in testmgr - cra_driver_name is now mandatory Algorithms: - Replace arc4 crypto_cipher with library helper - Implement 5 way interleave for ECB, CBC and CTR on arm64 - Add xxhash - Add continuous self-test on noise source to drbg - Update jitter RNG Drivers: - Add support for SHA204A random number generator - Add support for 7211 in iproc-rng200 - Fix fuzz test failures in inside-secure - Fix fuzz test failures in talitos - Fix fuzz test failures in qat" * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (143 commits) crypto: stm32/hash - remove interruptible condition for dma crypto: stm32/hash - Fix hmac issue more than 256 bytes crypto: stm32/crc32 - rename driver file crypto: amcc - remove memset after dma_alloc_coherent crypto: ccp - Switch to SPDX license identifiers crypto: ccp - Validate the the error value used to index error messages crypto: doc - Fix formatting of new crypto engine content crypto: doc - Add parameter documentation crypto: arm64/aes-ce - implement 5 way interleave for ECB, CBC and CTR crypto: arm64/aes-ce - add 5 way interleave routines crypto: talitos - drop icv_ool crypto: talitos - fix hash on SEC1. crypto: talitos - move struct talitos_edesc into talitos.h lib/scatterlist: Fix mapping iterator when sg->offset is greater than PAGE_SIZE crypto/NX: Set receive window credits to max number of CRBs in RxFIFO crypto: asymmetric_keys - select CRYPTO_HASH where needed crypto: serpent - mark __serpent_setkey_sbox noinline crypto: testmgr - dynamically allocate crypto_shash crypto: testmgr - dynamically allocate testvec_config crypto: talitos - eliminate unneeded 'done' functions at build time ...
This commit is contained in:
Linus Torvalds
@@ -9,6 +9,7 @@
|
||||
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||
|
||||
#include <linux/err.h>
|
||||
#include <linux/fips.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/slab.h>
|
||||
@@ -25,6 +26,7 @@
|
||||
#include <linux/ieee80211.h>
|
||||
#include <net/iw_handler.h>
|
||||
|
||||
#include <crypto/arc4.h>
|
||||
#include <crypto/hash.h>
|
||||
#include <linux/crypto.h>
|
||||
#include <linux/crc32.h>
|
||||
@@ -60,9 +62,9 @@ struct lib80211_tkip_data {
|
||||
|
||||
int key_idx;
|
||||
|
||||
struct crypto_cipher *rx_tfm_arc4;
|
||||
struct arc4_ctx rx_ctx_arc4;
|
||||
struct arc4_ctx tx_ctx_arc4;
|
||||
struct crypto_shash *rx_tfm_michael;
|
||||
struct crypto_cipher *tx_tfm_arc4;
|
||||
struct crypto_shash *tx_tfm_michael;
|
||||
|
||||
/* scratch buffers for virt_to_page() (crypto API) */
|
||||
@@ -89,30 +91,21 @@ static void *lib80211_tkip_init(int key_idx)
|
||||
{
|
||||
struct lib80211_tkip_data *priv;
|
||||
|
||||
if (fips_enabled)
|
||||
return NULL;
|
||||
|
||||
priv = kzalloc(sizeof(*priv), GFP_ATOMIC);
|
||||
if (priv == NULL)
|
||||
goto fail;
|
||||
|
||||
priv->key_idx = key_idx;
|
||||
|
||||
priv->tx_tfm_arc4 = crypto_alloc_cipher("arc4", 0, 0);
|
||||
if (IS_ERR(priv->tx_tfm_arc4)) {
|
||||
priv->tx_tfm_arc4 = NULL;
|
||||
goto fail;
|
||||
}
|
||||
|
||||
priv->tx_tfm_michael = crypto_alloc_shash("michael_mic", 0, 0);
|
||||
if (IS_ERR(priv->tx_tfm_michael)) {
|
||||
priv->tx_tfm_michael = NULL;
|
||||
goto fail;
|
||||
}
|
||||
|
||||
priv->rx_tfm_arc4 = crypto_alloc_cipher("arc4", 0, 0);
|
||||
if (IS_ERR(priv->rx_tfm_arc4)) {
|
||||
priv->rx_tfm_arc4 = NULL;
|
||||
goto fail;
|
||||
}
|
||||
|
||||
priv->rx_tfm_michael = crypto_alloc_shash("michael_mic", 0, 0);
|
||||
if (IS_ERR(priv->rx_tfm_michael)) {
|
||||
priv->rx_tfm_michael = NULL;
|
||||
@@ -124,9 +117,7 @@ static void *lib80211_tkip_init(int key_idx)
|
||||
fail:
|
||||
if (priv) {
|
||||
crypto_free_shash(priv->tx_tfm_michael);
|
||||
crypto_free_cipher(priv->tx_tfm_arc4);
|
||||
crypto_free_shash(priv->rx_tfm_michael);
|
||||
crypto_free_cipher(priv->rx_tfm_arc4);
|
||||
kfree(priv);
|
||||
}
|
||||
|
||||
@@ -138,11 +129,9 @@ static void lib80211_tkip_deinit(void *priv)
|
||||
struct lib80211_tkip_data *_priv = priv;
|
||||
if (_priv) {
|
||||
crypto_free_shash(_priv->tx_tfm_michael);
|
||||
crypto_free_cipher(_priv->tx_tfm_arc4);
|
||||
crypto_free_shash(_priv->rx_tfm_michael);
|
||||
crypto_free_cipher(_priv->rx_tfm_arc4);
|
||||
}
|
||||
kfree(priv);
|
||||
kzfree(priv);
|
||||
}
|
||||
|
||||
static inline u16 RotR1(u16 val)
|
||||
@@ -341,7 +330,6 @@ static int lib80211_tkip_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
|
||||
int len;
|
||||
u8 rc4key[16], *pos, *icv;
|
||||
u32 crc;
|
||||
int i;
|
||||
|
||||
if (tkey->flags & IEEE80211_CRYPTO_TKIP_COUNTERMEASURES) {
|
||||
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
|
||||
@@ -366,9 +354,9 @@ static int lib80211_tkip_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
|
||||
icv[2] = crc >> 16;
|
||||
icv[3] = crc >> 24;
|
||||
|
||||
crypto_cipher_setkey(tkey->tx_tfm_arc4, rc4key, 16);
|
||||
for (i = 0; i < len + 4; i++)
|
||||
crypto_cipher_encrypt_one(tkey->tx_tfm_arc4, pos + i, pos + i);
|
||||
arc4_setkey(&tkey->tx_ctx_arc4, rc4key, 16);
|
||||
arc4_crypt(&tkey->tx_ctx_arc4, pos, pos, len + 4);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -396,7 +384,6 @@ static int lib80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
|
||||
u8 icv[4];
|
||||
u32 crc;
|
||||
int plen;
|
||||
int i;
|
||||
|
||||
hdr = (struct ieee80211_hdr *)skb->data;
|
||||
|
||||
@@ -449,9 +436,8 @@ static int lib80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
|
||||
|
||||
plen = skb->len - hdr_len - 12;
|
||||
|
||||
crypto_cipher_setkey(tkey->rx_tfm_arc4, rc4key, 16);
|
||||
for (i = 0; i < plen + 4; i++)
|
||||
crypto_cipher_decrypt_one(tkey->rx_tfm_arc4, pos + i, pos + i);
|
||||
arc4_setkey(&tkey->rx_ctx_arc4, rc4key, 16);
|
||||
arc4_crypt(&tkey->rx_ctx_arc4, pos, pos, plen + 4);
|
||||
|
||||
crc = ~crc32_le(~0, pos, plen);
|
||||
icv[0] = crc;
|
||||
@@ -636,17 +622,17 @@ static int lib80211_tkip_set_key(void *key, int len, u8 * seq, void *priv)
|
||||
struct lib80211_tkip_data *tkey = priv;
|
||||
int keyidx;
|
||||
struct crypto_shash *tfm = tkey->tx_tfm_michael;
|
||||
struct crypto_cipher *tfm2 = tkey->tx_tfm_arc4;
|
||||
struct arc4_ctx *tfm2 = &tkey->tx_ctx_arc4;
|
||||
struct crypto_shash *tfm3 = tkey->rx_tfm_michael;
|
||||
struct crypto_cipher *tfm4 = tkey->rx_tfm_arc4;
|
||||
struct arc4_ctx *tfm4 = &tkey->rx_ctx_arc4;
|
||||
|
||||
keyidx = tkey->key_idx;
|
||||
memset(tkey, 0, sizeof(*tkey));
|
||||
tkey->key_idx = keyidx;
|
||||
tkey->tx_tfm_michael = tfm;
|
||||
tkey->tx_tfm_arc4 = tfm2;
|
||||
tkey->tx_ctx_arc4 = *tfm2;
|
||||
tkey->rx_tfm_michael = tfm3;
|
||||
tkey->rx_tfm_arc4 = tfm4;
|
||||
tkey->rx_ctx_arc4 = *tfm4;
|
||||
if (len == TKIP_KEY_LEN) {
|
||||
memcpy(tkey->key, key, TKIP_KEY_LEN);
|
||||
tkey->key_set = 1;
|
||||
|
||||
Reference in New Issue
Block a user