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

certstore支持rpm打包

Browse Source 
certstore修改缓存时间戳
This commit is contained in:
fengweihao
2019-11-28 15:08:37 +08:00
parent 3662ddd884
commit d278e77671
4 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cmake/Package.cmake
View File

@@ -1,7 +1,7 @@
if(CMAKE_BUILD_TYPE STREQUAL "Debug") if(CMAKE_BUILD_TYPE STREQUAL "Debug")
set(CPACK_PACKAGE_NAME "certostre-debug") set(CPACK_PACKAGE_NAME "certstore-debug")
else() else()
set(CPACK_PACKAGE_NAME "certostre") set(CPACK_PACKAGE_NAME "certstore")
endif() endif()
set(CPACK_PACKAGE_VENDOR "MESASOFT") set(CPACK_PACKAGE_VENDOR "MESASOFT")
@@ -22,14 +22,19 @@ set(CPACK_RPM_PRE_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PreInstall.in)
#set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PostUninstall.in) #set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PostUninstall.in)
#set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PreUninstall.in) #set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PreUninstall.in)
set(CMAKE_INSTALL_PREFIX "/home/tsg/certstore")
set(CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX /home/tsg) set(CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX /home/tsg)
install(PROGRAMS build/program/certstore DESTINATION ./) install(PROGRAMS build/program/certstore DESTINATION ./)
install(DIRECTORY resource/cert DESTINATION ./) install(DIRECTORY resource/cert DESTINATION ./)
install(DIRECTORY resource/conf DESTINATION ./) install(DIRECTORY resource/conf DESTINATION ./)
install(FILES resource/package/r2_certstore DESTINATION ./) #install(FILES resource/package/r2_certstore DESTINATION ./)
install(FILES resource/package/r3_certstore DESTINATION ./) #install(FILES resource/package/r3_certstore DESTINATION ./)
install(FILES resource/package/Makefile DESTINATION ./) #install(FILES resource/package/Makefile DESTINATION ./)
install(FILES script/signssl.sh DESTINATION ./tool)
install(FILES script/x509 DESTINATION ./tool)
install(FILES script/certstore.service DESTINATION /usr/lib/systemd/system/)
# Must uninstall the debug package before install release package # Must uninstall the debug package before install release package
if(CMAKE_BUILD_TYPE STREQUAL "Debug") if(CMAKE_BUILD_TYPE STREQUAL "Debug")
@@ -40,6 +45,6 @@ endif()
# setup %config(noreplace) # setup %config(noreplace)
set(CPACK_RPM_USER_FILELIST "%config(noreplace) ${CMAKE_INSTALL_PREFIX}/conf/cert_store.ini" set(CPACK_RPM_USER_FILELIST "%config(noreplace) ${CMAKE_INSTALL_PREFIX}/conf/cert_store.ini"
"%config(noreplace) ${CMAKE_INSTALL_PREFIX}/conf/table_info.conf" "%config(noreplace) ${CMAKE_INSTALL_PREFIX}/conf/table_info.conf"
"%config(noreplace) ${CMAKE_INSTALL_PREFIX}/conf/pxy_obj_keyring.json") "%config(noreplace) ${CMAKE_INSTALL_PREFIX}/conf/pxy_obj_keyring.json")
include(CPack) include(CPack)

2
program/include/cert_conf.h
View File

@@ -44,7 +44,7 @@ struct pxy_obj_keyring{
char v3_ctl[CT_STRING_MAX]; char v3_ctl[CT_STRING_MAX];
int is_send; int is_send;
int is_valid; int is_valid;
uint64_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;
}; };

7
program/src/cert_session.cpp
View File

@@ -1994,15 +1994,16 @@ const char* table_line, MAAT_PLUGIN_EX_DATA* ad, long __attribute__((__unused__)
memset(pxy_obj, 0, sizeof(struct pxy_obj_keyring)); memset(pxy_obj, 0, sizeof(struct pxy_obj_keyring));
atomic64_set(&pxy_obj->ref_cnt, 1); atomic64_set(&pxy_obj->ref_cnt, 1);
ret=sscanf(table_line, "%d\t%s\t%s\t%s\t%s\t%lu\t%s\t%s\t%d\t%d\t%lu", &pxy_obj->keyring_id, profile_name, ret=sscanf(table_line, "%d\t%s\t%s\t%s\t%s\t%lu\t%s\t%s\t%d\t%d", &pxy_obj->keyring_id, profile_name,
pxy_obj->keyring_type, private_file, public_file, &pxy_obj->expire_time, pxy_obj->public_algo, pxy_obj->keyring_type, private_file, public_file, &pxy_obj->expire_time, pxy_obj->public_algo,
pxy_obj->v3_ctl, &pxy_obj->is_send, &pxy_obj->is_valid, &pxy_obj->op_time); pxy_obj->v3_ctl, &pxy_obj->is_send, &pxy_obj->is_valid);
if(ret!=11) if(ret!=10)
{ {
kfree(pxy_obj); kfree(pxy_obj);
mesa_runtime_log(RLOG_LV_FATAL, MODULE_NAME, "certstore parse config failed: %s", table_line); mesa_runtime_log(RLOG_LV_FATAL, MODULE_NAME, "certstore parse config failed: %s", table_line);
goto finish; goto finish;
} }
pxy_obj->op_time = time(NULL);
/*Load PUBLICKEY***/ /*Load PUBLICKEY***/
if ((pxy_obj->issuer = x509_get_root_ca(public_file, pxy_obj->is_send, pxy_obj->keyring_type, &pxy_obj->stack_ca)) == NULL ){ if ((pxy_obj->issuer = x509_get_root_ca(public_file, pxy_obj->is_send, pxy_obj->keyring_type, &pxy_obj->stack_ca)) == NULL ){

2
resource/package/r3_certstore
View File

@@ -11,7 +11,7 @@ while [ 1 ]; do
ulimit -c 0 ulimit -c 0
fi fi
./certstore --normal > /dev/null ./certstore > /dev/null
echo program crashed, restart at `date +"%w %Y/%m/%d, %H:%M:%S"` >> RESTART.log echo program crashed, restart at `date +"%w %Y/%m/%d, %H:%M:%S"` >> RESTART.log
sleep 10 sleep 10
done done