| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20250811070906.27232-2-straube.linux@gmail.com>
Date: Mon, 11 Aug 2025 09:09:05 +0200
From: Michael Straube <straube.linux@...il.com>
To: gregkh@...uxfoundation.org
Cc: hdegoede@...hat.com,
Larry.Finger@...inger.net,
linux-staging@...ts.linux.dev,
linux-kernel@...r.kernel.org,
Michael Straube <straube.linux@...il.com>
Subject: [PATCH 1/2] staging: rtl8723bs: use crypto_xor_cpy
Use the in-kernel function crypto_xor_cpy instead of the custom function
bitwise_xor, as using in-kernel functions is preferred over custom
implementations.
Signed-off-by: Michael Straube <straube.linux@...il.com>
---
drivers/staging/rtl8723bs/core/rtw_security.c | 46 +++++++------------
1 file changed, 17 insertions(+), 29 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_security.c b/drivers/staging/rtl8723bs/core/rtw_security.c
index e9f382c280d9..08d179857203 100644
--- a/drivers/staging/rtl8723bs/core/rtw_security.c
+++ b/drivers/staging/rtl8723bs/core/rtw_security.c
@@ -7,6 +7,7 @@
#include <linux/crc32.h>
#include <drv_types.h>
#include <crypto/aes.h>
+#include <crypto/utils.h>
static const char * const _security_type_str[] = {
"N/A",
@@ -641,7 +642,6 @@ u32 rtw_tkip_decrypt(struct adapter *padapter, u8 *precvframe)
/**** Function Prototypes ****/
/*****************************/
-static void bitwise_xor(u8 *ina, u8 *inb, u8 *out);
static void construct_mic_iv(u8 *mic_header1,
signed int qc_exists,
signed int a4_exists,
@@ -849,18 +849,6 @@ static void construct_ctr_preload(u8 *ctr_preload,
ctr_preload[15] = (unsigned char) (c % 256);
}
-/************************************/
-/* bitwise_xor() */
-/* A 128 bit, bitwise exclusive or */
-/************************************/
-static void bitwise_xor(u8 *ina, u8 *inb, u8 *out)
-{
- signed int i;
-
- for (i = 0; i < 16; i++)
- out[i] = ina[i] ^ inb[i];
-}
-
static signed int aes_cipher(u8 *key, uint hdrlen,
u8 *pframe, uint plen)
{
@@ -941,13 +929,13 @@ static signed int aes_cipher(u8 *key, uint hdrlen,
/* Calculate MIC */
aes128k128d(key, mic_iv, aes_out);
- bitwise_xor(aes_out, mic_header1, chain_buffer);
+ crypto_xor_cpy(chain_buffer, aes_out, mic_header1, 16);
aes128k128d(key, chain_buffer, aes_out);
- bitwise_xor(aes_out, mic_header2, chain_buffer);
+ crypto_xor_cpy(chain_buffer, aes_out, mic_header2, 16);
aes128k128d(key, chain_buffer, aes_out);
for (i = 0; i < num_blocks; i++) {
- bitwise_xor(aes_out, &pframe[payload_index], chain_buffer);
+ crypto_xor_cpy(chain_buffer, aes_out, &pframe[payload_index], 16);
payload_index += 16;
aes128k128d(key, chain_buffer, aes_out);
@@ -960,7 +948,7 @@ static signed int aes_cipher(u8 *key, uint hdrlen,
for (j = 0; j < payload_remainder; j++)
padded_buffer[j] = pframe[payload_index++];
- bitwise_xor(aes_out, padded_buffer, chain_buffer);
+ crypto_xor_cpy(chain_buffer, aes_out, padded_buffer, 16);
aes128k128d(key, chain_buffer, aes_out);
}
@@ -977,7 +965,7 @@ static signed int aes_cipher(u8 *key, uint hdrlen,
pn_vector, i+1, frtype);
/* add for CONFIG_IEEE80211W, none 11w also can use */
aes128k128d(key, ctr_preload, aes_out);
- bitwise_xor(aes_out, &pframe[payload_index], chain_buffer);
+ crypto_xor_cpy(chain_buffer, aes_out, &pframe[payload_index], 16);
for (j = 0; j < 16; j++)
pframe[payload_index++] = chain_buffer[j];
}
@@ -995,7 +983,7 @@ static signed int aes_cipher(u8 *key, uint hdrlen,
padded_buffer[j] = pframe[payload_index+j];
aes128k128d(key, ctr_preload, aes_out);
- bitwise_xor(aes_out, padded_buffer, chain_buffer);
+ crypto_xor_cpy(chain_buffer, aes_out, padded_buffer, 16);
for (j = 0; j < payload_remainder; j++)
pframe[payload_index++] = chain_buffer[j];
}
@@ -1011,7 +999,7 @@ static signed int aes_cipher(u8 *key, uint hdrlen,
padded_buffer[j] = pframe[j+hdrlen+8+plen];
aes128k128d(key, ctr_preload, aes_out);
- bitwise_xor(aes_out, padded_buffer, chain_buffer);
+ crypto_xor_cpy(chain_buffer, aes_out, padded_buffer, 16);
for (j = 0; j < 8; j++)
pframe[payload_index++] = chain_buffer[j];
@@ -1137,7 +1125,7 @@ static signed int aes_decipher(u8 *key, uint hdrlen,
frtype); /* add for CONFIG_IEEE80211W, none 11w also can use */
aes128k128d(key, ctr_preload, aes_out);
- bitwise_xor(aes_out, &pframe[payload_index], chain_buffer);
+ crypto_xor_cpy(chain_buffer, aes_out, &pframe[payload_index], 16);
for (j = 0; j < 16; j++)
pframe[payload_index++] = chain_buffer[j];
@@ -1156,7 +1144,7 @@ static signed int aes_decipher(u8 *key, uint hdrlen,
padded_buffer[j] = pframe[payload_index+j];
aes128k128d(key, ctr_preload, aes_out);
- bitwise_xor(aes_out, padded_buffer, chain_buffer);
+ crypto_xor_cpy(chain_buffer, aes_out, padded_buffer, 16);
for (j = 0; j < payload_remainder; j++)
pframe[payload_index++] = chain_buffer[j];
}
@@ -1187,13 +1175,13 @@ static signed int aes_decipher(u8 *key, uint hdrlen,
/* Calculate MIC */
aes128k128d(key, mic_iv, aes_out);
- bitwise_xor(aes_out, mic_header1, chain_buffer);
+ crypto_xor_cpy(chain_buffer, aes_out, mic_header1, 16);
aes128k128d(key, chain_buffer, aes_out);
- bitwise_xor(aes_out, mic_header2, chain_buffer);
+ crypto_xor_cpy(chain_buffer, aes_out, mic_header2, 16);
aes128k128d(key, chain_buffer, aes_out);
for (i = 0; i < num_blocks; i++) {
- bitwise_xor(aes_out, &message[payload_index], chain_buffer);
+ crypto_xor_cpy(chain_buffer, aes_out, &message[payload_index], 16);
payload_index += 16;
aes128k128d(key, chain_buffer, aes_out);
@@ -1206,7 +1194,7 @@ static signed int aes_decipher(u8 *key, uint hdrlen,
for (j = 0; j < payload_remainder; j++)
padded_buffer[j] = message[payload_index++];
- bitwise_xor(aes_out, padded_buffer, chain_buffer);
+ crypto_xor_cpy(chain_buffer, aes_out, padded_buffer, 16);
aes128k128d(key, chain_buffer, aes_out);
}
@@ -1223,7 +1211,7 @@ static signed int aes_decipher(u8 *key, uint hdrlen,
frtype);
/* add for CONFIG_IEEE80211W, none 11w also can use */
aes128k128d(key, ctr_preload, aes_out);
- bitwise_xor(aes_out, &message[payload_index], chain_buffer);
+ crypto_xor_cpy(chain_buffer, aes_out, &message[payload_index], 16);
for (j = 0; j < 16; j++)
message[payload_index++] = chain_buffer[j];
}
@@ -1241,7 +1229,7 @@ static signed int aes_decipher(u8 *key, uint hdrlen,
padded_buffer[j] = message[payload_index+j];
aes128k128d(key, ctr_preload, aes_out);
- bitwise_xor(aes_out, padded_buffer, chain_buffer);
+ crypto_xor_cpy(chain_buffer, aes_out, padded_buffer, 16);
for (j = 0; j < payload_remainder; j++)
message[payload_index++] = chain_buffer[j];
}
@@ -1256,7 +1244,7 @@ static signed int aes_decipher(u8 *key, uint hdrlen,
padded_buffer[j] = message[j+hdrlen+8+plen-8];
aes128k128d(key, ctr_preload, aes_out);
- bitwise_xor(aes_out, padded_buffer, chain_buffer);
+ crypto_xor_cpy(chain_buffer, aes_out, padded_buffer, 16);
for (j = 0; j < 8; j++)
message[payload_index++] = chain_buffer[j];
--
2.50.1
Powered by blists - more mailing lists