Make getRandomBytes work on Windows

bos · Oct 2, 2012 · 076031a · 076031a
1 parent f7d6643
commit 076031a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/cbits/getRandomBytes.c b/cbits/getRandomBytes.c
@@ -4,19 +4,19 @@ int hashable_getRandomBytes(int nbytes, unsigned char *dest);
 
 #if defined(mingw32_HOST_OS) || defined(__MINGW32__) 
 
-#include "wincrypt.h"
+#include <windows.h>
+#include <wincrypt.h>
 
 int hashable_getRandomBytes(int nbytes, unsigned char *dest)
 {
   HCRYPTPROV hCryptProv;
   int ret;
 
-  if (CryptAcquireContext(&hCryptProv, NULL, NULL, PROV_RSA_FULL,
+  if (!CryptAcquireContextA(&hCryptProv, NULL, NULL, PROV_RSA_FULL,
-			  CRYPT_VERIFYCONTEXT))
+			    CRYPT_VERIFYCONTEXT)) 
     return -1;
 
-  if (!CryptGenRandom(hCryptProv, (DWOORD) nbytes, (BYTE *) dest))
+  ret = CryptGenRandom(hCryptProv, (DWORD) nbytes, (BYTE *) dest) ? nbytes : -1;
-    ret = -1;
 
   CryptReleaseContext(hCryptProv, 0);
 

diff --git a/hashable.cabal b/hashable.cabal
@@ -44,6 +44,8 @@ Library
   Ghc-options:       -Wall
   if impl(ghc >= 6.8)
     Ghc-options: -fwarn-tabs
+  if os(windows)
+    extra-libraries: advapi32
 
 Test-suite tests
   Type:              exitcode-stdio-1.0