From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Tue, 9 Jul 2013 07:31:21 +0000 (+0200)
Subject: When resuming a session send only the mandatory extensions.
X-Git-Tag: gnutls_3_2_2~19
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=355dfc01c7ff27b83e581bfd0eff793629a38ef7;p=thirdparty%2Fgnutls.git

When resuming a session send only the mandatory extensions.

That will make server behavior to conform to TLS RFC. Reported by Peter Dettman.
---

diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c
index 2a87e45326..78a2e5c14d 100644
--- a/lib/gnutls_handshake.c
+++ b/lib/gnutls_handshake.c
@@ -2098,7 +2098,9 @@ _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, GNUTLS_EXT_ANY);
+        _gnutls_gen_extensions (session, &extdata, 
+                                (session->internals.resumed==RESUME_TRUE)?
+                                GNUTLS_EXT_MANDATORY:GNUTLS_EXT_ANY);
       if (ret < 0)
         {
           gnutls_assert ();