[SCM] GNU gnutls branch, master, updated. gnutls-3_0_12-166-g6a5cd65

[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=6a5cd65eb414de857af984ed8fb6ad6b17d02cc1

The branch, master has been updated
       via  6a5cd65eb414de857af984ed8fb6ad6b17d02cc1 (commit)
       via  566021d781810dcbf8aab0b2def7fb095c91c4a9 (commit)
       via  e31ef97cdd5e3524ef7d2b95eddc44cb402d2818 (commit)
      from  aed50df9cb6026864a0eabc36af9b3b9b22a0763 (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 6a5cd65eb414de857af984ed8fb6ad6b17d02cc1
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Feb 9 00:58:42 2012 +0100

    prevent sending EOF to caller.

commit 566021d781810dcbf8aab0b2def7fb095c91c4a9
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Feb 9 00:03:45 2012 +0100

    print client/server when in debugging

commit e31ef97cdd5e3524ef7d2b95eddc44cb402d2818
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Feb 8 23:57:15 2012 +0100

    Added Sean.

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

Summary of changes:
 NEWS                            |    3 +++
 THANKS                          |    1 +
 lib/gnutls_record.c             |    1 +
 tests/mini-loss.c               |    3 ++-
 tests/safe-renegotiation/srn0.c |    4 +++-
 tests/safe-renegotiation/srn1.c |    4 +++-
 tests/safe-renegotiation/srn2.c |    4 +++-
 tests/safe-renegotiation/srn3.c |    4 +++-
 tests/safe-renegotiation/srn4.c |    4 +++-
 tests/safe-renegotiation/srn5.c |    4 +++-
 10 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/NEWS b/NEWS
index e0a8a2d..7dd91df 100644
--- a/NEWS
+++ b/NEWS
@@ -19,6 +19,9 @@ status from an ocsp server.
 ** command line apps: Use gnu autogen (libopts) to parse command
 line arguments and template files.
 
+** libgnutls: Corrected DTLS lost packet handling in
+the last flight.
+
 ** libgnutls: Corrected DTLS retransmission timeouts. 
 Report and patch by Sean Buckheister.
 
diff --git a/THANKS b/THANKS
index cf36812..32d6bc4 100644
--- a/THANKS
+++ b/THANKS
@@ -126,6 +126,7 @@ David Hoyt                      *hoyt6 [at] llnl.gov*
 Joseph Graham                   *joe [at] t67.eu*
 Eli Zaretskii                   *eliz [at] gnu.org*
 Patrick Pelletier               *code [at] funwithsoftware.org*
+Sean Buckheister                *s_buckhe [at] cs.uni-kl.de*
 
 ----------------------------------------------------------------------
 Copying and distribution of this file, with or without modification,
diff --git a/lib/gnutls_record.c b/lib/gnutls_record.c
index 460db36..a7008c0 100644
--- a/lib/gnutls_record.c
+++ b/lib/gnutls_record.c
@@ -678,6 +678,7 @@ record_add_to_buffers (gnutls_session_t session,
               if (_dtls_is_async(session) && _dtls_async_timer_active(session))
                 {
                   ret = _dtls_retransmit(session);
+                  if (ret == 0) ret = GNUTLS_E_AGAIN;
                   goto cleanup;
                 }
             }
diff --git a/tests/mini-loss.c b/tests/mini-loss.c
index 78a91f5..be8b8fe 100644
--- a/tests/mini-loss.c
+++ b/tests/mini-loss.c
@@ -41,7 +41,8 @@
 #include "utils.h"
 
 /* This program simulates packet loss in DTLS datagrams using
- * the blocking functions
+ * the blocking functions. Idea taken from test app of
+ * Sean Buckheister.
  */
 
 static void print_type(const unsigned char* buf, int size)
diff --git a/tests/safe-renegotiation/srn0.c b/tests/safe-renegotiation/srn0.c
index 319181a..a944e38 100644
--- a/tests/safe-renegotiation/srn0.c
+++ b/tests/safe-renegotiation/srn0.c
@@ -40,10 +40,12 @@
 #include "../eagain-common.h"
 #include "../utils.h"
 
+const char* side = "";
+
 static void
 tls_log_func (int level, const char *str)
 {
-  fprintf (stderr, "|<%d>| %s", level, str);
+  fprintf (stderr, "%s|<%d>| %s", side, level, str);
 }
 
 static unsigned char server_cert_pem[] =
diff --git a/tests/safe-renegotiation/srn1.c b/tests/safe-renegotiation/srn1.c
index 7b11fe4..801319a 100644
--- a/tests/safe-renegotiation/srn1.c
+++ b/tests/safe-renegotiation/srn1.c
@@ -39,10 +39,12 @@
 #include "../eagain-common.h"
 #include "../utils.h"
 
+const char* side = "";
+
 static void
 tls_log_func (int level, const char *str)
 {
-  fprintf (stderr, "|<%d>| %s", level, str);
+  fprintf (stderr, "%s|<%d>| %s", side, level, str);
 }
 
 static unsigned char server_cert_pem[] =
diff --git a/tests/safe-renegotiation/srn2.c b/tests/safe-renegotiation/srn2.c
index 4311fda..ca80753 100644
--- a/tests/safe-renegotiation/srn2.c
+++ b/tests/safe-renegotiation/srn2.c
@@ -37,10 +37,12 @@
 #include "../eagain-common.h"
 #include "../utils.h"
 
+const char* side = "";
+
 static void
 tls_log_func (int level, const char *str)
 {
-  fprintf (stderr, "|<%d>| %s", level, str);
+  fprintf (stderr, "%s|<%d>| %s", side, level, str);
 }
 
 static unsigned char server_cert_pem[] =
diff --git a/tests/safe-renegotiation/srn3.c b/tests/safe-renegotiation/srn3.c
index 00fe9a7..a8d9304 100644
--- a/tests/safe-renegotiation/srn3.c
+++ b/tests/safe-renegotiation/srn3.c
@@ -39,10 +39,12 @@
 #include "../eagain-common.h"
 #include "../utils.h"
 
+const char* side = "";
+
 static void
 tls_log_func (int level, const char *str)
 {
-  fprintf (stderr, "|<%d>| %s", level, str);
+  fprintf (stderr, "%s|<%d>| %s", side, level, str);
 }
 
 static unsigned char server_cert_pem[] =
diff --git a/tests/safe-renegotiation/srn4.c b/tests/safe-renegotiation/srn4.c
index 4dccfa5..b48cf21 100644
--- a/tests/safe-renegotiation/srn4.c
+++ b/tests/safe-renegotiation/srn4.c
@@ -39,10 +39,12 @@
 #include "../eagain-common.h"
 #include "../utils.h"
 
+const char* side = "";
+
 static void
 tls_log_func (int level, const char *str)
 {
-  fprintf (stderr, "|<%d>| %s", level, str);
+  fprintf (stderr, "%s|<%d>| %s", side, level, str);
 }
 
 static unsigned char server_cert_pem[] =
diff --git a/tests/safe-renegotiation/srn5.c b/tests/safe-renegotiation/srn5.c
index a8920ea..4cf09bb 100644
--- a/tests/safe-renegotiation/srn5.c
+++ b/tests/safe-renegotiation/srn5.c
@@ -40,10 +40,12 @@
 #include "../eagain-common.h"
 #include "../utils.h"
 
+const char* side = "";
+
 static void
 tls_log_func (int level, const char *str)
 {
-  fprintf (stderr, "|<%d>| %s", level, str);
+  fprintf (stderr, "%s|<%d>| %s", side, level, str);
 }
 
 static unsigned char server_cert_pem[] =


hooks/post-receive
-- 
GNU gnutls