From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Tue, 21 Jul 2015 06:37:34 +0000 (+0200)
Subject: fips: use gnutls_hex_decode for MAC decoding
X-Git-Tag: gnutls_3_5_0~788
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=042c41433f2fb2429685ee82cd88404c555de31b;p=thirdparty%2Fgnutls.git

fips: use gnutls_hex_decode for MAC decoding
---

diff --git a/lib/fips.c b/lib/fips.c
index 565976e4af..e5028d958f 100644
--- a/lib/fips.c
+++ b/lib/fips.c
@@ -27,6 +27,7 @@
 #include <fips.h>
 #include <gnutls/self-test.h>
 #include <stdio.h>
+#include <extras/hex.h>
 #include <random.h>
 
 unsigned int _gnutls_lib_mode = LIB_STATE_POWERON;
@@ -224,8 +225,8 @@ static unsigned check_binary_integrity(const char* libname, const char* symbol)
 		}
 	}
 
-	hmac_size = sizeof(hmac);
-	ret = _gnutls_hex2bin((void*)data.data, data.size, hmac, &hmac_size);
+	hmac_size = hex_data_size(data->size);
+	ret = gnutls_hex_decode(&data, hmac, hmac_size);
 	gnutls_free(data.data);
 
 	if (ret < 0) {