gfwleak/tango-certstore
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix CI build failures, remove invalid is_valid parameter parsing.

Browse Source
This commit is contained in:
fengweihao
2024-10-17 19:09:37 +08:00
parent d581a97262
commit c8bca255e8
4 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
program/CMakeLists.txt
View File

@@ -7,16 +7,4 @@ add_executable(certstore src/cert_store.cpp src/cert_session.cpp)
target_include_directories(certstore PRIVATE ${CMAKE_CURRENT_LIST_DIR}/include) target_include_directories(certstore PRIVATE ${CMAKE_CURRENT_LIST_DIR}/include)
target_include_directories(certstore PRIVATE ${SYSTEMD_INCLUDE_DIRS}) target_include_directories(certstore PRIVATE ${SYSTEMD_INCLUDE_DIRS})
target_link_libraries(certstore dl common target_link_libraries(certstore dl common maatframe openssl-ssl-static openssl-crypto-static pthread uuid libevent-static MESA_prof_load MESA_handle_logger hiredis-static MESA_field_stat cjson ${SYSTEMD_LIBRARIES})
maatframe
openssl-ssl-static
openssl-crypto-static
pthread
cjson
uuid
libevent-static
MESA_prof_load
MESA_handle_logger
hiredis-static
MESA_field_stat
${SYSTEMD_LIBRARIES})

1
program/include/cert_store.h
View File

@@ -45,7 +45,6 @@ struct pxy_obj_keyring
char public_algo[CT_STRING_MAX]; char public_algo[CT_STRING_MAX];
char v3_ctl[CT_STRING_MAX]; char v3_ctl[CT_STRING_MAX];
int is_send; int is_send;
int is_valid;
time_t op_time; time_t op_time;
atomic64_t ref_cnt; atomic64_t ref_cnt;
STACK_OF(X509) *stack_ca; STACK_OF(X509) *stack_ca;

6
program/src/cert_session.cpp
View File

@@ -2301,12 +2301,6 @@ void keyring_table_new_cb(const char *table_name, const char *key, const char* t
pxy_obj->use_hsm = value_int; pxy_obj->use_hsm = value_int;
} }
value_int = keyring_get_value_number(pxy_profile_keyring, "is_valid");
if(value_int > 0)
{
pxy_obj->is_valid = value_int;
}
value_int = keyring_get_value_number(pxy_profile_keyring, "slot_id"); value_int = keyring_get_value_number(pxy_profile_keyring, "slot_id");
if(value_int > 0) if(value_int > 0)
{ {

4
vendor/CMakeLists.txt vendored
View File

@@ -135,6 +135,10 @@ add_library(MESA_field_stat SHARED IMPORTED GLOBAL)
set_property(TARGET MESA_field_stat PROPERTY IMPORTED_LOCATION ${MESA_FRAMEWORK_LIB_DIR}/libMESA_field_stat2.so) set_property(TARGET MESA_field_stat PROPERTY IMPORTED_LOCATION ${MESA_FRAMEWORK_LIB_DIR}/libMESA_field_stat2.so)
set_property(TARGET MESA_field_stat PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${MESA_FRAMEWORK_INCLUDE_DIR}) set_property(TARGET MESA_field_stat PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${MESA_FRAMEWORK_INCLUDE_DIR})
add_library(cjson SHARED IMPORTED GLOBAL)
set_property(TARGET cjson PROPERTY IMPORTED_LOCATION ${MESA_FRAMEWORK_LIB_DIR}/libcjson.so)
set_property(TARGET cjson PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${MESA_FRAMEWORK_INCLUDE_DIR})
add_library(breakpad_mini SHARED IMPORTED GLOBAL) add_library(breakpad_mini SHARED IMPORTED GLOBAL)
set_property(TARGET breakpad_mini PROPERTY IMPORTED_LOCATION ${MESA_FRAMEWORK_LIB_DIR}/libbreakpad_mini.so) set_property(TARGET breakpad_mini PROPERTY IMPORTED_LOCATION ${MESA_FRAMEWORK_LIB_DIR}/libbreakpad_mini.so)
set_property(TARGET breakpad_mini PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${MESA_FRAMEWORK_INCLUDE_DIR}) set_property(TARGET breakpad_mini PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${MESA_FRAMEWORK_INCLUDE_DIR})