[svn] gcry - r1413 - in branches/LIBGCRYPT-1-4-BRANCH: . random

[svn author wk]

Author: wk
Date: 2009-12-10 12:43:47 +0100 (Thu, 10 Dec 2009)
New Revision: 1413

Modified:
   branches/LIBGCRYPT-1-4-BRANCH/ChangeLog
   branches/LIBGCRYPT-1-4-BRANCH/NEWS
   branches/LIBGCRYPT-1-4-BRANCH/configure.ac
   branches/LIBGCRYPT-1-4-BRANCH/random/ChangeLog
   branches/LIBGCRYPT-1-4-BRANCH/random/rndw32.c
Log:
Try a fix for bug#1167


Modified: branches/LIBGCRYPT-1-4-BRANCH/ChangeLog
===================================================================
--- branches/LIBGCRYPT-1-4-BRANCH/ChangeLog	2009-12-09 15:57:10 UTC (rev 1412)
+++ branches/LIBGCRYPT-1-4-BRANCH/ChangeLog	2009-12-10 11:43:47 UTC (rev 1413)
@@ -1,7 +1,7 @@
 2009-01-22  Werner Koch  <wk at g10code.com>
 
 	Release 1.4.4.
-	
+
 	* configure.ac: Bump LT version to C16/A5/R2.
 
 2008-10-30  Werner Koch  <wk at g10code.com>

Modified: branches/LIBGCRYPT-1-4-BRANCH/random/ChangeLog
===================================================================
--- branches/LIBGCRYPT-1-4-BRANCH/random/ChangeLog	2009-12-09 15:57:10 UTC (rev 1412)
+++ branches/LIBGCRYPT-1-4-BRANCH/random/ChangeLog	2009-12-10 11:43:47 UTC (rev 1413)
@@ -1,3 +1,10 @@
+2009-12-10  Werner Koch  <wk at g10code.com>
+
+	* rndw32.c (system_is_w2000): New.
+	(_gcry_rndw32_gather_random): Set it.
+	(slow_gatherer): Ignore SystemObjectInformation on W2000.  Fixes
+	bug#1167.
+
 2009-06-24  Werner Koch  <wk at g10code.com>
 
 	* rndhw.c (poll_padlock): Asm change from Fedora.
@@ -129,4 +136,4 @@
  This file is distributed in the hope that it will be useful, but
  WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-	
\ No newline at end of file
+	

Modified: branches/LIBGCRYPT-1-4-BRANCH/NEWS
===================================================================
--- branches/LIBGCRYPT-1-4-BRANCH/NEWS	2009-12-09 15:57:10 UTC (rev 1412)
+++ branches/LIBGCRYPT-1-4-BRANCH/NEWS	2009-12-10 11:43:47 UTC (rev 1413)
@@ -1,3 +1,15 @@
+Noteworthy changes in version 1.4.5 (unreleased)
+------------------------------------------------
+
+ * Fix minor memory leak in DSA key generation.
+
+ * No switch into FIPS mode if /proc/version is not readable.
+
+ * Fix sigill during Padlock detection on old CPUs.
+
+ * Fix a hang on some W2000 machines.
+
+
 Noteworthy changes in version 1.4.4 (2009-01-22)
 ------------------------------------------------
 

Modified: branches/LIBGCRYPT-1-4-BRANCH/configure.ac
===================================================================
--- branches/LIBGCRYPT-1-4-BRANCH/configure.ac	2009-12-09 15:57:10 UTC (rev 1412)
+++ branches/LIBGCRYPT-1-4-BRANCH/configure.ac	2009-12-10 11:43:47 UTC (rev 1413)
@@ -26,8 +26,8 @@
 # Remember to change the version number immediately *after* a release.
 # Set my_issvn to "yes" for non-released code.  Remember to run an
 # "svn up" and "autogen.sh" right before creating a distribution.
-m4_define([my_version], [1.4.4])
-m4_define([my_issvn], [no])
+m4_define([my_version], [1.4.5])
+m4_define([my_issvn], [yes])
 
 m4_define([svn_revision], m4_esyscmd([printf "%d" $(svn info 2>/dev/null \
           | sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))

Modified: branches/LIBGCRYPT-1-4-BRANCH/random/rndw32.c
===================================================================
--- branches/LIBGCRYPT-1-4-BRANCH/random/rndw32.c	2009-12-09 15:57:10 UTC (rev 1412)
+++ branches/LIBGCRYPT-1-4-BRANCH/random/rndw32.c	2009-12-10 11:43:47 UTC (rev 1413)
@@ -245,8 +245,10 @@
 
 static int debug_me;  /* Debug flag.  */
 
+static int system_is_w2000;     /* True if running on W2000.  */
 
 
+
 
 /* Try and connect to the system RNG if there's one present. */
 static void 
@@ -643,6 +645,12 @@
     {
       switch (dwType)
         {
+          /* ID 17 = SystemObjectInformation hangs on some win2k systems.  */
+        case 17:
+          if (system_is_w2000)
+            continue;
+          break;
+
           /* Some information types are write-only (the IDs are shared with
              a set-information call), we skip these.  */
         case 26: case 27: case 38: case 46: case 47: case 48: case 52:
@@ -768,6 +776,7 @@
       GetVersionEx( &osvi );
       if ( osvi.dwPlatformId != VER_PLATFORM_WIN32_NT)
         log_fatal ("can only run on a Windows NT platform\n" );
+      system_is_w2000 = (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 0);
       init_system_rng ();
       is_initialized = 1;
     }