mirror of
https://github.com/lwfinger/rtl8188eu.git
synced 2024-11-25 14:03:40 +00:00
rtl8188eu: Fix smatch warnings in core/rtw_security.c
Smatch shows the following: CHECK /home/finger/rtl8188eu/core/rtw_security.c /home/finger/rtl8188eu/core/rtw_security.c:2077 rijndaelKeySetupEnc() warn: '4' 4 can't fit into 4611686018427387903 'rk' /home/finger/rtl8188eu/core/rtw_security.c:2108 rijndaelEncrypt() warn: '8' 8 can't fit into 4611686018427387903 'rk' These warnings were fixed by removing a number of unused routines. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
parent
e2b681b690
commit
66ccf88866
1 changed files with 0 additions and 198 deletions
|
@ -2052,204 +2052,6 @@ const u8 rcons[] = {
|
||||||
/* for 128-bit blocks, Rijndael never uses more than 10 rcon values */
|
/* for 128-bit blocks, Rijndael never uses more than 10 rcon values */
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
|
||||||
* Expand the cipher key into the encryption key schedule.
|
|
||||||
*
|
|
||||||
* @return the number of rounds for the given cipher key size.
|
|
||||||
*/
|
|
||||||
static void rijndaelKeySetupEnc(u32 rk[/*44*/], const u8 cipherKey[])
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
u32 temp;
|
|
||||||
|
|
||||||
rk[0] = GETU32(cipherKey);
|
|
||||||
rk[1] = GETU32(cipherKey + 4);
|
|
||||||
rk[2] = GETU32(cipherKey + 8);
|
|
||||||
rk[3] = GETU32(cipherKey + 12);
|
|
||||||
for (i = 0; i < 10; i++) {
|
|
||||||
temp = rk[3];
|
|
||||||
rk[4] = rk[0] ^
|
|
||||||
TE421(temp) ^ TE432(temp) ^ TE443(temp) ^ TE414(temp) ^
|
|
||||||
RCON(i);
|
|
||||||
rk[5] = rk[1] ^ rk[4];
|
|
||||||
rk[6] = rk[2] ^ rk[5];
|
|
||||||
rk[7] = rk[3] ^ rk[6];
|
|
||||||
rk += 4;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void rijndaelEncrypt(u32 rk[/*44*/], u8 pt[16], u8 ct[16])
|
|
||||||
{
|
|
||||||
u32 s0, s1, s2, s3, t0, t1, t2, t3;
|
|
||||||
int Nr = 10;
|
|
||||||
int r;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* map byte array block to cipher state
|
|
||||||
* and add initial round key:
|
|
||||||
*/
|
|
||||||
s0 = GETU32(pt) ^ rk[0];
|
|
||||||
s1 = GETU32(pt + 4) ^ rk[1];
|
|
||||||
s2 = GETU32(pt + 8) ^ rk[2];
|
|
||||||
s3 = GETU32(pt + 12) ^ rk[3];
|
|
||||||
|
|
||||||
#define ROUND(i, d, s) \
|
|
||||||
do { \
|
|
||||||
d##0 = TE0(s##0) ^ TE1(s##1) ^ TE2(s##2) ^ TE3(s##3) ^ rk[4 * i]; \
|
|
||||||
d##1 = TE0(s##1) ^ TE1(s##2) ^ TE2(s##3) ^ TE3(s##0) ^ rk[4 * i + 1]; \
|
|
||||||
d##2 = TE0(s##2) ^ TE1(s##3) ^ TE2(s##0) ^ TE3(s##1) ^ rk[4 * i + 2]; \
|
|
||||||
d##3 = TE0(s##3) ^ TE1(s##0) ^ TE2(s##1) ^ TE3(s##2) ^ rk[4 * i + 3]; \
|
|
||||||
} while (0);
|
|
||||||
|
|
||||||
/* Nr - 1 full rounds: */
|
|
||||||
r = Nr >> 1;
|
|
||||||
for (;;) {
|
|
||||||
ROUND(1, t, s);
|
|
||||||
rk += 8;
|
|
||||||
if (--r == 0)
|
|
||||||
break;
|
|
||||||
ROUND(0, s, t);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* apply last round and
|
|
||||||
* map cipher state to byte array block:
|
|
||||||
*/
|
|
||||||
s0 = TE41(t0) ^ TE42(t1) ^ TE43(t2) ^ TE44(t3) ^ rk[0];
|
|
||||||
PUTU32(ct , s0);
|
|
||||||
s1 = TE41(t1) ^ TE42(t2) ^ TE43(t3) ^ TE44(t0) ^ rk[1];
|
|
||||||
PUTU32(ct + 4, s1);
|
|
||||||
s2 = TE41(t2) ^ TE42(t3) ^ TE43(t0) ^ TE44(t1) ^ rk[2];
|
|
||||||
PUTU32(ct + 8, s2);
|
|
||||||
s3 = TE41(t3) ^ TE42(t0) ^ TE43(t1) ^ TE44(t2) ^ rk[3];
|
|
||||||
PUTU32(ct + 12, s3);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void *aes_encrypt_init(u8 *key, size_t len)
|
|
||||||
{
|
|
||||||
u32 *rk;
|
|
||||||
if (len != 16)
|
|
||||||
return NULL;
|
|
||||||
rk = (u32 *)rtw_malloc(AES_PRIV_SIZE);
|
|
||||||
if (rk == NULL)
|
|
||||||
return NULL;
|
|
||||||
rijndaelKeySetupEnc(rk, key);
|
|
||||||
return rk;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void aes_128_encrypt(void *ctx, u8 *plain, u8 *crypt)
|
|
||||||
{
|
|
||||||
rijndaelEncrypt(ctx, plain, crypt);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void gf_mulx(u8 *pad)
|
|
||||||
{
|
|
||||||
int i, carry;
|
|
||||||
|
|
||||||
carry = pad[0] & 0x80;
|
|
||||||
for (i = 0; i < AES_BLOCK_SIZE - 1; i++)
|
|
||||||
pad[i] = (pad[i] << 1) | (pad[i + 1] >> 7);
|
|
||||||
pad[AES_BLOCK_SIZE - 1] <<= 1;
|
|
||||||
if (carry)
|
|
||||||
pad[AES_BLOCK_SIZE - 1] ^= 0x87;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void aes_encrypt_deinit(void *ctx)
|
|
||||||
{
|
|
||||||
_rtw_memset(ctx, 0, AES_PRIV_SIZE);
|
|
||||||
rtw_mfree(ctx, AES_PRIV_SIZE);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* omac1_aes_128_vector - One-Key CBC MAC (OMAC1) hash with AES-128
|
|
||||||
* @key: 128-bit key for the hash operation
|
|
||||||
* @num_elem: Number of elements in the data vector
|
|
||||||
* @addr: Pointers to the data areas
|
|
||||||
* @len: Lengths of the data blocks
|
|
||||||
* @mac: Buffer for MAC (128 bits, i.e., 16 bytes)
|
|
||||||
* Returns: 0 on success, -1 on failure
|
|
||||||
*
|
|
||||||
* This is a mode for using block cipher (AES in this case) for authentication.
|
|
||||||
* OMAC1 was standardized with the name CMAC by NIST in a Special Publication
|
|
||||||
* (SP) 800-38B.
|
|
||||||
*/
|
|
||||||
static int omac1_aes_128_vector(u8 *key, size_t num_elem,
|
|
||||||
u8 *addr[], size_t *len, u8 *mac)
|
|
||||||
{
|
|
||||||
void *ctx;
|
|
||||||
u8 cbc[AES_BLOCK_SIZE], pad[AES_BLOCK_SIZE];
|
|
||||||
u8 *pos, *end;
|
|
||||||
size_t i, e, left, total_len;
|
|
||||||
|
|
||||||
ctx = aes_encrypt_init(key, 16);
|
|
||||||
if (ctx == NULL)
|
|
||||||
return -1;
|
|
||||||
_rtw_memset(cbc, 0, AES_BLOCK_SIZE);
|
|
||||||
|
|
||||||
total_len = 0;
|
|
||||||
for (e = 0; e < num_elem; e++)
|
|
||||||
total_len += len[e];
|
|
||||||
left = total_len;
|
|
||||||
|
|
||||||
e = 0;
|
|
||||||
pos = addr[0];
|
|
||||||
end = pos + len[0];
|
|
||||||
|
|
||||||
while (left >= AES_BLOCK_SIZE) {
|
|
||||||
for (i = 0; i < AES_BLOCK_SIZE; i++) {
|
|
||||||
cbc[i] ^= *pos++;
|
|
||||||
if (pos >= end) {
|
|
||||||
e++;
|
|
||||||
pos = addr[e];
|
|
||||||
end = pos + len[e];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (left > AES_BLOCK_SIZE)
|
|
||||||
aes_128_encrypt(ctx, cbc, cbc);
|
|
||||||
left -= AES_BLOCK_SIZE;
|
|
||||||
}
|
|
||||||
|
|
||||||
_rtw_memset(pad, 0, AES_BLOCK_SIZE);
|
|
||||||
aes_128_encrypt(ctx, pad, pad);
|
|
||||||
gf_mulx(pad);
|
|
||||||
|
|
||||||
if (left || total_len == 0) {
|
|
||||||
for (i = 0; i < left; i++) {
|
|
||||||
cbc[i] ^= *pos++;
|
|
||||||
if (pos >= end) {
|
|
||||||
e++;
|
|
||||||
pos = addr[e];
|
|
||||||
end = pos + len[e];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
cbc[left] ^= 0x80;
|
|
||||||
gf_mulx(pad);
|
|
||||||
}
|
|
||||||
|
|
||||||
for (i = 0; i < AES_BLOCK_SIZE; i++)
|
|
||||||
pad[i] ^= cbc[i];
|
|
||||||
aes_128_encrypt(ctx, pad, mac);
|
|
||||||
aes_encrypt_deinit(ctx);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* omac1_aes_128 - One-Key CBC MAC (OMAC1) hash with AES-128 (aka AES-CMAC)
|
|
||||||
* @key: 128-bit key for the hash operation
|
|
||||||
* @data: Data buffer for which a MAC is determined
|
|
||||||
* @data_len: Length of data buffer in bytes
|
|
||||||
* @mac: Buffer for MAC (128 bits, i.e., 16 bytes)
|
|
||||||
* Returns: 0 on success, -1 on failure
|
|
||||||
*
|
|
||||||
* This is a mode for using block cipher (AES in this case) for authentication.
|
|
||||||
* OMAC1 was standardized with the name CMAC by NIST in a Special Publication
|
|
||||||
* (SP) 800-38B.
|
|
||||||
*/
|
|
||||||
static int omac1_aes_128(u8 *key, u8 *data, size_t data_len, u8 *mac)
|
|
||||||
{
|
|
||||||
return omac1_aes_128_vector(key, 1, &data, &data_len, mac);
|
|
||||||
}
|
|
||||||
|
|
||||||
void rtw_use_tkipkey_handler(void *FunctionContext)
|
void rtw_use_tkipkey_handler(void *FunctionContext)
|
||||||
{
|
{
|
||||||
struct adapter *padapter = (struct adapter *)FunctionContext;
|
struct adapter *padapter = (struct adapter *)FunctionContext;
|
||||||
|
|
Loading…
Reference in a new issue