diff --git a/CMakeLists.txt b/CMakeLists.txt index f76a8d93..5d1f2fa4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/include/gmssl/version.h b/include/gmssl/version.h index 6cdea837..90581534 100644 --- a/include/gmssl/version.h +++ b/include/gmssl/version.h @@ -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); diff --git a/tools/ghash.c b/tools/ghash.c index d80e5d59..32d40776 100644 --- a/tools/ghash.c +++ b/tools/ghash.c @@ -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; diff --git a/tools/skfutil.c b/tools/skfutil.c index a17079b8..5e8105f6 100644 --- a/tools/skfutil.c +++ b/tools/skfutil.c @@ -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;