security-and-privacy/uts-server
security-and-privacy/uts-server
1
0
Fork 0
mirror of https://github.com/kakwa/uts-server synced 2025-01-10 05:34:29 +01:00
Code Issues Releases Wiki Activity

remove the awkward default_tsa parameter

Browse Source 
default_tsa pointing to a specific tsa section doesn't make sense.
removing it.
This commit is contained in:
kakwa 2016-09-12 22:21:22 +02:00
parent 8b5906f550
commit e55f8c81b6
6 changed files with 8 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
conf/uts-server.cnf
View File

@ -102,15 +102,9 @@ tcp_nodelay = 0
# Loglevel (debug, info, notice, warn, err, emerg, crit) # Loglevel (debug, info, notice, warn, err, emerg, crit)
log_level = info log_level = info
# Section defining which TSA section to use. # TSA configuration parameters
[ tsa ] [ tsa ]
# Name of the TSA section to use as default.
default_tsa = tsa_config1
# Example of Time-Stamp section configuration.
[ tsa_config1 ]
# TSA root directory. # TSA root directory.
dir = /etc/uts-server/pki dir = /etc/uts-server/pki

1
inc/rfc3161.h
View File

@ -14,6 +14,7 @@
/* Name of config entry that defines the OID file. */ /* Name of config entry that defines the OID file. */
#define OID_SECTION "oids" #define OID_SECTION "oids"
#define TSA_SECTION "tsa"
// number of char we get to log for the serial // number of char we get to log for the serial
#define SERIAL_ID_SIZE 8 #define SERIAL_ID_SIZE 8

10
src/lib/rfc3161.c
View File

@ -120,11 +120,11 @@ TS_RESP_CTX *create_tsctx(rfc3161_context *ct, CONF *conf, const char *section,
TS_RESP_CTX *resp_ctx = NULL; TS_RESP_CTX *resp_ctx = NULL;
// recover the section defining the default tsa // recover the section defining the default tsa
if ((section = TS_CONF_get_tsa_section(conf, section)) == NULL) { //if ((section = TS_CONF_get_tsa_section(conf, section)) == NULL) {
uts_logger(ct, LOG_ERR, "failed to get or use '%s' in section [ %s ]", // uts_logger(ct, LOG_ERR, "failed to get or use '%s' in section [ %s ]",
"default_tsa", "tsa"); // "default_tsa", "tsa");
goto end; // goto end;
} //}
if ((resp_ctx = TS_RESP_CTX_new()) == NULL) { if ((resp_ctx = TS_RESP_CTX_new()) == NULL) {
uts_logger(ct, LOG_ERR, "failed to initialize tsa context"); uts_logger(ct, LOG_ERR, "failed to initialize tsa context");
goto end; goto end;

2
src/lib/utils.c
View File

@ -362,7 +362,7 @@ int set_params(rfc3161_context *ct, char *conf_file, char *conf_wd) {
ct->ts_ctx_pool = calloc(numthreads, sizeof(ts_resp_ctx_wrapper)); ct->ts_ctx_pool = calloc(numthreads, sizeof(ts_resp_ctx_wrapper));
ct->numthreads = numthreads; ct->numthreads = numthreads;
for (int i = 0; i < numthreads; i++) { for (int i = 0; i < numthreads; i++) {
ct->ts_ctx_pool[i].ts_ctx = create_tsctx(ct, ct->conf, NULL, NULL); ct->ts_ctx_pool[i].ts_ctx = create_tsctx(ct, ct->conf, TSA_SECTION, NULL);
ct->ts_ctx_pool[i].available = 1; ct->ts_ctx_pool[i].available = 1;
if (ct->ts_ctx_pool[i].ts_ctx == NULL) if (ct->ts_ctx_pool[i].ts_ctx == NULL)
ret = 0; ret = 0;

7
tests/cfg/uts-server-ssl.cnf
View File

@ -81,13 +81,6 @@ log_level = info
#################################################################### ####################################################################
[ tsa ] [ tsa ]
# The default TSA section.
default_tsa = tsa_config1
[ tsa_config1 ]
# These are used by the TSA reply generation only.
# TSA root directory # TSA root directory
dir = ./pki dir = ./pki

7
tests/cfg/uts-server.cnf
View File

@ -81,13 +81,6 @@ log_level = info
#################################################################### ####################################################################
[ tsa ] [ tsa ]
# The default TSA section.
default_tsa = tsa_config1
[ tsa_config1 ]
# These are used by the TSA reply generation only.
# TSA root directory # TSA root directory
dir = ./pki dir = ./pki