diff --git a/CMakeLists.txt b/CMakeLists.txt index 23aeb321..cf1e4143 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -228,7 +228,7 @@ set(tools tools/sm4_ctr.c tools/sm4_gcm.c tools/sm3.c - tools/sm3hmac.c + tools/sm3_hmac.c tools/sm3_pbkdf2.c tools/sm2keygen.c tools/sm2sign.c @@ -1026,7 +1026,7 @@ endif() # set(CPACK_PACKAGE_NAME "GmSSL") set(CPACK_PACKAGE_VENDOR "GmSSL develop team") -set(CPACK_PACKAGE_VERSION "3.3.0-dev.1176") +set(CPACK_PACKAGE_VERSION "3.3.0-dev.1177") set(CPACK_PACKAGE_DESCRIPTION_FILE ${PROJECT_SOURCE_DIR}/README.md) set(CPACK_NSIS_MODIFY_PATH ON) include(CPack) diff --git a/cmake/tool_sm3.cmake b/cmake/tool_sm3.cmake index 9876d1fb..10e59a3d 100644 --- a/cmake/tool_sm3.cmake +++ b/cmake/tool_sm3.cmake @@ -10,9 +10,9 @@ gmssl_run(sm3 -bin -in tool_sm3_input.txt -out tool_sm3.bin) gmssl_expect_file_hex(tool_sm3.bin "66c7f0f462eeedd9d1f2d46bdc10e4e24167c4875cf2f7a2297da02b8f4ba8e0") gmssl_expect_stdout("28d8a61be67d8bf7652c4eda7092b612f88be62184f55005c57ddf076e764199\n" - sm3hmac -key 0123456789abcdeffedcba9876543210 -in_str abc) -gmssl_run(sm3hmac -key 0123456789abcdeffedcba9876543210 -bin -in tool_sm3_input.txt -out tool_sm3hmac.bin) -gmssl_expect_file_hex(tool_sm3hmac.bin "28d8a61be67d8bf7652c4eda7092b612f88be62184f55005c57ddf076e764199") + sm3_hmac -key 0123456789abcdeffedcba9876543210 -in_str abc) +gmssl_run(sm3_hmac -key 0123456789abcdeffedcba9876543210 -bin -in tool_sm3_input.txt -out tool_sm3_hmac.bin) +gmssl_expect_file_hex(tool_sm3_hmac.bin "28d8a61be67d8bf7652c4eda7092b612f88be62184f55005c57ddf076e764199") gmssl_expect_stdout("df6b713d38d5a35df6861959e529ed22\n" sm3_pbkdf2 -pass password -salt 0011223344556677 -iter 10000 -outlen 16 -hex) diff --git a/include/gmssl/version.h b/include/gmssl/version.h index 1a008df0..e038b166 100644 --- a/include/gmssl/version.h +++ b/include/gmssl/version.h @@ -18,7 +18,7 @@ extern "C" { #define GMSSL_VERSION_NUM 30300 -#define GMSSL_VERSION_STR "GmSSL 3.3.0-dev.1176" +#define GMSSL_VERSION_STR "GmSSL 3.3.0-dev.1177" int gmssl_version_num(void); const char *gmssl_version_str(void); diff --git a/tools/gmssl.c b/tools/gmssl.c index 9d65dbd3..2f6acd1b 100644 --- a/tools/gmssl.c +++ b/tools/gmssl.c @@ -37,7 +37,7 @@ extern int sm2encrypt_main(int argc, char **argv); extern int sm2decrypt_main(int argc, char **argv); extern int sm2exch_main(int argc, char **argv); extern int sm3_main(int argc, char **argv); -extern int sm3hmac_main(int argc, char **argv); +extern int sm3_hmac_main(int argc, char **argv); extern int sm3_pbkdf2_main(int argc, char **argv); #ifdef ENABLE_SM4_ECB extern int sm4_ecb_main(int argc, char **argv); @@ -158,7 +158,7 @@ static const char *options = " sm2decrypt Decrypt with SM2 private key\n" " sm2exch SM2 key exchange\n" " sm3 Generate SM3 hash\n" - " sm3hmac Generate SM3 HMAC tag\n" + " sm3_hmac Generate SM3 HMAC tag\n" " sm3_pbkdf2 Hash password into key using PBKDF2 algoritm\n" #ifdef ENABLE_SM4_ECB " sm4_ecb Encrypt or decrypt with SM4 ECB\n" @@ -348,8 +348,8 @@ int main(int argc, char **argv) return sm2exch_main(argc, argv); } else if (!strcmp(*argv, "sm3")) { return sm3_main(argc, argv); - } else if (!strcmp(*argv, "sm3hmac")) { - return sm3hmac_main(argc, argv); + } else if (!strcmp(*argv, "sm3_hmac")) { + return sm3_hmac_main(argc, argv); } else if (!strcmp(*argv, "sm3_pbkdf2")) { return sm3_pbkdf2_main(argc, argv); #if ENABLE_SM4_ECB diff --git a/tools/sm3hmac.c b/tools/sm3_hmac.c similarity index 92% rename from tools/sm3hmac.c rename to tools/sm3_hmac.c index 2efe5388..49152152 100644 --- a/tools/sm3hmac.c +++ b/tools/sm3_hmac.c @@ -34,23 +34,24 @@ static const char *help = "\n" "Examples\n" "\n" -" KEY_HEX=`gmssl rand -outlen 16 -hex`\n" -" gmssl sm3hmac -key $KEY_HEX -in_str abc\n" +" KEY=`gmssl rand -outlen 16 -hex`\n" +" gmssl sm3_hmac -key $KEY -in_str abc\n" "\n" -" gmssl sm3hmac -key $KEY_HEX -in_str abc -bin\n" +" gmssl sm3_hmac -key $KEY -in_str abc -bin\n" "\n" -" gmssl sm3hmac -key $KEY_HEX -in /path/to/file\n" +" gmssl sm3_hmac -key $KEY -in /path/to/file\n" "\n" " When reading from stdin, make sure the trailing newline character is removed\n" "\n" " Linux/Mac:\n" -" echo -n abc | gmssl sm3hmac -key $KEY_HEX\n" +" echo -n abc | gmssl sm3_hmac -key $KEY\n" "\n" " Windows:\n" -" echo |set/p=\"abc\" | gmssl sm3hmac -key 11223344556677881122334455667788\n" +" for /f %i in ('gmssl rand -outlen 16 -hex') do set KEY=%i\n" +" echo |set/p=\"abc\" | gmssl sm3_hmac -key %KEY%\n" "\n"; -int sm3hmac_main(int argc, char **argv) +int sm3_hmac_main(int argc, char **argv) { int ret = 1; char *prog = argv[0];