From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sat, 3 Jul 2010 23:03:47 +0000 (+0200)
Subject: Corrected locking usage in nettle's random subsystem.
X-Git-Tag: gnutls_2_11_3~113
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=89c342d9bb577ff901b658322cc177ff1dd4d11c;p=thirdparty%2Fgnutls.git

Corrected locking usage in nettle's random subsystem.
---

diff --git a/lib/nettle/rnd.c b/lib/nettle/rnd.c
index fe0696dda9..84ef1a8c7d 100644
--- a/lib/nettle/rnd.c
+++ b/lib/nettle/rnd.c
@@ -41,8 +41,8 @@
 
 static void* rnd_mutex;
 
-#define RND_LOCK if (gnutls_mutex_lock(rnd_mutex)!=0) abort()
-#define RND_UNLOCK if (gnutls_mutex_unlock(rnd_mutex)!=0) abort()
+#define RND_LOCK if (gnutls_mutex_lock(&rnd_mutex)!=0) abort()
+#define RND_UNLOCK if (gnutls_mutex_unlock(&rnd_mutex)!=0) abort()
 
 enum {
 	RANDOM_SOURCE_TRIVIA=0,
@@ -170,20 +170,20 @@ static void wrap_nettle_rnd_deinit(void* ctx)
 	RND_LOCK;
 	close(device_fd);
 	RND_UNLOCK;
+
+	gnutls_mutex_deinit(&rnd_mutex);
+	rnd_mutex = NULL;
 }
 
 static int wrap_nettle_rnd_init(void **ctx)
 {
 int ret;
 
-	if (gnutls_mutex_init)
+	ret = gnutls_mutex_init(&rnd_mutex);
+	if (ret < 0)
 	  {
-	    ret = gnutls_mutex_init(&rnd_mutex);
-	    if (ret < 0)
-	      {
-	        gnutls_assert();
-	        return ret;
-	      }
+	    gnutls_assert();
+	    return ret;
 	  }
 
 	yarrow256_init(&yctx, SOURCES, ysources);