diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-11-08 13:13:31 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2018-02-19 15:29:36 +0100 |
| commit | 1b12320a6938d327b07fc3c1e48ea6fe03d59a9b (patch) | |
| tree | 9791f6bc4e1c559f949b7d12bdf58ae282bda02d /lib/handshake-tls13.c | |
| parent | dcf2a8d3bd69ed0b994bed1753fe47a83366786e (diff) | |
| download | gnutls-1b12320a6938d327b07fc3c1e48ea6fe03d59a9b.tar.gz | |
session state: TLS1.2 and TLS1.3 state is stored as union
That is, to reduce memory usage as these protocol cannot be used
in parallel.
Relates: #281
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
Diffstat (limited to 'lib/handshake-tls13.c')
| -rw-r--r-- | lib/handshake-tls13.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/handshake-tls13.c b/lib/handshake-tls13.c index f39aff24d8..721f334eca 100644 --- a/lib/handshake-tls13.c +++ b/lib/handshake-tls13.c @@ -157,8 +157,8 @@ static int generate_ap_traffic_keys(gnutls_session_t session) uint8_t zero[MAX_HASH_SIZE]; ret = _tls13_derive_secret(session, DERIVED_LABEL, sizeof(DERIVED_LABEL)-1, - NULL, 0, session->key.proto.kshare.temp_secret, - session->key.proto.kshare.temp_secret); + NULL, 0, session->key.proto.tls13.temp_secret, + session->key.proto.tls13.temp_secret); if (ret < 0) return gnutls_assert_val(ret); @@ -170,13 +170,13 @@ static int generate_ap_traffic_keys(gnutls_session_t session) ret = _tls13_derive_secret(session, EXPORTER_MASTER_LABEL, sizeof(EXPORTER_MASTER_LABEL)-1, session->internals.handshake_hash_buffer.data, session->internals.handshake_hash_buffer_server_finished_len, - session->key.proto.kshare.temp_secret, - session->key.proto.kshare.ap_expkey); + session->key.proto.tls13.temp_secret, + session->key.proto.tls13.ap_expkey); if (ret < 0) return gnutls_assert_val(ret); _gnutls_nss_keylog_write(session, "EXPORTER_SECRET", - session->key.proto.kshare.ap_expkey, + session->key.proto.tls13.ap_expkey, session->security_parameters.prf->output_size); _gnutls_epoch_bump(session); @@ -195,7 +195,7 @@ static int generate_hs_traffic_keys(gnutls_session_t session) { int ret; - if (unlikely(session->key.key.size == 0 || session->key.proto.kshare.temp_secret_size == 0)) + if (unlikely(session->key.key.size == 0 || session->key.proto.tls13.temp_secret_size == 0)) return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR); ret = _tls13_update_secret(session, session->key.key.data, session->key.key.size); |