diff options
| author | fengweihao <[email protected]> | 2024-10-17 19:09:37 +0800 |
|---|---|---|
| committer | fengweihao <[email protected]> | 2024-10-17 19:09:37 +0800 |
| commit | c8bca255e88147c72f382c336bedd66cd1145295 (patch) | |
| tree | 0adcf389619b68dd0f8c3df39d645b4d50d970c5 | |
| parent | d581a9726264eb7d0e1b3256dcb0da02dd3a79c1 (diff) | |
Fix CI build failures, remove invalid is_valid parameter parsing.v3.0.6-20241025v3.0.5-20241018
| -rw-r--r-- | program/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | program/include/cert_store.h | 1 | ||||
| -rw-r--r-- | program/src/cert_session.cpp | 6 | ||||
| -rw-r--r-- | vendor/CMakeLists.txt | 4 |
4 files changed, 5 insertions, 20 deletions
diff --git a/program/CMakeLists.txt b/program/CMakeLists.txt index bf35e60..c050ef3 100644 --- a/program/CMakeLists.txt +++ b/program/CMakeLists.txt @@ -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 ${SYSTEMD_INCLUDE_DIRS}) -target_link_libraries(certstore dl common - 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}) +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}) diff --git a/program/include/cert_store.h b/program/include/cert_store.h index 1329d82..49556c0 100644 --- a/program/include/cert_store.h +++ b/program/include/cert_store.h @@ -45,7 +45,6 @@ struct pxy_obj_keyring char public_algo[CT_STRING_MAX]; char v3_ctl[CT_STRING_MAX]; int is_send; - int is_valid; time_t op_time; atomic64_t ref_cnt; STACK_OF(X509) *stack_ca; diff --git a/program/src/cert_session.cpp b/program/src/cert_session.cpp index 68f431e..4db571f 100644 --- a/program/src/cert_session.cpp +++ b/program/src/cert_session.cpp @@ -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; } - 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"); if(value_int > 0) { diff --git a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt index 27a9d09..59d6d03 100644 --- a/vendor/CMakeLists.txt +++ b/vendor/CMakeLists.txt @@ -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 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) 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}) |