From ac51d63265511a67fa76f5e0e7363e688cde57fc Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Fri, 15 Sep 2017 08:26:22 +0200 Subject: _gnutls_epoch_get(): simplified use Signed-off-by: Nikos Mavrogiannopoulos --- lib/constate.c | 3 ++- lib/handshake.c | 3 +-- lib/session_pack.c | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/constate.c b/lib/constate.c index 58367a737f..becdfd9dcb 100644 --- a/lib/constate.c +++ b/lib/constate.c @@ -507,7 +507,8 @@ _gnutls_epoch_get(gnutls_session_t session, unsigned int epoch_rel, if (params == NULL || *params == NULL) return gnutls_assert_val(GNUTLS_E_INVALID_REQUEST); - *params_out = *params; + if (params_out) + *params_out = *params; return 0; } diff --git a/lib/handshake.c b/lib/handshake.c index f96f949a3e..8e20c76ab3 100644 --- a/lib/handshake.c +++ b/lib/handshake.c @@ -2170,7 +2170,6 @@ static int _gnutls_recv_supplemental(gnutls_session_t session) int gnutls_handshake(gnutls_session_t session) { int ret; - record_parameters_st *params; /* sanity check. Verify that there are priorities setup. */ @@ -2200,7 +2199,7 @@ int gnutls_handshake(gnutls_session_t session) ret = _gnutls_epoch_get(session, session->security_parameters.epoch_next, - ¶ms); + NULL); if (ret < 0) { /* We assume the epoch is not allocated if _gnutls_epoch_get fails. */ ret = diff --git a/lib/session_pack.c b/lib/session_pack.c index 3bcff851d3..25f44d04fd 100644 --- a/lib/session_pack.c +++ b/lib/session_pack.c @@ -722,7 +722,6 @@ pack_security_parameters(gnutls_session_t session, gnutls_buffer_st * ps) int ret; int size_offset; size_t cur_size; - record_parameters_st *params; if (session->security_parameters.epoch_read != session->security_parameters.epoch_write) { @@ -730,7 +729,7 @@ pack_security_parameters(gnutls_session_t session, gnutls_buffer_st * ps) return GNUTLS_E_UNAVAILABLE_DURING_HANDSHAKE; } - ret = _gnutls_epoch_get(session, EPOCH_READ_CURRENT, ¶ms); + ret = _gnutls_epoch_get(session, EPOCH_READ_CURRENT, NULL); if (ret < 0) { gnutls_assert(); return ret; -- cgit v1.2.1