[SCM] GNU gnutls branch, master, updated. gnutls_2_11_6-99-g0567caa

[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=0567caaa942f2e0ecf6158a5821dc1ef415f9159

The branch, master has been updated
       via  0567caaa942f2e0ecf6158a5821dc1ef415f9159 (commit)
       via  57d48627c00dc543edef8d36d7887f61d9d74ba6 (commit)
       via  1316f5b8b534b27e84e61170234a69e92af691e7 (commit)
       via  cd3ccd8c971ac619414452073e77aa02d8e562fa (commit)
      from  2e95b2fcdb67b8dcb81919fe2946e311ddb6a6d6 (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 0567caaa942f2e0ecf6158a5821dc1ef415f9159
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Feb 6 23:40:56 2011 +0100

    unstable -> untested.

commit 57d48627c00dc543edef8d36d7887f61d9d74ba6
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Feb 6 23:38:56 2011 +0100

    Increase the maximum HMAC key to account for anonymous ciphersuites.

commit 1316f5b8b534b27e84e61170234a69e92af691e7
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Feb 6 23:35:31 2011 +0100

    check the error of hash set_key.

commit cd3ccd8c971ac619414452073e77aa02d8e562fa
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Feb 6 23:35:02 2011 +0100

    do not use strlen for fixed string.

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

Summary of changes:
 NEWS                  |    2 +-
 lib/gnutls_hash_int.c |    9 +++++++--
 lib/gnutls_kx.c       |    3 ++-
 lib/nettle/mac.c      |    7 ++++++-
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index bbcc04f..f91641a 100644
--- a/NEWS
+++ b/NEWS
@@ -5,7 +5,7 @@ See the end for copying conditions.
 
 * Version 2.99.0 (unreleased)
 
-** libgnutls: Added GCM mode (still unstable)
+** libgnutls: Added GCM mode (still untested)
 
 ** libgnutls-extra: Inner application extension was removed.
 It was never standardized nor published as an RFC.
diff --git a/lib/gnutls_hash_int.c b/lib/gnutls_hash_int.c
index 1bf31fa..928c656 100644
--- a/lib/gnutls_hash_int.c
+++ b/lib/gnutls_hash_int.c
@@ -282,13 +282,18 @@ _gnutls_hmac_init (digest_hd_st * dig, 
gnutls_mac_algorithm_t algorithm,
       return result;
     }
 
-  _gnutls_mac_ops.setkey (dig->handle, key, keylen);
-
   dig->hash = _gnutls_mac_ops.hash;
   dig->output = _gnutls_mac_ops.output;
   dig->deinit = _gnutls_mac_ops.deinit;
   dig->reset = _gnutls_mac_ops.reset;
 
+  if (_gnutls_mac_ops.setkey (dig->handle, key, keylen) < 0)
+    {
+      gnutls_assert();
+      dig->deinit(dig->handle);
+      return GNUTLS_E_HASH_FAILED;
+    }
+
   return 0;
 }
 
diff --git a/lib/gnutls_kx.c b/lib/gnutls_kx.c
index 99be1f4..9111aa4 100644
--- a/lib/gnutls_kx.c
+++ b/lib/gnutls_kx.c
@@ -75,6 +75,7 @@ send_handshake (gnutls_session_t session, opaque * data, 
size_t size,
  */
 
 #define MASTER_SECRET "master secret"
+#define MASTER_SECRET_SIZE (sizeof(MASTER_SECRET)-1)
 static int generate_normal_master (gnutls_session_t session, int);
 
 int
@@ -134,7 +135,7 @@ generate_normal_master (gnutls_session_t session, int 
keep_premaster)
 
       ret =
         _gnutls_PRF (session, PREMASTER.data, PREMASTER.size,
-                     MASTER_SECRET, strlen (MASTER_SECRET),
+                     MASTER_SECRET, MASTER_SECRET_SIZE,
                      rnd, 2 * GNUTLS_RANDOM_SIZE, GNUTLS_MASTER_SIZE,
                      session->security_parameters.master_secret);
     }
diff --git a/lib/nettle/mac.c b/lib/nettle/mac.c
index cec1d03..b3f09b7 100644
--- a/lib/nettle/mac.c
+++ b/lib/nettle/mac.c
@@ -58,7 +58,12 @@ struct nettle_hash_ctx
   digest_func digest;
 };
 
-#define MAX_HMAC_KEY 128
+/* FIXME: Nettle doesn't have a reset function for
+ * hmac so we need to manually reset a context, by
+ * calling set_key(). For that reason we need to
+ * store the hmac key here.
+ */
+#define MAX_HMAC_KEY 1024
 
 struct nettle_hmac_ctx
 {


hooks/post-receive
-- 
GNU gnutls