This commit is contained in:
Zhi Guan
2026-06-17 16:09:06 +08:00
parent f38142d35e
commit ace325928b
4 changed files with 13 additions and 3 deletions

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.1080")
set(CPACK_PACKAGE_VERSION "3.2.0-dev.1081")
set(CPACK_PACKAGE_DESCRIPTION_FILE ${PROJECT_SOURCE_DIR}/README.md)
set(CPACK_NSIS_MODIFY_PATH ON)
include(CPack)

View File

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

View File

@@ -155,6 +155,11 @@ bad:
argv++;
}
if (!hhex) {
fprintf(stderr, "gmssl %s: `-h` option is required\n", prog);
goto end;
}
ghash_init(&ghash_ctx, h, aad, aadlen);
if (in_str) {
@@ -184,6 +189,7 @@ bad:
}
ret = 0;
end:
if (aad_buf) free(aad_buf);
if (infile && infp) fclose(infp);
if (outfile && outfp) fclose(outfp);
return ret;

View File

@@ -57,7 +57,7 @@ int skfutil_main(int argc, char **argv)
unsigned char buf[4096];
size_t len;
uint8_t authkey[16];
uint8_t authkey[16] = {0};
size_t authkeylen;
SKF_DEVICE dev;
SKF_KEY key;
@@ -237,6 +237,10 @@ bad:
fprintf(stderr, "%s: inner error\n", prog);
goto end;
}
if (fwrite(sig, 1, siglen, outfp) != siglen) {
fprintf(stderr, "%s: output failure\n", prog);
goto end;
}
ret = 0;
goto end;