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

Fix bugs

Browse Source
This commit is contained in:
Zhi Guan
2026-06-17 17:03:49 +08:00
parent cad645da20
commit a3dc07db74
26 changed files with 107 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -819,7 +819,7 @@ endif()
#
set(CPACK_PACKAGE_NAME "GmSSL")
set(CPACK_PACKAGE_VENDOR "GmSSL develop team")
set(CPACK_PACKAGE_VERSION "3.2.0-dev.1085")
set(CPACK_PACKAGE_VERSION "3.2.0-dev.1086")
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.1085"
#define GMSSL_VERSION_STR "GmSSL 3.2.0-dev.1086"
int gmssl_version_num(void);
const char *gmssl_version_str(void);

2
tools/kyberdecap.c
View File

@@ -38,7 +38,7 @@ int kyberdecap_main(int argc, char **argv)
FILE *keyfp = NULL;
FILE *infp = stdin;
FILE *outfp = stdout;
uint8_t keybuf[KYBER_PRIVATE_KEY_SIZE];
uint8_t keybuf[KYBER_PRIVATE_KEY_SIZE] = {0};
size_t keylen = KYBER_PRIVATE_KEY_SIZE;
const uint8_t *cp = keybuf;
uint8_t *p = keybuf;

4
tools/sdfdecrypt.c
View File

@@ -199,6 +199,10 @@ bad:
goto end;
}
}
if (ferror(infp)) {
fprintf(stderr, "%s: read failure\n", prog);
goto end;
}
if (sdf_cbc_decrypt_finish(&ctx, buf, &outlen) != 1) {
error_print();
goto end;

6
tools/sdfdigest.c
View File

@@ -152,7 +152,7 @@ int sdfdigest_main(int argc, char **argv)
if (--argc < 1) goto bad;
infile = *(++argv);
if (!(infp = fopen(infile, "rb"))) {
fprintf(stderr, "gmssl%s: open '%s' failure : %s\n", prog, infile, strerror(errno));
fprintf(stderr, "gmssl %s: open '%s' failure : %s\n", prog, infile, strerror(errno));
goto end;
}
} else if (!strcmp(*argv, "-out")) {
@@ -236,6 +236,10 @@ bad:
goto end;
}
}
if (ferror(infp)) {
fprintf(stderr, "%s: read failure\n", prog);
goto end;
}
memset(buf, 0, sizeof(buf));
}
if (sdf_digest_finish(&ctx, dgst) != 1) {

4
tools/sdfencrypt.c
View File

@@ -207,6 +207,10 @@ bad:
goto end;
}
}
if (ferror(infp)) {
fprintf(stderr, "%s: read failure\n", prog);
goto end;
}
if (sdf_cbc_encrypt_finish(&ctx, buf, &outlen) != 1) {
error_print();
goto end;

4
tools/sdfsign.c
View File

@@ -153,6 +153,10 @@ bad:
goto end;
}
}
if (ferror(infp)) {
fprintf(stderr, "%s: read failure\n", prog);
goto end;
}
if (sdf_sign_finish(&ctx, sig, &siglen) != 1) {
(void)sdf_close_device(&dev);
fprintf(stderr, "gmssl %s: inner error\n", prog);

4
tools/sdfutil.c
View File

@@ -174,6 +174,10 @@ bad:
while ((len = fread(buf, 1, sizeof(buf), infp)) > 0) {
sm3_update(&sm3_ctx, buf, len);
}
if (ferror(infp)) {
fprintf(stderr, "%s: read failure\n", prog);
goto end;
}
sm3_finish(&sm3_ctx, dgst);
if ((ret = sdf_sign(&key, dgst, sig, &siglen)) != 1) {

4
tools/skfutil.c
View File

@@ -231,6 +231,10 @@ bad:
while ((len = fread(buf, 1, sizeof(buf), infp)) > 0) {
sm3_update(&sm3_ctx, buf, len);
}
if (ferror(infp)) {
fprintf(stderr, "%s: read failure\n", prog);
goto end;
}
sm3_finish(&sm3_ctx, dgst);
if ((ret = skf_sign(&key, dgst, sig, &siglen)) != 1) {

4
tools/sm2sign.c
View File

@@ -131,6 +131,10 @@ bad:
goto end;
}
}
if (ferror(infp)) {
fprintf(stderr, "%s: read failure\n", prog);
goto end;
}
if (sm2_sign_finish(&sign_ctx, sig, &siglen) != 1) {
fprintf(stderr, "gmssl %s: inner error\n", prog);
goto end;

4
tools/sm2verify.c
View File

@@ -167,6 +167,10 @@ bad:
goto end;
}
}
if (ferror(infp)) {
fprintf(stderr, "%s: read failure\n", prog);
goto end;
}
if ((vr = sm2_verify_finish(&verify_ctx, sig, siglen)) < 0) {
fprintf(stderr, "gmssl %s: inner error\n", prog);
goto end;

4
tools/sm3.c
View File

@@ -214,6 +214,10 @@ bad:
goto end;
}
}
if (ferror(infp)) {
fprintf(stderr, "%s: read failure\n", prog);
goto end;
}
memset(buf, 0, sizeof(buf));
}
if (sm3_digest_finish(&sm3_ctx, dgst) != 1) {

4
tools/sm3hmac.c
View File

@@ -161,6 +161,10 @@ bad:
goto end;
}
}
if (ferror(infp)) {
fprintf(stderr, "%s: read failure\n", prog);
goto end;
}
memset(buf, 0, sizeof(buf));
}
if (sm3_digest_finish(&ctx, mac) != 1) {

4
tools/sm4_cbc.c
View File

@@ -178,6 +178,10 @@ bad:
goto end;
}
}
if (ferror(infp)) {
fprintf(stderr, "%s: read failure\n", prog);
goto end;
}
if (enc) {
if (sm4_cbc_encrypt_finish(&ctx, buf, &outlen) != 1) {

4
tools/sm4_cbc_mac.c
View File

@@ -161,6 +161,10 @@ bad:
goto end;
}
}
if (ferror(infp)) {
fprintf(stderr, "%s: read failure\n", prog);
goto end;
}
memset(buf, 0, sizeof(buf));
}
if (sm4_cbc_mac_finish(&ctx, mac) != 1) {

4
tools/sm4_cbc_sm3_hmac.c
View File

@@ -205,6 +205,10 @@ bad:
goto end;
}
}
if (ferror(infp)) {
fprintf(stderr, "%s: read failure\n", prog);
goto end;
}
if (enc) {
if (sm4_cbc_sm3_hmac_encrypt_finish(&ctx, buf, &outlen) != 1) {

4
tools/sm4_cfb.c
View File

@@ -194,6 +194,10 @@ bad:
goto end;
}
}
if (ferror(infp)) {
fprintf(stderr, "%s: read failure\n", prog);
goto end;
}
if (enc) {
if (sm4_cfb_encrypt_finish(&ctx, buf, &outlen) != 1) {

4
tools/sm4_ctr.c
View File

@@ -149,6 +149,10 @@ bad:
goto end;
}
}
if (ferror(infp)) {
fprintf(stderr, "%s: read failure\n", prog);
goto end;
}
if (sm4_ctr_encrypt_finish(&ctx, buf, &outlen) != 1) {
error_print();

4
tools/sm4_ctr_sm3_hmac.c
View File

@@ -205,6 +205,10 @@ bad:
goto end;
}
}
if (ferror(infp)) {
fprintf(stderr, "%s: read failure\n", prog);
goto end;
}
if (enc) {
if (sm4_ctr_sm3_hmac_encrypt_finish(&ctx, buf, &outlen) != 1) {

4
tools/sm4_ecb.c
View File

@@ -158,6 +158,10 @@ bad:
goto end;
}
}
if (ferror(infp)) {
fprintf(stderr, "%s: read failure\n", prog);
goto end;
}
if (enc) {
if (sm4_ecb_encrypt_finish(&ctx, buf, &outlen) != 1) {

4
tools/sm4_gcm.c
View File

@@ -214,6 +214,10 @@ bad:
goto end;
}
}
if (ferror(infp)) {
fprintf(stderr, "%s: read failure\n", prog);
goto end;
}
if (enc) {
if (sm4_gcm_encrypt_finish(&ctx, buf, &outlen) != 1) {

4
tools/sm4_ofb.c
View File

@@ -149,6 +149,10 @@ bad:
goto end;
}
}
if (ferror(infp)) {
fprintf(stderr, "%s: read failure\n", prog);
goto end;
}
if (sm4_ofb_encrypt_finish(&ctx, buf, &outlen) != 1) {
error_print();

4
tools/sm4_xts.c
View File

@@ -191,6 +191,10 @@ bad:
goto end;
}
}
if (ferror(infp)) {
fprintf(stderr, "%s: read failure\n", prog);
goto end;
}
if (enc) {
if (sm4_xts_encrypt_finish(&ctx, buf, &outlen) != 1) {

4
tools/sm9sign.c
View File

@@ -120,6 +120,10 @@ bad:
goto end;
}
}
if (ferror(infp)) {
fprintf(stderr, "%s: read failure\n", prog);
goto end;
}
if (sm9_sign_finish(&ctx, &key, sig, &siglen) != 1) {
error_print();
goto end;

4
tools/sm9verify.c
View File

@@ -124,6 +124,10 @@ bad:
goto end;
}
}
if (ferror(infp)) {
fprintf(stderr, "%s: read failure\n", prog);
goto end;
}
if ((ret = sm9_verify_finish(&ctx, sig, siglen, &mpk, id, strlen(id))) != 1) {
error_print();
goto end;

15
tools/tlcp_server.c
View File

@@ -7,6 +7,21 @@
* http://www.apache.org/licenses/LICENSE-2.0
*/
/*
* FIXME: 本文件中多处使用 atoi() 解析命令行参数（如 -port），存在安全隐患：
*
* 1. 错误不可检测：atoi("abc") 和 atoi("0") 均返回 0，无法区分有效值 0 和解析错误。
* 2. 溢出是未定义行为：atoi 遇到超出 INT_MAX 的输入时行为未定义，编译器可能产生不可预测的结果。
* 3. 负数可绕过边界检查：atoi("-1") 返回 -1，可能绕过只检查下界的验证逻辑。
*
* 应在后续版本中将 atoi 替换为 strtol()，配合 errno 和 endptr 做完整的错误检查：
* errno = 0;
* long val = strtol(arg, &endptr, 10);
* if (errno || *endptr || val < 0 || val > INT_MAX) { error; }
* port = (int)val;
*
* 同样的 atoi 问题也存在于其他 tlcp_*.c、tls12_*.c、tls13_*.c 以及 sm4*.c 等工具文件中。
*/
#include <stdio.h>
#include <string.h>