[svn] gcry - r1443 - in trunk: cipher random

[svn author wk]

Author: wk
Date: 2010-08-19 15:57:20 +0200 (Thu, 19 Aug 2010)
New Revision: 1443

Modified:
   trunk/cipher/ChangeLog
   trunk/cipher/cipher.c
   trunk/random/random-csprng.c
Log:
Fix bug 1263


Modified: trunk/cipher/ChangeLog
===================================================================
--- trunk/cipher/ChangeLog	2010-08-19 13:24:49 UTC (rev 1442)
+++ trunk/cipher/ChangeLog	2010-08-19 13:57:20 UTC (rev 1443)
@@ -1,3 +1,8 @@
+2010-08-19  Werner Koch  <wk at g10code.com>
+
+	* cipher.c (gcry_cipher_open): Remove double release of the module.
+	Fixes bug#1263.
+
 2010-06-10  Jeff Johnson  <n3npq at mac.com>  (wk)
 
 	* ecc.c (ecc_generate_ext): Parse transient-key flag.

Modified: trunk/cipher/cipher.c
===================================================================
--- trunk/cipher/cipher.c	2010-08-19 13:24:49 UTC (rev 1442)
+++ trunk/cipher/cipher.c	2010-08-19 13:57:20 UTC (rev 1443)
@@ -698,7 +698,6 @@
 	{
 	  /* Not available for use.  */
 	  err = GPG_ERR_CIPHER_ALGO;
-	  _gcry_module_release (module);
 	}
       else
         {

Modified: trunk/random/random-csprng.c
===================================================================
--- trunk/random/random-csprng.c	2010-08-19 13:24:49 UTC (rev 1442)
+++ trunk/random/random-csprng.c	2010-08-19 13:57:20 UTC (rev 1443)
@@ -682,7 +682,9 @@
 static int
 lock_seed_file (int fd, const char *fname, int for_write)
 {
+#ifdef __GCC__
 #warning Check whether we can lock on Windows.
+#endif
 #if LOCK_SEED_FILE
   struct flock lck;
   struct timeval tv;