corrected resumption check

diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c
index f24abfaa5d66ba351362403d014f9873cabed0aa..94069d4103887e3959a4ff4184364d77300195f1 100644 (file)
--- 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,