[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gc-random fixes
From: |
Simon Josefsson |
Subject: |
gc-random fixes |
Date: |
Fri, 11 Apr 2008 09:17:42 +0200 |
User-agent: |
Gnus/5.110007 (No Gnus v0.7) Emacs/22.1 (gnu/linux) |
Applied.
/Simon
>From 2fd7e9189c239ef737105bc085ace4dc80435533 Mon Sep 17 00:00:00 2001
From: Simon Josefsson <address@hidden>
Date: Fri, 11 Apr 2008 09:16:11 +0200
Subject: [PATCH] Make gc_random work under Windows.
Based on patch from Adam Strzelecki <address@hidden> in
<http://lists.gnu.org/archive/html/help-gsasl/2008-02/msg00000.html>.
---
ChangeLog | 7 +++++++
lib/gc-gnulib.c | 33 ++++++++++++++++++++++++++++++++-
2 files changed, 39 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 26d4567..0775329 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-11 Simon Josefsson <address@hidden>
+
+ * lib/gc-gnulib.c: On Windows, use CryptGenRandom from CSP instead
+ of attempting to use non-existing /dev/*random. Based on patch
+ from Adam Strzelecki <address@hidden> in
+ <http://lists.gnu.org/archive/html/help-gsasl/2008-02/msg00000.html>.
+
2008-04-08 Bruno Haible <address@hidden>
Add tentative support for emx+gcc.
diff --git a/lib/gc-gnulib.c b/lib/gc-gnulib.c
index d535d03..eb6c403 100644
--- a/lib/gc-gnulib.c
+++ b/lib/gc-gnulib.c
@@ -1,5 +1,5 @@
/* gc-gnulib.c --- Common gnulib internal crypto interface functions
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Simon Josefsson
+ * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Simon Josefsson
*
* This file is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published
@@ -73,15 +73,40 @@
#undef open
#undef close
+#ifdef GNULIB_GC_RANDOM
+# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+# include <wincrypt.h>
+HCRYPTPROV g_hProv = 0;
+# endif
+#endif
+
Gc_rc
gc_init (void)
{
+#ifdef GNULIB_GC_RANDOM
+# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+ if(g_hProv)
+ CryptReleaseContext(g_hProv, 0);
+ CryptAcquireContext(&g_hProv, NULL, NULL, PROV_RSA_FULL, 0);
+# endif
+#endif
+
return GC_OK;
}
void
gc_done (void)
{
+#ifdef GNULIB_GC_RANDOM
+# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+ if(g_hProv)
+ {
+ CryptReleaseContext(g_hProv, 0);
+ g_hProv = 0;
+ }
+# endif
+#endif
+
return;
}
@@ -92,6 +117,11 @@ gc_done (void)
static Gc_rc
randomize (int level, char *data, size_t datalen)
{
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+ if(!g_hProv)
+ return GC_RANDOM_ERROR;
+ CryptGenRandom(g_hProv, (DWORD)datalen, data);
+#else
int fd;
const char *device;
size_t len = 0;
@@ -140,6 +170,7 @@ randomize (int level, char *data, size_t datalen)
rc = close (fd);
if (rc < 0)
return GC_RANDOM_ERROR;
+#endif
return GC_OK;
}
--
1.5.4.4
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- gc-random fixes,
Simon Josefsson <=