From: Andreas Schneider <asn@samba.org>
Date: Wed, 15 May 2019 06:09:35 +0000 (+0200)
Subject: libcli:smb: Use GnuTLS HMAC MD5 in smb_key_derivation()
X-Git-Tag: ldb-2.0.5~735
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=940e0c106c4b636db2910f9de6869763bb346ab1;p=thirdparty%2Fsamba.git

libcli:smb: Use GnuTLS HMAC MD5 in smb_key_derivation()

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/libcli/smb/smb_signing.c b/libcli/smb/smb_signing.c
index 0ffd1095b6b..ad89a78e714 100644
--- a/libcli/smb/smb_signing.c
+++ b/libcli/smb/smb_signing.c
@@ -20,7 +20,6 @@
 */
 
 #include "includes.h"
-#include "../lib/crypto/crypto.h"
 #include "smb_common.h"
 #include "smb_signing.h"
 
@@ -520,11 +519,12 @@ void smb_key_derivation(const uint8_t *KI, size_t KI_len,
 		0x31, 0x66, 0x09, 0x48, 0x88, 0xcc, 0x18, 0xa3,
 		0xb2, 0x1f, 0x1f, 0x1b, 0x90, 0x4e, 0xd7, 0xe1
 	};
-	HMACMD5Context ctx;
 
-	hmac_md5_init_limK_to_64(KI, KI_len, &ctx);
-	hmac_md5_update(SSKeyHash, sizeof(SSKeyHash), &ctx);
-	hmac_md5_final(KO, &ctx);
-
-	ZERO_STRUCT(ctx);
+	/* The callers passing down KI_len of 16 so no need to limit to 64 */
+	gnutls_hmac_fast(GNUTLS_MAC_MD5,
+			 KI,
+			 KI_len,
+			 SSKeyHash,
+			 sizeof(SSKeyHash),
+			 KO);
 }