Merge branch 'release/1.2.2'
# Conflicts: # CMakeLists.txt
This commit is contained in:
commit
0edd1c980b
2 changed files with 3 additions and 6 deletions
|
|
@ -2,7 +2,7 @@ CMAKE_MINIMUM_REQUIRED (VERSION 3.0)
|
||||||
|
|
||||||
SET (CMAKE_C_COMPILER "gcc")
|
SET (CMAKE_C_COMPILER "gcc")
|
||||||
|
|
||||||
PROJECT (ervu-sign-module VERSION 1.3.0 LANGUAGES C)
|
PROJECT (ervu-sign-module VERSION 1.2.2 LANGUAGES C)
|
||||||
|
|
||||||
IF (CMAKE_VERBOSE)
|
IF (CMAKE_VERBOSE)
|
||||||
SET (CMAKE_VERBOSE_MAKEFILE 1)
|
SET (CMAKE_VERBOSE_MAKEFILE 1)
|
||||||
|
|
@ -51,7 +51,6 @@ SET (DEP_LIBS
|
||||||
-ldl
|
-ldl
|
||||||
-ljson-glib-1.0
|
-ljson-glib-1.0
|
||||||
-lgobject-2.0
|
-lgobject-2.0
|
||||||
-luuid
|
|
||||||
)
|
)
|
||||||
|
|
||||||
# JSON-GLIB
|
# JSON-GLIB
|
||||||
|
|
@ -121,12 +120,10 @@ ADD_EXECUTABLE (${PROJECT_NAME}
|
||||||
${UTILS_DIR}/gconf_file.c
|
${UTILS_DIR}/gconf_file.c
|
||||||
${UTILS_DIR}/glib_utils.c
|
${UTILS_DIR}/glib_utils.c
|
||||||
${UTILS_DIR}/json_parser.c
|
${UTILS_DIR}/json_parser.c
|
||||||
${UTILS_DIR}/json_writer.c
|
|
||||||
${UTILS_DIR}/jwt.c
|
${UTILS_DIR}/jwt.c
|
||||||
${UTILS_DIR}/library.c
|
${UTILS_DIR}/library.c
|
||||||
${UTILS_DIR}/logger.c
|
${UTILS_DIR}/logger.c
|
||||||
${UTILS_DIR}/str_t.c
|
${UTILS_DIR}/str_t.c
|
||||||
${UTILS_DIR}/uuid.c
|
|
||||||
${FCGISRV_DIR}/fcgi_map.c
|
${FCGISRV_DIR}/fcgi_map.c
|
||||||
${FCGISRV_DIR}/fcgi_server.c
|
${FCGISRV_DIR}/fcgi_server.c
|
||||||
${FCGISRV_DIR}/fcgi_thread.c
|
${FCGISRV_DIR}/fcgi_thread.c
|
||||||
|
|
|
||||||
|
|
@ -617,8 +617,8 @@ cryptopro_verify(const str_t* cert_thumbprint, const str_t* alg, const str_t* da
|
||||||
goto exit;
|
goto exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!cp_function_list.CryptAcquireContext(&hCryptProv, NULL, CP_KC1_GR3410_2001_PROV,
|
if (!cp_function_list.CryptAcquireContext(&hCryptProv, NULL, NULL, PROV_GOST_2012_256,
|
||||||
PROV_GOST_2001_DH, CRYPT_VERIFYCONTEXT)) {
|
CRYPT_VERIFYCONTEXT)) {
|
||||||
LOG_ERROR("CryptAcquireContext() failed");
|
LOG_ERROR("CryptAcquireContext() failed");
|
||||||
goto exit;
|
goto exit;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue