From: Andreas Schneider <asn@samba.org>
Date: Wed, 15 May 2019 06:02:18 +0000 (+0200)
Subject: libcli:auth: Use GnuTLS MD5 for E_md5hash() in smbcrypt
X-Git-Tag: samba-4.11.0rc1~863
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=45a4a9078c3c8b967f3c39520cbbfce86ba3848d;p=vlendec%2Fsamba-autobuild%2F.git

libcli:auth: Use GnuTLS MD5 for E_md5hash() in smbcrypt

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

diff --git a/libcli/auth/smbencrypt.c b/libcli/auth/smbencrypt.c
index afd9286b701..6e2d617b26d 100644
--- a/libcli/auth/smbencrypt.c
+++ b/libcli/auth/smbencrypt.c
@@ -28,6 +28,9 @@
 #include "../libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/ndr_ntlmssp.h"
 
+#include <gnutls/gnutls.h>
+#include <gnutls/crypto.h>
+
 void SMBencrypt_hash(const uint8_t lm_hash[16], const uint8_t *c8, uint8_t p24[24])
 {
 	uint8_t p21[21];
@@ -99,11 +102,28 @@ bool E_md4hash(const char *passwd, uint8_t p16[16])
 
 void E_md5hash(const uint8_t salt[16], const uint8_t nthash[16], uint8_t hash_out[16])
 {
-	MD5_CTX tctx;
-	MD5Init(&tctx);
-	MD5Update(&tctx, salt, 16);
-	MD5Update(&tctx, nthash, 16);
-	MD5Final(hash_out, &tctx);
+	gnutls_hash_hd_t hash_hnd = NULL;
+	int rc;
+
+	rc = gnutls_hash_init(&hash_hnd, GNUTLS_DIG_MD5);
+	if (rc < 0) {
+		goto out;
+	}
+
+	rc = gnutls_hash(hash_hnd, salt, 16);
+	if (rc < 0) {
+		gnutls_hash_deinit(hash_hnd, NULL);
+		goto out;
+	}
+	rc = gnutls_hash(hash_hnd, nthash, 16);
+	if (rc < 0) {
+		gnutls_hash_deinit(hash_hnd, NULL);
+		goto out;
+	}
+	gnutls_hash_deinit(hash_hnd, hash_out);
+
+out:
+	return;
 }
 
 /**