From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Thu, 10 Apr 2014 18:30:11 +0000 (+0200)
Subject: unconditionally zeroize temporal keys.
X-Git-Tag: gnutls_3_3_1~58
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=39aaa63a1a4cb8432e090887f38241afb2b264a6;p=thirdparty%2Fgnutls.git

unconditionally zeroize temporal keys.
---

diff --git a/lib/gnutls_mem.h b/lib/gnutls_mem.h
index edf78b9c28..2dc4200a35 100644
--- a/lib/gnutls_mem.h
+++ b/lib/gnutls_mem.h
@@ -46,12 +46,7 @@ void _gnutls_bzero(void *v, size_t n);
 
 #define zeroize_key(x, size) _gnutls_bzero(x, size)
 
-#ifdef ENABLE_FIPS140
-# define zeroize_temp_key zeroize_key
-# define zrelease_temp_mpi_key zrelease_mpi_key
-#else
-# define zeroize_temp_key(x, size)
-# define zrelease_temp_mpi_key(mpi) _gnutls_mpi_release(mpi)
-#endif
+#define zeroize_temp_key zeroize_key
+#define zrelease_temp_mpi_key zrelease_mpi_key
 
 #endif				/* GNUTLS_MEM_H */