From: Alan T. DeKok Date: Wed, 22 Sep 2021 16:16:40 +0000 (-0400) Subject: use time_delta instead of uint32 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca45d3ed93efd60e43464f0ca733159dcd58f91b;p=thirdparty%2Ffreeradius-server.git use time_delta instead of uint32 --- diff --git a/src/lib/tls/cache.c b/src/lib/tls/cache.c index d47cfa2475..23e1d26cb1 100644 --- a/src/lib/tls/cache.c +++ b/src/lib/tls/cache.c @@ -1179,7 +1179,7 @@ int fr_tls_cache_ctx_init(SSL_CTX *ctx, fr_tls_cache_conf_t const *cache_conf) /* * Controls the validity period of the stateful cache. */ - SSL_CTX_set_timeout(ctx, cache_conf->lifetime); + SSL_CTX_set_timeout(ctx, fr_time_delta_to_sec(cache_conf->lifetime)); /* * Disables stateless session tickets for TLS 1.3. diff --git a/src/lib/tls/conf.c b/src/lib/tls/conf.c index b1b7940044..b168f8f062 100644 --- a/src/lib/tls/conf.c +++ b/src/lib/tls/conf.c @@ -87,7 +87,7 @@ static CONF_PARSER tls_cache_config[] = { .dflt = "auto" }, { FR_CONF_OFFSET("name", FR_TYPE_TMPL, fr_tls_cache_conf_t, id_name), .dflt = "%{EAP-Type}%{Virtual-Server}", .quote = T_DOUBLE_QUOTED_STRING }, - { FR_CONF_OFFSET("lifetime", FR_TYPE_UINT32, fr_tls_cache_conf_t, lifetime), .dflt = "86400" }, + { FR_CONF_OFFSET("lifetime", FR_TYPE_TIME_DELTA, fr_tls_cache_conf_t, lifetime), .dflt = "1d" }, #if OPENSSL_VERSION_NUMBER >= 0x10100000L { FR_CONF_OFFSET("require_extended_master_secret", FR_TYPE_BOOL, fr_tls_cache_conf_t, require_extms), .dflt = "yes" },