summaryrefslogtreecommitdiff
path: root/lib/handshake.c
diff options
context:
space:
mode:
authorDaiki Ueno <dueno@redhat.com>2018-04-16 17:22:19 +0200
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2018-05-26 04:12:03 +0000
commit300791196b170b51037f22ba9915b4587fb89bd7 (patch)
tree7af94d89c24393495606875e32985f2035847a0e /lib/handshake.c
parent9fe41ad5c2a34ecbbe3697f320fbb10168f8abd9 (diff)
downloadgnutls-300791196b170b51037f22ba9915b4587fb89bd7.tar.gz
handshake: record transcript offset of client Finished
This is for deriving resumption_master_secret, whose value is calculated over ClientHello...client Finished. Signed-off-by: Daiki Ueno <dueno@redhat.com>
Diffstat (limited to 'lib/handshake.c')
-rw-r--r--lib/handshake.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/handshake.c b/lib/handshake.c
index e756574277..1c0d25fb93 100644
--- a/lib/handshake.c
+++ b/lib/handshake.c
@@ -81,6 +81,7 @@ handshake_hash_buffer_reset(gnutls_session_t session)
session->internals.handshake_hash_buffer_client_kx_len = 0;
session->internals.handshake_hash_buffer_server_finished_len = 0;
+ session->internals.handshake_hash_buffer_client_finished_len = 0;
session->internals.handshake_hash_buffer_prev_len = 0;
session->internals.handshake_hash_buffer.length = 0;
session->internals.full_client_hello.length = 0;
@@ -1303,6 +1304,9 @@ handshake_hash_add_recvd(gnutls_session_t session,
if (recv_type == GNUTLS_HANDSHAKE_FINISHED && session->security_parameters.entity == GNUTLS_CLIENT)
session->internals.handshake_hash_buffer_server_finished_len =
session->internals.handshake_hash_buffer.length;
+ if (recv_type == GNUTLS_HANDSHAKE_FINISHED && session->security_parameters.entity == GNUTLS_SERVER)
+ session->internals.handshake_hash_buffer_client_finished_len =
+ session->internals.handshake_hash_buffer.length;
return 0;
}
@@ -1352,6 +1356,9 @@ handshake_hash_add_sent(gnutls_session_t session,
if (type == GNUTLS_HANDSHAKE_FINISHED && session->security_parameters.entity == GNUTLS_SERVER)
session->internals.handshake_hash_buffer_server_finished_len =
session->internals.handshake_hash_buffer.length;
+ if (type == GNUTLS_HANDSHAKE_FINISHED && session->security_parameters.entity == GNUTLS_CLIENT)
+ session->internals.handshake_hash_buffer_client_finished_len =
+ session->internals.handshake_hash_buffer.length;
return 0;
}