Merge branch 'feat_misc' into beta2.2

Conflicts:
	acinclude.m4
	config-win32.h
	configure.ac
	misc.c
	thread.c
	thread.h
        - These conflicts was mainly due to feat_misc getting old
          and mostly caused by the pthread clean-up patches in
          feat_misc

Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>

1 files changed, 0 insertions, 3 deletions

diff --git a/crypto.c b/crypto.c
index d5c8c13..5cfc34a 100644
--- a/crypto.c
+++ b/crypto.c
@@ -29,7 +29,6 @@
 #include "crypto.h"
 #include "error.h"
 #include "misc.h"
-#include "thread.h"
 
 #include "memdbg.h"
 
@@ -1702,7 +1701,6 @@ prng_bytes (uint8_t *output, int len)
     {
       EVP_MD_CTX ctx;
       const int md_size = EVP_MD_size (nonce_md);
-      mutex_lock_static (L_PRNG);
       while (len > 0)
 	{
 	  unsigned int outlen = 0;
@@ -1716,7 +1714,6 @@ prng_bytes (uint8_t *output, int len)
 	  output += blen;
 	  len -= blen;
 	}
-      mutex_unlock_static (L_PRNG);
     }
   else
     RAND_bytes (output, len);