[SCM] GNU gnutls branch, master, updated. gnutls_3_0_5-40-g8fe80d6

[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=8fe80d662c3320156f5731a672016d7a1b9dba1b

The branch, master has been updated
       via  8fe80d662c3320156f5731a672016d7a1b9dba1b (commit)
       via  190cef6eed37d0e73a73c1e205eb31d45ab60a3c (commit)
       via  c6b1847aff211db23cb1f12e8c55ce6055943750 (commit)
      from  124dfe0de2321a4c4a3383c8866f6a1dbd45d635 (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 8fe80d662c3320156f5731a672016d7a1b9dba1b
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Mon Nov 7 22:01:43 2011 +0100

    bumped version

commit 190cef6eed37d0e73a73c1e205eb31d45ab60a3c
Author: Alban Crequy <address@hidden>
Date:   Mon Nov 7 18:51:27 2011 +0000

    gnutls_session_get_data: fix possible buffer overflow
    
    The test to avoid the buffer overflow was always false because
    session_data_size was set at the wrong place. This problem has been 
introduced
    by this commit:
    
    |commit ad4ed44c65e753e6d3a00104c049dd81826ccbf3
    |Author: Nikos Mavrogiannopoulos <address@hidden>
    |Date:   Mon Nov 7 22:24:48 2005 +0000
    |
    |    This is the initial commit in the 1.3 branch. Ported from the PSK 
branch:
    |    * PSK ciphersuites have been added.
    |    * The session resumption data are now system independent.
    
    Signed-off-by: Nikos Mavrogiannopoulos <address@hidden>

commit c6b1847aff211db23cb1f12e8c55ce6055943750
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Nov 5 21:35:49 2011 +0100

    documented changes.

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

Summary of changes:
 NEWS                 |    9 ++++++++-
 configure.ac         |    2 +-
 lib/gnutls_session.c |    2 +-
 m4/hooks.m4          |    2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 2ff0d30..8f7472e 100644
--- a/NEWS
+++ b/NEWS
@@ -2,10 +2,13 @@ GnuTLS NEWS -- History of user-visible changes.               
 -*- outline -*-
 Copyright (C) 2000-2011 Free Software Foundation, Inc.
 See the end for copying conditions.
 
-* Version 3.0.6 (unreleased)
+* Version 3.0.6 (released 2011-11-07)
 
 ** gnutls-guile: Compilation fixes.
 
+** libgnutls: Fixed possible buffer overflow in 
+gnutls_session_get_data(). Reported and fix by Alban Crequy.
+
 ** libgnutls: Bug fixes in the ciphersuites with NULL cipher.
 Reported by Fabrice Gautier.
 
@@ -15,6 +18,10 @@ Thanks to Joseph Graham for providing access to such a 
system.
 ** libgnutls: Correctly report ECC private key parsing errors.
 Reported by Fabrice Gautier.
 
+** libgnutls: In ECDHE verify that the received point lies on
+the selected curve. The ECDHE ciphersuites now take precendence
+to plain DHE.
+
 ** API and ABI modifications:
 No changes since last version.
 
diff --git a/configure.ac b/configure.ac
index 2a55de5..2012fc9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ dnl Process this file with autoconf to produce a configure 
script.
 # USA
 
 AC_PREREQ(2.61)
-AC_INIT([GnuTLS], [3.0.5], address@hidden)
+AC_INIT([GnuTLS], [3.0.6], address@hidden)
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/lib/gnutls_session.c b/lib/gnutls_session.c
index 8028d5a..418a2ba 100644
--- a/lib/gnutls_session.c
+++ b/lib/gnutls_session.c
@@ -63,13 +63,13 @@ gnutls_session_get_data (gnutls_session_t session,
       gnutls_assert ();
       return ret;
     }
-  *session_data_size = psession.size;
 
   if (psession.size > *session_data_size)
     {
       ret = GNUTLS_E_SHORT_MEMORY_BUFFER;
       goto error;
     }
+  *session_data_size = psession.size;
 
   if (session_data != NULL)
     memcpy (session_data, psession.data, psession.size);
diff --git a/m4/hooks.m4 b/m4/hooks.m4
index ae63706..3b636e1 100644
--- a/m4/hooks.m4
+++ b/m4/hooks.m4
@@ -41,7 +41,7 @@ AC_DEFUN([LIBGNUTLS_HOOKS],
   # Interfaces added:                             AGE++
   # Interfaces removed:                           AGE=0
   AC_SUBST(LT_CURRENT, 30)
-  AC_SUBST(LT_REVISION, 1)
+  AC_SUBST(LT_REVISION, 2)
   AC_SUBST(LT_AGE, 2)
 
   AC_SUBST(LT_SSL_CURRENT, 27)


hooks/post-receive
-- 
GNU gnutls