abc/GmSSL
1
0
Fork 0
mirror of https://github.com/guanzhi/GmSSL.git synced 2026-06-27 15:43:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update sm4_ff1

Browse Source
This commit is contained in:
Zhi Guan
2026-06-22 23:46:37 +08:00
parent 5581ad21b8
commit 79ed4489e3
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@@ -616,6 +616,7 @@ if (ENABLE_TLS)
src/tls_sct.c src/tls_sct.c
src/tls_ocsp.c src/tls_ocsp.c
src/tls_cookie.c src/tls_cookie.c
src/quic.c
src/tls_trace.c src/tls_trace.c
src/tls_vrf.c src/tls_vrf.c
src/tlcp.c src/tlcp.c
@@ -629,7 +630,7 @@ if (ENABLE_TLS)
tools/tls13_client.c tools/tls13_client.c
tools/tls13_server.c tools/tls13_server.c
tools/sctverify.c) tools/sctverify.c)
list(APPEND tests tls tls13 tls_ocsp) list(APPEND tests tls tls13 tls_ocsp quic)
endif() endif()
@@ -919,7 +920,7 @@ endif()
# #
set(CPACK_PACKAGE_NAME "GmSSL") set(CPACK_PACKAGE_NAME "GmSSL")
set(CPACK_PACKAGE_VENDOR "GmSSL develop team") 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_PACKAGE_DESCRIPTION_FILE ${PROJECT_SOURCE_DIR}/README.md)
set(CPACK_NSIS_MODIFY_PATH ON) set(CPACK_NSIS_MODIFY_PATH ON)
include(CPack) include(CPack)

4
cmake/tool_sm4.cmake
View File

@@ -50,9 +50,9 @@ if(ENABLE_SM4_XTS)
gmssl_files_equal(tool_sm4_xts.plain tool_sm4_xts.decrypt) gmssl_files_equal(tool_sm4_xts.plain tool_sm4_xts.decrypt)
endif() endif()
if(ENABLE_SM4_FF1) if(ENABLE_SM4_FF1)
gmssl_expect_stdout("2326982895499381" gmssl_expect_stdout("2326982895499381\n"
sm4_ff1 -encrypt -key ${SM4_FF1_KEY} -tweak 39383736353433323130 -digits 6226090102675688) 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) sm4_ff1 -decrypt -key ${SM4_FF1_KEY} -tweak 39383736353433323130 -digits 2326982895499381)
endif() endif()
if(ENABLE_SM4_CBC_MAC) if(ENABLE_SM4_CBC_MAC)

2
include/gmssl/version.h
View File

@@ -18,7 +18,7 @@ extern "C" {
#define GMSSL_VERSION_NUM 30300 #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); int gmssl_version_num(void);
const char *gmssl_version_str(void); const char *gmssl_version_str(void);

4
tools/sm4_ff1.c
View File

@@ -344,6 +344,10 @@ bad:
fprintf(stderr, "gmssl %s: output failure : %s\n", prog, strerror(errno)); fprintf(stderr, "gmssl %s: output failure : %s\n", prog, strerror(errno));
goto end; goto end;
} }
if (fputc('\n', stdout) == EOF) {
fprintf(stderr, "gmssl %s: output failure : %s\n", prog, strerror(errno));
goto end;
}
ret = 0; ret = 0;