[SCM] GNU gnutls branch, gnutls_2_10_x, updated. gnutls_2_10_1-8-g0d07d84

[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=0d07d8432d57805a8354ebd6c1e7829f3ab159cb

The branch, gnutls_2_10_x has been updated
       via  0d07d8432d57805a8354ebd6c1e7829f3ab159cb (commit)
      from  44e31d86e840c3fd70544230ce39bb263d5824e1 (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 0d07d8432d57805a8354ebd6c1e7829f3ab159cb
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Sep 23 22:59:09 2010 +0200

    No longer use is_fatal() during handshake. Explicitely treat
    EAGAIN and INTERRUPTED as non-fatal during handshake. If the check_fatal
    flag is set then GNUTLS_E_WARNING_ALERT_RECEIVED could interrupt
    a handshake as well.

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

Summary of changes:
 lib/gnutls_handshake.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c
index 84e6773..2bf2e1b 100644
--- a/lib/gnutls_handshake.c
+++ b/lib/gnutls_handshake.c
@@ -2731,9 +2731,14 @@ gnutls_handshake (gnutls_session_t session)
   return 0;
 }
 
+
 #define IMED_RET( str, ret, check_fatal) do { \
        if (ret < 0) { \
-               if (check_fatal != 0 && gnutls_error_is_fatal(ret)==0) return 
ret; \
+               /* EAGAIN and INTERRUPTED are always non-fatal */ \
+               if (ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED) \
+                       return ret; \
+                /* a warning alert might interrupt handshake */ \
+               if (check_fatal != 0 && ret==GNUTLS_E_WARNING_ALERT_RECEIVED) 
return ret; \
                gnutls_assert(); \
                ERR( str, ret); \
                _gnutls_handshake_hash_buffers_clear(session); \


hooks/post-receive
-- 
GNU gnutls