From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sun, 19 May 2013 12:08:05 +0000 (+0200)
Subject: corrected resumption check
X-Git-Tag: gnutls_3_2_1~40
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=62e2a01ff0e6f81bc3944198d281b78c26496cfc;p=thirdparty%2Fgnutls.git

corrected resumption check
---

diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c
index f24abfaa5d..94069d4103 100644
--- a/lib/gnutls_handshake.c
+++ b/lib/gnutls_handshake.c
@@ -1580,7 +1580,9 @@ _gnutls_client_check_if_resuming (gnutls_session_t session,
                          _gnutls_bin2hex (session_id, session_id_len, buf,
                                           sizeof (buf), NULL));
 
-  if (session->internals.resumption_requested != 0 && session_id_len > 0 &&
+  if ((session->internals.resumption_requested != 0 ||
+      session->internals.premaster_set != 0) &&
+      session_id_len > 0 &&
       session->internals.resumed_security_parameters.session_id_size ==
       session_id_len
       && memcmp (session_id,