abc/GmSSL
1
0
Fork 0
mirror of https://github.com/guanzhi/GmSSL.git synced 2026-06-20 03:44:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1897 from wangtsiao/dev/fix_leak

Browse Source 
用代码中已有的 constant 时间比较替换 memcmp
This commit is contained in:
Zhi Guan
2026-06-13 17:17:44 +08:00
committed by GitHub
parent 19725f3c54 3163d7d927
commit ed6a7ff693
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/aes_modes.c
View File

@@ -215,7 +215,7 @@ int aes_gcm_decrypt(const AES_KEY *key, const uint8_t *iv, size_t ivlen,
ghash(H, aad, aadlen, in, inlen, H); ghash(H, aad, aadlen, in, inlen, H);
aes_encrypt(key, Y, T); aes_encrypt(key, Y, T);
gmssl_memxor(T, T, H, taglen); gmssl_memxor(T, T, H, taglen);
if (memcmp(T, tag, taglen) != 0) { if (gmssl_secure_memcmp(T, tag, taglen) != 0) {
error_print(); error_print();
return -1; return -1;
} }

2
src/sm2_enc.c
View File

@@ -352,7 +352,7 @@ int sm2_do_decrypt(const SM2_KEY *key, const SM2_CIPHERTEXT *in, uint8_t *out, s
sm3_finish(&sm3_ctx, hash); sm3_finish(&sm3_ctx, hash);
// check if u == C3 // check if u == C3
if (memcmp(in->hash, hash, sizeof(hash)) != 0) { if (gmssl_secure_memcmp(in->hash, hash, sizeof(hash)) != 0) {
error_print(); error_print();
goto end; goto end;
} }

2
src/sm4_cbc_sm3_hmac.c
View File

@@ -161,7 +161,7 @@ int sm4_cbc_sm3_hmac_decrypt_finish(SM4_CBC_SM3_HMAC_CTX *ctx, uint8_t *out, siz
error_print(); error_print();
return -1; return -1;
} }
if (memcmp(mac, ctx->mac, SM3_HMAC_SIZE) != 0) { if (gmssl_secure_memcmp(mac, ctx->mac, SM3_HMAC_SIZE) != 0) {
error_print(); error_print();
return -1; return -1;
} }

2
src/sm4_ccm.c
View File

@@ -216,7 +216,7 @@ int sm4_ccm_decrypt(const SM4_KEY *sm4_key, const uint8_t *iv, size_t ivlen,
// diff from encrypt // diff from encrypt
gmssl_memxor(mac, mac, block, taglen); gmssl_memxor(mac, mac, block, taglen);
if (memcmp(mac, tag, taglen) != 0) { if (gmssl_secure_memcmp(mac, tag, taglen) != 0) {
error_print(); error_print();
gmssl_secure_clear(&mac_ctx, sizeof(mac_ctx)); gmssl_secure_clear(&mac_ctx, sizeof(mac_ctx));
return -1; return -1;

2
src/sm4_ctr_sm3_hmac.c
View File

@@ -161,7 +161,7 @@ int sm4_ctr_sm3_hmac_decrypt_finish(SM4_CTR_SM3_HMAC_CTX *ctx, uint8_t *out, siz
error_print(); error_print();
return -1; return -1;
} }
if (memcmp(mac, ctx->mac, SM3_HMAC_SIZE) != 0) { if (gmssl_secure_memcmp(mac, ctx->mac, SM3_HMAC_SIZE) != 0) {
error_print(); error_print();
return -1; return -1;
} }

4
src/sm4_gcm.c
View File

@@ -103,7 +103,7 @@ int sm4_gcm_decrypt(const SM4_KEY *key, const uint8_t *iv, size_t ivlen,
sm4_encrypt(key, Y, T); sm4_encrypt(key, Y, T);
gmssl_memxor(T, T, H, taglen); gmssl_memxor(T, T, H, taglen);
if (memcmp(T, tag, taglen) != 0) { if (gmssl_secure_memcmp(T, tag, taglen) != 0) {
error_print(); error_print();
return -1; return -1;
} }
@@ -327,7 +327,7 @@ int sm4_gcm_decrypt_finish(SM4_GCM_CTX *ctx, uint8_t *out, size_t *outlen)
} }
gmssl_memxor(mac, mac, ctx->Y, ctx->taglen); gmssl_memxor(mac, mac, ctx->Y, ctx->taglen);
if (memcmp(mac, ctx->mac, ctx->taglen) != 0) { if (gmssl_secure_memcmp(mac, ctx->mac, ctx->taglen) != 0) {
error_print(); error_print();
return -1; return -1;
} }