[SCM] GNU gnutls branch, master, updated. gnutls_3_0_6-2-gc8ce1c3

[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=c8ce1c33468de5becb1cd269b2f51608adc58aea

The branch, master has been updated
       via  c8ce1c33468de5becb1cd269b2f51608adc58aea (commit)
       via  e82ef4545e9e98cbcb032f55d7c750b81e3a0450 (commit)
      from  8fe80d662c3320156f5731a672016d7a1b9dba1b (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 c8ce1c33468de5becb1cd269b2f51608adc58aea
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Tue Nov 8 07:55:36 2011 +0100

    Corrected ciphersuite GNUTLS_ECDHE_RSA_AES_128_CBC_SHA256. Reported by 
Fabrice Gautier.

commit e82ef4545e9e98cbcb032f55d7c750b81e3a0450
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Tue Nov 8 07:52:56 2011 +0100

    bug fix in gnutls_session_get_data().

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

Summary of changes:
 lib/algorithms/ciphersuites.c |    2 +-
 lib/gnutls_session.c          |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/lib/algorithms/ciphersuites.c b/lib/algorithms/ciphersuites.c
index 94ceb70..7b59037 100644
--- a/lib/algorithms/ciphersuites.c
+++ b/lib/algorithms/ciphersuites.c
@@ -566,7 +566,7 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
                              GNUTLS_VERSION_MAX, 1),
   GNUTLS_CIPHER_SUITE_ENTRY (GNUTLS_ECDHE_RSA_AES_128_CBC_SHA256,
                              GNUTLS_CIPHER_AES_128_CBC, GNUTLS_KX_ECDHE_RSA,
-                             GNUTLS_MAC_SHA1, GNUTLS_TLS1_2,
+                             GNUTLS_MAC_SHA256, GNUTLS_TLS1_2,
                              GNUTLS_VERSION_MAX, 1),
   GNUTLS_CIPHER_SUITE_ENTRY (GNUTLS_ECDHE_ECDSA_AES_128_GCM_SHA256,
                              GNUTLS_CIPHER_AES_128_GCM, GNUTLS_KX_ECDHE_ECDSA,
diff --git a/lib/gnutls_session.c b/lib/gnutls_session.c
index 418a2ba..fd012fe 100644
--- a/lib/gnutls_session.c
+++ b/lib/gnutls_session.c
@@ -66,6 +66,7 @@ gnutls_session_get_data (gnutls_session_t session,
 
   if (psession.size > *session_data_size)
     {
+      *session_data_size = psession.size;
       ret = GNUTLS_E_SHORT_MEMORY_BUFFER;
       goto error;
     }


hooks/post-receive
-- 
GNU gnutls