From e3882ffc62951ded3d1739171992c9e715e822bf Mon Sep 17 00:00:00 2001
From: Asanka Herath <asanka@secure-endpoints.com>
Date: Thu, 26 Nov 2009 01:38:43 -0500
Subject: [PATCH] (lib/hcrypto) Make w32crypto the default and only RAND method
 on Windows

---
 lib/hcrypto/NTMakefile             | 6 +++---
 lib/hcrypto/libhcrypto-exports.def | 3 ++-
 lib/hcrypto/rand.h                 | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/hcrypto/NTMakefile b/lib/hcrypto/NTMakefile
index 887026f47..7f1a6fc72 100644
--- a/lib/hcrypto/NTMakefile
+++ b/lib/hcrypto/NTMakefile
@@ -31,7 +31,7 @@
 
 RELDIR=lib\hcrypto
 
-AUXCFLAGS=$(AUXCFLAGS) -DKRB5 -I$(INCDIR)\hcrypto
+AUXCFLAGS=$(AUXCFLAGS) -DKRB5 -I$(HCRYPTOINCLUDEDIR)
 
 !include ../../windows/NTMakefile.w32
 
@@ -58,6 +58,7 @@ INCFILES=	\
 	$(HCRYPTOINCLUDEDIR)\md5.h	\
 	$(HCRYPTOINCLUDEDIR)\pkcs12.h	\
 	$(HCRYPTOINCLUDEDIR)\rand.h	\
+	$(HCRYPTOINCLUDEDIR)\randi.h	\
 	$(HCRYPTOINCLUDEDIR)\rc2.h	\
 	$(HCRYPTOINCLUDEDIR)\rc4.h	\
 	$(HCRYPTOINCLUDEDIR)\rsa.h	\
@@ -98,8 +99,7 @@ libhcrypto_OBJs = \
 	$(OBJ)\md5.obj		\
 	$(OBJ)\pkcs5.obj	\
 	$(OBJ)\pkcs12.obj	\
-	$(OBJ)\rand-fortuna.obj	\
-	$(OBJ)\rand-timer.obj	\
+	$(OBJ)\rand-w32.obj	\
 	$(OBJ)\rand.obj		\
 	$(OBJ)\rc2.obj		\
 	$(OBJ)\rc4.obj		\
diff --git a/lib/hcrypto/libhcrypto-exports.def b/lib/hcrypto/libhcrypto-exports.def
index 057b22ded..18efbca30 100644
--- a/lib/hcrypto/libhcrypto-exports.def
+++ b/lib/hcrypto/libhcrypto-exports.def
@@ -212,7 +212,7 @@ EXPORTS
 ;	hc_RAND_egd_bytes
 ;	hc_RAND_egd_method
 	hc_RAND_file_name
-	hc_RAND_fortuna_method
+;	hc_RAND_fortuna_method
 	hc_RAND_get_rand_method
 	hc_RAND_load_file
 	hc_RAND_pseudo_bytes
@@ -222,6 +222,7 @@ EXPORTS
 	hc_RAND_status
 ;	hc_RAND_unix_method
 ;	hc_RAND_timer_method
+        hc_RAND_w32crypto_method
 	hc_RAND_write_file
 	hc_RC2_cbc_encrypt
 	hc_RC2_decryptc
diff --git a/lib/hcrypto/rand.h b/lib/hcrypto/rand.h
index 65800d6b9..f4e248516 100644
--- a/lib/hcrypto/rand.h
+++ b/lib/hcrypto/rand.h
@@ -62,6 +62,7 @@ typedef struct RAND_METHOD RAND_METHOD;
 #define RAND_fortuna_method hc_RAND_fortuna_method
 #define RAND_egd_method hc_RAND_egd_method
 #define RAND_unix_method hc_RAND_unix_method
+#define RAND_w32crypto_method hc_RAND_w32crypto_method
 
 /*
  *