staging: rtl8723bs: use in-kernel aes encryption
v2 cover staging: rtl8723bs: use in-kernel aes encryption
This patchset replaces the private AES routines used to encrypt data with in-kernel ones.
--------------------------------------
Changes in v2:
- Move aes.h include file in .c
file, where it is needed
Fabio Aiuto (3):
staging: rtl8723bs: align argument position in a new line
staging: rtl8723bs: use in-kernel aes encryption in OMAC1 routines
staging: rtl8723bs: use in-kernel aes encryption
drivers/staging/rtl8723bs/core/rtw_security.c | 328 +----------------- 1 file changed, 15 insertions(+), 313 deletions(-)
Signature · 1 line
2.20.1
PATCH v2 1/3 staging: rtl8723bs: align argument position in a new line
align function arguments position on a new line to open parentheses.
--- drivers/staging/rtl8723bs/core/rtw_security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8723bs/core/rtw_security.c +1 -1
@@ -2056,7 +2056,7 @@ static void aes_encrypt_deinit(void *ctx)* (SP) 800-38B. */ static int omac1_aes_128_vector (u8 *key,size_t num_elem, -u8 *addr[],size_t *len,u8 *mac) +u8 *addr[],size_t *len,u8 *mac) {void *ctx;u8 cbc[AES_BLOCK_SIZE ], pad[AES_BLOCK_SIZE ];
Signature · 1 line
2.20.1
PATCH v2 2/3 staging: rtl8723bs: use in-kernel aes encryption in OMAC1 routines
In reply to Fabio Aiutoreplace private aes encryption subroutines with public in-kernel ones in OMAC1 computation routines.
--- drivers/staging/rtl8723bs/core/rtw_security.c | 114 ++---------------- 1 file changed, 9 insertions(+), 105 deletions(-)
drivers/staging/rtl8723bs/core/rtw_security.c +9 -105
@@ -7,6 +7,7 @@#include <linux/crc32poly.h> #include <drv_types.h> #include <rtw_debug.h> +#include <crypto/aes.h> static const char *const _security_type_str[] = {"N/A" ,
@@ -1931,99 +1932,6 @@ const u8 rcons[] = {/* 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); - } - -#undef ROUND - -/* -* 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 =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;
@@ -2037,11 +1945,6 @@ static void gf_mulx(u8 *pad) pad[AES_BLOCK_SIZE -1 ] ^=0x87 ; } -static void aes_encrypt_deinit (void *ctx) -{ -kfree_sensitive (ctx); -} -/** * omac1_aes_128_vector - One-Key CBC MAC (OMAC1) hash with AES-128 * @key: 128-bit key for the hash operation
@@ -2058,13 +1961,14 @@ static void aes_encrypt_deinit(void *ctx)static int omac1_aes_128_vector (u8 *key,size_t num_elem,u8 *addr[],size_t *len,u8 *mac) { -void *ctx; +struct crypto_aes_ctx ctx;u8 cbc[AES_BLOCK_SIZE ], pad[AES_BLOCK_SIZE ];u8 *pos, *end;size_t i, e, left, total_len; +int ret; - ctx =aes_encrypt_init (key,16 ); -if (ctx ==NULL ) + ret =aes_expandkey (&ctx, key,16 ); +if (ret)return -1 ;memset (cbc,0 ,AES_BLOCK_SIZE );
@@ -2087,12 +1991,12 @@ static int omac1_aes_128_vector(u8 *key, size_t num_elem, } }if (left >AES_BLOCK_SIZE ) -aes_128_encrypt (ctx, cbc, cbc); +aes_encrypt (&ctx, cbc, cbc); left -=AES_BLOCK_SIZE ; }memset (pad,0 ,AES_BLOCK_SIZE ); -aes_128_encrypt (ctx, pad, pad); +aes_encrypt (&ctx, pad, pad);gf_mulx (pad);if (left || total_len ==0 ) {
@@ -2110,8 +2014,8 @@ static int omac1_aes_128_vector(u8 *key, size_t num_elem,for (i =0 ; i <AES_BLOCK_SIZE ; i++) pad[i] ^= cbc[i]; -aes_128_encrypt (ctx, pad, mac); -aes_encrypt_deinit (ctx); +aes_encrypt (&ctx, pad, mac); +memzero_explicit (&ctx,sizeof (ctx));return 0 ; }
Signature · 1 line
2.20.1
PATCH v2 3/3 staging: rtl8723bs: use in-kernel aes encryption
In reply to Fabio Aiutoreplace private aes encryption subroutines with
public in-kernel ones in data frame encryption.
--- drivers/staging/rtl8723bs/core/rtw_security.c | 212 +----------------- 1 file changed, 5 insertions(+), 207 deletions(-)
drivers/staging/rtl8723bs/core/rtw_security.c +5 -207
@@ -748,44 +748,6 @@ u32 rtw_tkip_decrypt(struct adapter *padapter, u8 *precvframe)#define MAX_MSG_SIZE 2048 -/*****************************/ -/******** SBOX Table *********/ -/*****************************/ - -static const u8 sbox_table[256 ] = { -0x63 ,0x7c ,0x77 ,0x7b ,0xf2 ,0x6b ,0x6f ,0xc5 , -0x30 ,0x01 ,0x67 ,0x2b ,0xfe ,0xd7 ,0xab ,0x76 , -0xca ,0x82 ,0xc9 ,0x7d ,0xfa ,0x59 ,0x47 ,0xf0 , -0xad ,0xd4 ,0xa2 ,0xaf ,0x9c ,0xa4 ,0x72 ,0xc0 , -0xb7 ,0xfd ,0x93 ,0x26 ,0x36 ,0x3f ,0xf7 ,0xcc , -0x34 ,0xa5 ,0xe5 ,0xf1 ,0x71 ,0xd8 ,0x31 ,0x15 , -0x04 ,0xc7 ,0x23 ,0xc3 ,0x18 ,0x96 ,0x05 ,0x9a , -0x07 ,0x12 ,0x80 ,0xe2 ,0xeb ,0x27 ,0xb2 ,0x75 , -0x09 ,0x83 ,0x2c ,0x1a ,0x1b ,0x6e ,0x5a ,0xa0 , -0x52 ,0x3b ,0xd6 ,0xb3 ,0x29 ,0xe3 ,0x2f ,0x84 , -0x53 ,0xd1 ,0x00 ,0xed ,0x20 ,0xfc ,0xb1 ,0x5b , -0x6a ,0xcb ,0xbe ,0x39 ,0x4a ,0x4c ,0x58 ,0xcf , -0xd0 ,0xef ,0xaa ,0xfb ,0x43 ,0x4d ,0x33 ,0x85 , -0x45 ,0xf9 ,0x02 ,0x7f ,0x50 ,0x3c ,0x9f ,0xa8 , -0x51 ,0xa3 ,0x40 ,0x8f ,0x92 ,0x9d ,0x38 ,0xf5 , -0xbc ,0xb6 ,0xda ,0x21 ,0x10 ,0xff ,0xf3 ,0xd2 , -0xcd ,0x0c ,0x13 ,0xec ,0x5f ,0x97 ,0x44 ,0x17 , -0xc4 ,0xa7 ,0x7e ,0x3d ,0x64 ,0x5d ,0x19 ,0x73 , -0x60 ,0x81 ,0x4f ,0xdc ,0x22 ,0x2a ,0x90 ,0x88 , -0x46 ,0xee ,0xb8 ,0x14 ,0xde ,0x5e ,0x0b ,0xdb , -0xe0 ,0x32 ,0x3a ,0x0a ,0x49 ,0x06 ,0x24 ,0x5c , -0xc2 ,0xd3 ,0xac ,0x62 ,0x91 ,0x95 ,0xe4 ,0x79 , -0xe7 ,0xc8 ,0x37 ,0x6d ,0x8d ,0xd5 ,0x4e ,0xa9 , -0x6c ,0x56 ,0xf4 ,0xea ,0x65 ,0x7a ,0xae ,0x08 , -0xba ,0x78 ,0x25 ,0x2e ,0x1c ,0xa6 ,0xb4 ,0xc6 , -0xe8 ,0xdd ,0x74 ,0x1f ,0x4b ,0xbd ,0x8b ,0x8a , -0x70 ,0x3e ,0xb5 ,0x66 ,0x48 ,0x03 ,0xf6 ,0x0e , -0x61 ,0x35 ,0x57 ,0xb9 ,0x86 ,0xc1 ,0x1d ,0x9e , -0xe1 ,0xf8 ,0x98 ,0x11 ,0x69 ,0xd9 ,0x8e ,0x94 , -0x9b ,0x1e ,0x87 ,0xe9 ,0xce ,0x55 ,0x28 ,0xdf , -0x8c ,0xa1 ,0x89 ,0x0d ,0xbf ,0xe6 ,0x42 ,0x68 , -0x41 ,0x99 ,0x2d ,0x0f ,0xb0 ,0x54 ,0xbb ,0x16 - };/*****************************/ /**** Function Prototypes ****/
@@ -814,13 +776,7 @@ static void construct_ctr_preload(u8 *ctr_preload,u8 *pn_vector, signed int c, uint frtype); /* for CONFIG_IEEE80211W, none 11w also can use */ -static void xor_128 (u8 *a,u8 *b,u8 *out); -static void xor_32 (u8 *a,u8 *b,u8 *out); -static u8 sbox (u8 a); -static void next_key (u8 *key,signed int round); -static void byte_sub (u8 *in,u8 *out); -static void shift_row (u8 *in,u8 *out); -static void mix_column (u8 *in,u8 *out); +static void aes128k128d (u8 *key,u8 *data,u8 *ciphertext);
@@ -829,171 +785,13 @@ static void aes128k128d(u8 *key, u8 *data, u8 *ciphertext);/* Performs a 128 bit AES encrypt with */ /* 128 bit data. */ /****************************************/ -static void xor_128 (u8 *a,u8 *b,u8 *out) -{ -signed int i; - -for (i =0 ; i <16 ; i++) - out[i] = a[i] ^ b[i]; -} - - -static void xor_32 (u8 *a,u8 *b,u8 *out) -{ -signed int i; - -for (i =0 ; i <4 ; i++) - out[i] = a[i] ^ b[i]; -} - - -static u8 sbox (u8 a) -{ -return sbox_table[(signed int )a]; -} - - -static void next_key (u8 *key,signed int round) -{ -u8 rcon; -u8 sbox_key[4 ]; -static const u8 rcon_table[12 ] = { -0x01 ,0x02 ,0x04 ,0x08 , -0x10 ,0x20 ,0x40 ,0x80 , -0x1b ,0x36 ,0x36 ,0x36 - }; - sbox_key[0 ] =sbox (key[13 ]); - sbox_key[1 ] =sbox (key[14 ]); - sbox_key[2 ] =sbox (key[15 ]); - sbox_key[3 ] =sbox (key[12 ]); - - rcon = rcon_table[round]; - -xor_32 (&key[0 ], sbox_key, &key[0 ]); - key[0 ] = key[0 ] ^ rcon; - -xor_32 (&key[4 ], &key[0 ], &key[4 ]); -xor_32 (&key[8 ], &key[4 ], &key[8 ]); -xor_32 (&key[12 ], &key[8 ], &key[12 ]); -} - - -static void byte_sub (u8 *in,u8 *out) -{ -signed int i; - -for (i =0 ; i <16 ; i++) - out[i] =sbox (in[i]); -} - - -static void shift_row (u8 *in,u8 *out) -{ - out[0 ] = in[0 ]; - out[1 ] = in[5 ]; - out[2 ] = in[10 ]; - out[3 ] = in[15 ]; - out[4 ] = in[4 ]; - out[5 ] = in[9 ]; - out[6 ] = in[14 ]; - out[7 ] = in[3 ]; - out[8 ] = in[8 ]; - out[9 ] = in[13 ]; - out[10 ] = in[2 ]; - out[11 ] = in[7 ]; - out[12 ] = in[12 ]; - out[13 ] = in[1 ]; - out[14 ] = in[6 ]; - out[15 ] = in[11 ]; -} - -static void mix_column (u8 *in,u8 *out) -{ -signed int i; -u8 add1b[4 ]; -u8 add1bf7[4 ]; -u8 rotl[4 ]; -u8 swap_halfs[4 ]; -u8 andf7[4 ]; -u8 rotr[4 ]; -u8 temp[4 ]; -u8 tempb[4 ]; - -for (i =0 ; i <4 ; i++) { -if ((in[i] &0x80 ) ==0x80 ) - add1b[i] =0x1b ; -else - add1b[i] =0x00 ; - } - - swap_halfs[0 ] = in[2 ];/* Swap halfs */ - swap_halfs[1 ] = in[3 ]; - swap_halfs[2 ] = in[0 ]; - swap_halfs[3 ] = in[1 ]; - - rotl[0 ] = in[3 ];/* Rotate left 8 bits */ - rotl[1 ] = in[0 ]; - rotl[2 ] = in[1 ]; - rotl[3 ] = in[2 ]; - - andf7[0 ] = in[0 ] &0x7f ; - andf7[1 ] = in[1 ] &0x7f ; - andf7[2 ] = in[2 ] &0x7f ; - andf7[3 ] = in[3 ] &0x7f ; - -for (i =3 ; i >0 ; i--) {/* logical shift left 1 bit */ - andf7[i] = andf7[i] <<1 ; -if ((andf7[i-1 ] &0x80 ) ==0x80 ) - andf7[i] = (andf7[i] |0x01 ); - } - andf7[0 ] = andf7[0 ] <<1 ; - andf7[0 ] = andf7[0 ] &0xfe ; - -xor_32 (add1b, andf7, add1bf7); - -xor_32 (in, add1bf7, rotr); - - temp[0 ] = rotr[0 ];/* Rotate right 8 bits */ - rotr[0 ] = rotr[1 ]; - rotr[1 ] = rotr[2 ]; - rotr[2 ] = rotr[3 ]; - rotr[3 ] = temp[0 ]; - -xor_32 (add1bf7, rotr, temp); -xor_32 (swap_halfs, rotl, tempb); -xor_32 (temp, tempb, out); -} -static void aes128k128d (u8 *key,u8 *data,u8 *ciphertext) { -signed int round; -signed int i; -u8 intermediatea[16 ]; -u8 intermediateb[16 ]; -u8 round_key[16 ]; +struct crypto_aes_ctx ctx; -for (i =0 ; i <16 ; i++) - round_key[i] = key[i]; - -for (round =0 ; round <11 ; round++) { -if (round ==0 ) { -xor_128 (round_key, data, ciphertext); -next_key (round_key, round); - }else if (round ==10 ) { -byte_sub (ciphertext, intermediatea); -shift_row (intermediatea, intermediateb); -xor_128 (intermediateb, round_key, ciphertext); - }else {/* 1 - 9 */ -byte_sub (ciphertext, intermediatea); -shift_row (intermediatea, intermediateb); -mix_column (&intermediateb[0 ], &intermediatea[0 ]); -mix_column (&intermediateb[4 ], &intermediatea[4 ]); -mix_column (&intermediateb[8 ], &intermediatea[8 ]); -mix_column (&intermediateb[12 ], &intermediatea[12 ]); -xor_128 (intermediatea, round_key, ciphertext); -next_key (round_key, round); - } - } +aes_expandkey (&ctx, key,16 ); +aes_encrypt (&ctx, ciphertext, data); +memzero_explicit (&ctx,sizeof (ctx)); }/************************************************/
Signature · 1 line
2.20.1