From 79ed4489e399df4819b06d1dc6b02742dc0fafbf Mon Sep 17 00:00:00 2001 From: Zhi Guan Date: Mon, 22 Jun 2026 23:46:37 +0800 Subject: [PATCH] Update sm4_ff1 --- CMakeLists.txt | 5 +++-- cmake/tool_sm4.cmake | 4 ++-- include/gmssl/version.h | 2 +- tools/sm4_ff1.c | 4 ++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 231e0f51..a875276e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -616,6 +616,7 @@ if (ENABLE_TLS) src/tls_sct.c src/tls_ocsp.c src/tls_cookie.c + src/quic.c src/tls_trace.c src/tls_vrf.c src/tlcp.c @@ -629,7 +630,7 @@ if (ENABLE_TLS) tools/tls13_client.c tools/tls13_server.c tools/sctverify.c) - list(APPEND tests tls tls13 tls_ocsp) + list(APPEND tests tls tls13 tls_ocsp quic) endif() @@ -919,7 +920,7 @@ endif() # set(CPACK_PACKAGE_NAME "GmSSL") set(CPACK_PACKAGE_VENDOR "GmSSL develop team") -set(CPACK_PACKAGE_VERSION "3.3.0-dev.1159") +set(CPACK_PACKAGE_VERSION "3.3.0-dev.1160") set(CPACK_PACKAGE_DESCRIPTION_FILE ${PROJECT_SOURCE_DIR}/README.md) set(CPACK_NSIS_MODIFY_PATH ON) include(CPack) diff --git a/cmake/tool_sm4.cmake b/cmake/tool_sm4.cmake index fb5ae6e4..ffb1bcc5 100644 --- a/cmake/tool_sm4.cmake +++ b/cmake/tool_sm4.cmake @@ -50,9 +50,9 @@ if(ENABLE_SM4_XTS) gmssl_files_equal(tool_sm4_xts.plain tool_sm4_xts.decrypt) endif() if(ENABLE_SM4_FF1) - gmssl_expect_stdout("2326982895499381" + gmssl_expect_stdout("2326982895499381\n" sm4_ff1 -encrypt -key ${SM4_FF1_KEY} -tweak 39383736353433323130 -digits 6226090102675688) - gmssl_expect_stdout("6226090102675688" + gmssl_expect_stdout("6226090102675688\n" sm4_ff1 -decrypt -key ${SM4_FF1_KEY} -tweak 39383736353433323130 -digits 2326982895499381) endif() if(ENABLE_SM4_CBC_MAC) diff --git a/include/gmssl/version.h b/include/gmssl/version.h index 1594fa02..234b3abe 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.1159" +#define GMSSL_VERSION_STR "GmSSL 3.3.0-dev.1160" int gmssl_version_num(void); const char *gmssl_version_str(void); diff --git a/tools/sm4_ff1.c b/tools/sm4_ff1.c index b05fe53e..aab14c5a 100644 --- a/tools/sm4_ff1.c +++ b/tools/sm4_ff1.c @@ -344,6 +344,10 @@ bad: fprintf(stderr, "gmssl %s: output failure : %s\n", prog, strerror(errno)); goto end; } + if (fputc('\n', stdout) == EOF) { + fprintf(stderr, "gmssl %s: output failure : %s\n", prog, strerror(errno)); + goto end; + } ret = 0;