summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@redhat.com>2016-02-26 13:14:05 +0100
committerNikos Mavrogiannopoulos <nmav@redhat.com>2016-08-09 15:53:28 +0200
commit76a020c57c4e5a983e48946bf86949f0475fc024 (patch)
tree70cd476682c6a5d948b470ad1680de58e5f4a8a1
parent2f374c59993337c271dcb8bed1dad84216d2532f (diff)
downloadgnutls-76a020c57c4e5a983e48946bf86949f0475fc024.tar.gz
When resuming a session send only the mandatory extensions.
Backport of 355dfc01c7ff27b83e581bfd0eff793629a38ef7
-rw-r--r--lib/gnutls_handshake.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c
index 18dafb7721..489418d1c1 100644
--- a/lib/gnutls_handshake.c
+++ b/lib/gnutls_handshake.c
@@ -2246,7 +2246,8 @@ _gnutls_send_server_hello (gnutls_session_t session, int again)
datalen = 2 + session_id_len + 1 + GNUTLS_RANDOM_SIZE + 3;
ret =
_gnutls_gen_extensions (session, extdata, MAX_EXT_DATA_LENGTH,
- GNUTLS_EXT_ANY);
+ (session->internals.resumed==RESUME_TRUE)?
+ GNUTLS_EXT_MANDATORY:GNUTLS_EXT_ANY);
if (ret < 0)
{