diff --git a/.githooks/pre-commit b/.githooks/pre-commit index 84c9ba8f..a902e9de 100755 --- a/.githooks/pre-commit +++ b/.githooks/pre-commit @@ -1,8 +1,8 @@ #!/bin/sh set -eu -version_num="30200" -version_base="3.2.0-dev" +version_num="30300" +version_base="3.3.0-dev" version_file="include/gmssl/version.h" cmake_file="CMakeLists.txt" diff --git a/.gitignore b/.gitignore index 78966f96..2d180346 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,4 @@ /out/* *.plist +TODO.md diff --git a/CMakeLists.txt b/CMakeLists.txt index 5922f25a..a8b33304 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -641,7 +641,7 @@ if (ENABLE_SKF) src/skf/skf_wisec.c) list(APPEND tools tools/skfutil.c) add_library(skf_dummy SHARED src/skf/skf_dummy.c) - set_target_properties(skf_dummy PROPERTIES VERSION 3.2 SOVERSION 3) + set_target_properties(skf_dummy PROPERTIES VERSION 3.3 SOVERSION 3) endif() if (ENABLE_SDF) @@ -700,7 +700,7 @@ endif() set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") -SET_TARGET_PROPERTIES(gmssl PROPERTIES VERSION 3.2 SOVERSION 3) +SET_TARGET_PROPERTIES(gmssl PROPERTIES VERSION 3.3 SOVERSION 3) install(TARGETS gmssl ARCHIVE DESTINATION lib LIBRARY DESTINATION lib RUNTIME DESTINATION bin) @@ -865,7 +865,7 @@ endif() # set(CPACK_PACKAGE_NAME "GmSSL") set(CPACK_PACKAGE_VENDOR "GmSSL develop team") -set(CPACK_PACKAGE_VERSION "3.2.0") +set(CPACK_PACKAGE_VERSION "3.3.0-dev.1150") set(CPACK_PACKAGE_DESCRIPTION_FILE ${PROJECT_SOURCE_DIR}/README.md) set(CPACK_NSIS_MODIFY_PATH ON) include(CPack) diff --git a/README.md b/README.md index d70ebefa..9dceb843 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ GmSSL是由北京大学自主开发的国产商用密码开源库,实现了对 ## 下载 -* GmSSL的主分支版本为 [GmSSL-3.2.0](https://github.com/guanzhi/GmSSL/releases/tag/v3.2.0),主要增加TLS 1.3、TLCP、后量子密码算法和跨平台构建支持,Windows、Android、iOS、OpenHarmony等平台的开发者需要使用该版本。 +* GmSSL的当前稳定发布版本为 [GmSSL-3.2.0](https://github.com/guanzhi/GmSSL/releases/tag/v3.2.0),主要增加TLS 1.3、TLCP、后量子密码算法和跨平台构建支持,Windows、Android、iOS、OpenHarmony等平台的开发者需要使用该版本。 ## 编译与安装 diff --git a/include/gmssl/version.h b/include/gmssl/version.h index 3cc48bf1..ec9c500d 100644 --- a/include/gmssl/version.h +++ b/include/gmssl/version.h @@ -17,8 +17,8 @@ extern "C" { #endif -#define GMSSL_VERSION_NUM 30200 -#define GMSSL_VERSION_STR "GmSSL 3.2.0" +#define GMSSL_VERSION_NUM 30300 +#define GMSSL_VERSION_STR "GmSSL 3.3.0-dev.1150" int gmssl_version_num(void); const char *gmssl_version_str(void);