abc/GmSSL
1
0
Fork 0
mirror of https://github.com/guanzhi/GmSSL.git synced 2026-05-07 00:46:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix sm4-cbc iv related bug

Browse Source
This commit is contained in:
Zhi Guan
2024-05-20 18:02:16 +08:00
parent e76b3fc3b1
commit 926e063353
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/tls.c
View File

@@ -271,7 +271,8 @@ int tls_cbc_encrypt(const SM3_HMAC_CTX *inited_hmac_ctx, const SM4_KEY *enc_key,
{ {
SM3_HMAC_CTX hmac_ctx; SM3_HMAC_CTX hmac_ctx;
uint8_t last_blocks[32 + 16] = {0}; uint8_t last_blocks[32 + 16] = {0};
uint8_t *mac, *padding, *iv; uint8_t iv[16];
uint8_t *mac, *padding;
int rem, padding_len; int rem, padding_len;
int i; int i;
@@ -304,17 +305,16 @@ int tls_cbc_encrypt(const SM3_HMAC_CTX *inited_hmac_ctx, const SM4_KEY *enc_key,
padding[i] = (uint8_t)padding_len; padding[i] = (uint8_t)padding_len;
} }
iv = out;
if (rand_bytes(iv, 16) != 1) { if (rand_bytes(iv, 16) != 1) {
error_print(); error_print();
return -1; return -1;
} }
memcpy(out, iv, 16);
out += 16; out += 16;
if (inlen >= 16) { if (inlen >= 16) {
sm4_cbc_encrypt_blocks(enc_key, iv, in, inlen/16, out); sm4_cbc_encrypt_blocks(enc_key, iv, in, inlen/16, out);
out += inlen - rem; out += inlen - rem;
iv = out - 16;
} }
sm4_cbc_encrypt_blocks(enc_key, iv, last_blocks, sizeof(last_blocks)/16, out); sm4_cbc_encrypt_blocks(enc_key, iv, last_blocks, sizeof(last_blocks)/16, out);
*outlen = 16 + inlen - rem + sizeof(last_blocks); *outlen = 16 + inlen - rem + sizeof(last_blocks);