From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sun, 19 May 2013 17:02:54 +0000 (+0200)
Subject: fail on wrong key sizes
X-Git-Tag: gnutls_3_2_1~37
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=39e6de6aa13428afff1dc8309af46d9a93591aaa;p=thirdparty%2Fgnutls.git

fail on wrong key sizes
---

diff --git a/lib/nettle/mac.c b/lib/nettle/mac.c
index c394e60d2f..ae73256b1b 100644
--- a/lib/nettle/mac.c
+++ b/lib/nettle/mac.c
@@ -84,13 +84,17 @@ struct nettle_mac_ctx
 static void
 _wrap_umac96_set_key(void* ctx, unsigned len, const uint8_t* key)
 {
-	return umac96_set_key(ctx, key);
+	if (unlikely(len != 16))
+	  abort();
+	umac96_set_key(ctx, key);
 }
 
 static void
 _wrap_umac128_set_key(void* ctx, unsigned len, const uint8_t* key)
 {
-	return umac128_set_key(ctx, key);
+	if (unlikely(len != 16))
+	  abort();
+	umac128_set_key(ctx, key);
 }
 
 static int _mac_ctx_init(gnutls_mac_algorithm_t algo, struct nettle_mac_ctx *ctx)
@@ -237,8 +241,7 @@ wrap_nettle_mac_set_key (void *_ctx, const void *key, size_t keylen)
   struct nettle_mac_ctx *ctx = _ctx;
 
   ctx->set_key (ctx->ctx_ptr, keylen, key);
-  
-  return GNUTLS_E_SUCCESS;
+  return 0;
 }
 
 static int