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

Fix #1900

Browse Source
This commit is contained in:
Zhi Guan
2026-06-21 00:01:32 +08:00
parent 1e1822205f
commit 866e3aef67
4 changed files with 48 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -874,7 +874,7 @@ endif()
#
set(CPACK_PACKAGE_NAME "GmSSL")
set(CPACK_PACKAGE_VENDOR "GmSSL develop team")
set(CPACK_PACKAGE_VERSION "3.2.0-dev.1131")
set(CPACK_PACKAGE_VERSION "3.2.0-dev.1132")
set(CPACK_PACKAGE_DESCRIPTION_FILE ${PROJECT_SOURCE_DIR}/README.md)
set(CPACK_NSIS_MODIFY_PATH ON)
include(CPack)

2
include/gmssl/version.h
View File

@@ -18,7 +18,7 @@ extern "C" {
#define GMSSL_VERSION_NUM 30200
#define GMSSL_VERSION_STR "GmSSL 3.2.0-dev.1131"
#define GMSSL_VERSION_STR "GmSSL 3.2.0-dev.1132"
int gmssl_version_num(void);
const char *gmssl_version_str(void);

16
src/sm2_enc.c
View File

@@ -322,6 +322,9 @@ int sm2_do_decrypt(const SM2_KEY *key, const SM2_CIPHERTEXT *in, uint8_t *out, s
uint8_t x2y2[64];
SM3_CTX sm3_ctx;
uint8_t hash[32];
uint8_t plaintext[SM2_MAX_PLAINTEXT_SIZE];
*outlen = 0;
// check C1 is on sm2 curve
if (sm2_z256_point_from_bytes(&C1, (uint8_t *)&in->point) != 1) {
@@ -334,20 +337,19 @@ int sm2_do_decrypt(const SM2_KEY *key, const SM2_CIPHERTEXT *in, uint8_t *out, s
// t = KDF(x2 || y2, klen) and check t is not all zeros
sm2_z256_point_to_bytes(&C1, x2y2);
sm2_kdf(x2y2, 64, in->ciphertext_size, out);
if (all_zero(out, in->ciphertext_size)) {
sm2_kdf(x2y2, 64, in->ciphertext_size, plaintext);
if (all_zero(plaintext, in->ciphertext_size)) {
error_print();
goto end;
}
// M = C2 xor t
gmssl_memxor(out, out, in->ciphertext, in->ciphertext_size);
*outlen = in->ciphertext_size;
gmssl_memxor(plaintext, plaintext, in->ciphertext, in->ciphertext_size);
// u = Hash(x2 || M || y2)
sm3_init(&sm3_ctx);
sm3_update(&sm3_ctx, x2y2, 32);
sm3_update(&sm3_ctx, out, in->ciphertext_size);
sm3_update(&sm3_ctx, plaintext, in->ciphertext_size);
sm3_update(&sm3_ctx, x2y2 + 32, 32);
sm3_finish(&sm3_ctx, hash);
@@ -356,11 +358,15 @@ int sm2_do_decrypt(const SM2_KEY *key, const SM2_CIPHERTEXT *in, uint8_t *out, s
error_print();
goto end;
}
memcpy(out, plaintext, in->ciphertext_size);
*outlen = in->ciphertext_size;
ret = 1;
end:
gmssl_secure_clear(&C1, sizeof(SM2_Z256_POINT));
gmssl_secure_clear(x2y2, sizeof(x2y2));
gmssl_secure_clear(hash, sizeof(hash));
gmssl_secure_clear(plaintext, sizeof(plaintext));
return ret;
}

36
tests/sm2_enctest.c
View File

@@ -113,6 +113,40 @@ static int test_sm2_do_encrypt(void)
return 1;
}
static int test_sm2_do_decrypt_bad_hash_does_not_output_plaintext(void)
{
SM2_KEY sm2_key;
uint8_t plaintext[] = "Hello World!";
SM2_CIPHERTEXT ciphertext;
uint8_t out[SM2_MAX_PLAINTEXT_SIZE];
size_t outlen = sizeof(out);
size_t i;
if (sm2_key_generate(&sm2_key) != 1
|| sm2_do_encrypt(&sm2_key, plaintext, sizeof(plaintext), &ciphertext) != 1) {
error_print();
return -1;
}
ciphertext.hash[0] ^= 0x01;
memset(out, 0xa5, sizeof(out));
if (sm2_do_decrypt(&sm2_key, &ciphertext, out, &outlen) != -1
|| outlen != 0) {
error_print();
return -1;
}
for (i = 0; i < sizeof(out); i++) {
if (out[i] != 0xa5) {
error_print();
return -1;
}
}
printf("%s() ok\n", __FUNCTION__);
return 1;
}
static int test_sm2_do_encrypt_fixlen(void)
{
struct {
@@ -323,6 +357,7 @@ int main(void)
{
if (test_sm2_ciphertext() != 1) goto err;
if (test_sm2_do_encrypt() != 1) goto err;
if (test_sm2_do_decrypt_bad_hash_does_not_output_plaintext() != 1) goto err;
if (test_sm2_do_encrypt_fixlen() != 1) goto err;
if (test_sm2_encrypt() != 1) goto err;
if (test_sm2_encrypt_fixlen() != 1) goto err;
@@ -335,4 +370,3 @@ err:
error_print();
return -1;
}