From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sat, 25 Sep 2010 06:56:45 +0000 (+0200)
Subject: Corrected advertizing issue for session tickets.
X-Git-Tag: gnutls_2_11_3~27
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=91db5c13d14b0d3a6f708df4aa4cf7e67d837888;p=thirdparty%2Fgnutls.git

Corrected advertizing issue for session tickets.
---

diff --git a/NEWS b/NEWS
index 2618d86e02..e6fa574a12 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,8 @@ See the end for copying conditions.
 ** libgnutls: Corrected bug that caused importing DSA keys as RSA,
 introduced with the new nettle code.
 
+** libgnutls: Corrected advertizing issue for session tickets.
+
 ** API and ABI modifications:
 No changes since last version.
 
diff --git a/lib/ext_session_ticket.c b/lib/ext_session_ticket.c
index 4c025184f1..c244d21787 100644
--- a/lib/ext_session_ticket.c
+++ b/lib/ext_session_ticket.c
@@ -382,8 +382,11 @@ session_ticket_send_params (gnutls_session_t session,
       ret = _gnutls_ext_get_resumed_session_data( session, GNUTLS_EXTENSION_SESSION_TICKET, &epriv);
       if (ret >= 0)
 	priv = epriv.ptr;
+	
+      if (ret < 0)
+        return GNUTLS_E_INT_RET_0;
 
-      if (ret < 0 || !priv->session_ticket_enable)
+      if (!priv->session_ticket_enable)
 	return 0;
 
       if (priv->session_ticket_len > 0)