[SCM] GNU gnutls branch, master, updated. gnutls_2_9_10-377-g91db5c1

[Nikos Mavrogiannopoulos]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=91db5c13d14b0d3a6f708df4aa4cf7e67d837888

The branch, master has been updated
       via  91db5c13d14b0d3a6f708df4aa4cf7e67d837888 (commit)
      from  c80a38df0a7ee1a27c7ae0488c3361183e4ae41e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 91db5c13d14b0d3a6f708df4aa4cf7e67d837888
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Sep 25 08:56:45 2010 +0200

    Corrected advertizing issue for session tickets.

-----------------------------------------------------------------------

Summary of changes:
 NEWS                     |    2 ++
 lib/ext_session_ticket.c |    5 ++++-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/NEWS b/NEWS
index 2618d86..e6fa574 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 4c02518..c244d21 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)


hooks/post-receive
-- 
GNU gnutls