UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

net/tls: support SM4 CCM algorithm 

The IV of CCM mode has special requirements, this patch supports CCM
mode of SM4 algorithm.

Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Tianjia Zhang 2021-09-28 14:28:43 +08:00 committed by David S. Miller
parent 1817750bdc
commit 128cfb882e
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/net/tls.h
View File

@ -66,7 +66,7 @@
#define MAX_IV_SIZE 16 #define MAX_IV_SIZE 16
#define TLS_MAX_REC_SEQ_SIZE 8 #define TLS_MAX_REC_SEQ_SIZE 8
/* For AES-CCM, the full 16-bytes of IV is made of '4' fields of given sizes. /* For CCM mode, the full 16-bytes of IV is made of '4' fields of given sizes.
* *
* IV[16] = b0[1] || implicit nonce[4] || explicit nonce[8] || length[3] * IV[16] = b0[1] || implicit nonce[4] || explicit nonce[8] || length[3]
* *
@ -74,6 +74,7 @@
* Hence b0 contains (3 - 1) = 2. * Hence b0 contains (3 - 1) = 2.
*/ */
#define TLS_AES_CCM_IV_B0_BYTE 2 #define TLS_AES_CCM_IV_B0_BYTE 2
#define TLS_SM4_CCM_IV_B0_BYTE 2
#define __TLS_INC_STATS(net, field) \ #define __TLS_INC_STATS(net, field) \
__SNMP_INC_STATS((net)->mib.tls_statistics, field) __SNMP_INC_STATS((net)->mib.tls_statistics, field)

20
net/tls/tls_sw.c
View File

@ -498,9 +498,15 @@ static int tls_do_encryption(struct sock *sk,
int rc, iv_offset = 0; int rc, iv_offset = 0;
/* For CCM based ciphers, first byte of IV is a constant */ /* For CCM based ciphers, first byte of IV is a constant */
if (prot->cipher_type == TLS_CIPHER_AES_CCM_128) { switch (prot->cipher_type) {
case TLS_CIPHER_AES_CCM_128:
rec->iv_data[0] = TLS_AES_CCM_IV_B0_BYTE; rec->iv_data[0] = TLS_AES_CCM_IV_B0_BYTE;
iv_offset = 1; iv_offset = 1;
break;
case TLS_CIPHER_SM4_CCM:
rec->iv_data[0] = TLS_SM4_CCM_IV_B0_BYTE;
iv_offset = 1;
break;
} }
memcpy(&rec->iv_data[iv_offset], tls_ctx->tx.iv, memcpy(&rec->iv_data[iv_offset], tls_ctx->tx.iv,
@ -1457,10 +1463,16 @@ static int decrypt_internal(struct sock *sk, struct sk_buff *skb,
aad = (u8 *)(sgout + n_sgout); aad = (u8 *)(sgout + n_sgout);
iv = aad + prot->aad_size; iv = aad + prot->aad_size;
/* For CCM based ciphers, first byte of nonce+iv is always '2' */ /* For CCM based ciphers, first byte of nonce+iv is a constant */
if (prot->cipher_type == TLS_CIPHER_AES_CCM_128) { switch (prot->cipher_type) {
iv[0] = 2; case TLS_CIPHER_AES_CCM_128:
iv[0] = TLS_AES_CCM_IV_B0_BYTE;
iv_offset = 1; iv_offset = 1;
break;
case TLS_CIPHER_SM4_CCM:
iv[0] = TLS_SM4_CCM_IV_B0_BYTE;
iv_offset = 1;
break;
} }
/* Prepare IV */ /* Prepare IV */