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

Fix memcpy bug in aead.c

Browse Source
This commit is contained in:
Zhi Guan
2023-02-15 10:58:12 +08:00
parent 4466a56ae2
commit caa5e8c5c5
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/aead.c
View File

@@ -123,14 +123,16 @@ int sm4_cbc_sm3_hmac_decrypt_update(SM4_CBC_SM3_HMAC_CTX *ctx, const uint8_t *in
} }
if (inlen <= SM3_HMAC_SIZE) { if (inlen <= SM3_HMAC_SIZE) {
uint8_t tmp[32];
sm3_hmac_update(&ctx->mac_ctx, ctx->mac, inlen); sm3_hmac_update(&ctx->mac_ctx, ctx->mac, inlen);
if (sm4_cbc_decrypt_update(&ctx->enc_ctx, ctx->mac, inlen, out, outlen) != 1) { if (sm4_cbc_decrypt_update(&ctx->enc_ctx, ctx->mac, inlen, out, outlen) != 1) {
error_print(); error_print();
return -1; return -1;
} }
len = SM3_HMAC_SIZE - inlen; len = SM3_HMAC_SIZE - inlen;
memcpy(ctx->mac, ctx->mac + inlen, len); memcpy(tmp, ctx->mac + inlen, len);
memcpy(ctx->mac + len, in, inlen); memcpy(tmp + len, in, inlen);
memcpy(ctx->mac, tmp, 32);
} else { } else {
sm3_hmac_update(&ctx->mac_ctx, ctx->mac, SM3_HMAC_SIZE); sm3_hmac_update(&ctx->mac_ctx, ctx->mac, SM3_HMAC_SIZE);
if (sm4_cbc_decrypt_update(&ctx->enc_ctx, ctx->mac, SM3_HMAC_SIZE, out, outlen) != 1) { if (sm4_cbc_decrypt_update(&ctx->enc_ctx, ctx->mac, SM3_HMAC_SIZE, out, outlen) != 1) {
@@ -283,14 +285,16 @@ int sm4_ctr_sm3_hmac_decrypt_update(SM4_CTR_SM3_HMAC_CTX *ctx, const uint8_t *in
} }
if (inlen <= SM3_HMAC_SIZE) { if (inlen <= SM3_HMAC_SIZE) {
uint8_t tmp[32];
sm3_hmac_update(&ctx->mac_ctx, ctx->mac, inlen); sm3_hmac_update(&ctx->mac_ctx, ctx->mac, inlen);
if (sm4_ctr_decrypt_update(&ctx->enc_ctx, ctx->mac, inlen, out, outlen) != 1) { if (sm4_ctr_decrypt_update(&ctx->enc_ctx, ctx->mac, inlen, out, outlen) != 1) {
error_print(); error_print();
return -1; return -1;
} }
len = SM3_HMAC_SIZE - inlen; len = SM3_HMAC_SIZE - inlen;
memcpy(ctx->mac, ctx->mac + inlen, len); memcpy(tmp, ctx->mac + inlen, len);
memcpy(ctx->mac + len, in, inlen); memcpy(tmp + len, in, inlen);
memcpy(ctx->mac, tmp, 32);
} else { } else {
sm3_hmac_update(&ctx->mac_ctx, ctx->mac, SM3_HMAC_SIZE); sm3_hmac_update(&ctx->mac_ctx, ctx->mac, SM3_HMAC_SIZE);
if (sm4_ctr_decrypt_update(&ctx->enc_ctx, ctx->mac, SM3_HMAC_SIZE, out, outlen) != 1) { if (sm4_ctr_decrypt_update(&ctx->enc_ctx, ctx->mac, SM3_HMAC_SIZE, out, outlen) != 1) {
@@ -471,14 +475,16 @@ int sm4_gcm_decrypt_update(SM4_GCM_CTX *ctx, const uint8_t *in, size_t inlen, ui
} }
if (inlen <= ctx->taglen) { if (inlen <= ctx->taglen) {
uint8_t tmp[32];
ghash_update(&ctx->mac_ctx, ctx->mac, inlen); ghash_update(&ctx->mac_ctx, ctx->mac, inlen);
if (sm4_ctr_decrypt_update(&ctx->enc_ctx, ctx->mac, inlen, out, outlen) != 1) { if (sm4_ctr_decrypt_update(&ctx->enc_ctx, ctx->mac, inlen, out, outlen) != 1) {
error_print(); error_print();
return -1; return -1;
} }
len = ctx->taglen - inlen; len = ctx->taglen - inlen;
memcpy(ctx->mac, ctx->mac + inlen, len); memcpy(tmp, ctx->mac + inlen, len);
memcpy(ctx->mac + len, in, inlen); memcpy(tmp + len, in, inlen);
memcpy(ctx->mac, tmp, 32);
} else { } else {
ghash_update(&ctx->mac_ctx, ctx->mac, ctx->taglen); ghash_update(&ctx->mac_ctx, ctx->mac, ctx->taglen);
if (sm4_ctr_decrypt_update(&ctx->enc_ctx, ctx->mac, ctx->taglen, out, outlen) != 1) { if (sm4_ctr_decrypt_update(&ctx->enc_ctx, ctx->mac, ctx->taglen, out, outlen) != 1) {