[svn] GnuPG - r4736 - trunk/g10

[svn author wk]

Author: wk
Date: 2008-04-02 20:03:04 +0200 (Wed, 02 Apr 2008)
New Revision: 4736

Modified:
   trunk/g10/ChangeLog
   trunk/g10/gpg.c
Log:
disable DSA2 for old Libgcrypts.


Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2008-04-02 08:48:08 UTC (rev 4735)
+++ trunk/g10/ChangeLog	2008-04-02 18:03:04 UTC (rev 4736)
@@ -1,3 +1,7 @@
+2008-04-02  Werner Koch  <wk at g10code.com>
+
+	* gpg.c (main): Do not allow DSA2 with a too old Libgcrypt.
+
 2008-03-26  Werner Koch  <wk at g10code.com>
 
 	* tdbio.c (lookup_hashtable): Make cmp args const.

Modified: trunk/g10/gpg.c
===================================================================
--- trunk/g10/gpg.c	2008-04-02 08:48:08 UTC (rev 4735)
+++ trunk/g10/gpg.c	2008-04-02 18:03:04 UTC (rev 4736)
@@ -2932,6 +2932,15 @@
               "use!\n");
 #endif
 
+    /* Older Libgcrypts fail with an assertion during DSA key
+       generation.  Better disable DSA2 entirely. */
+    if (opt.flags.dsa2 && !gcry_check_version ("1.4.0") )
+      {
+        log_info ("WARNING: "
+                  "DSA2 is only available with Libgcrypt 1.4 and later\n");
+        opt.flags.dsa2 = 0;
+      }
+
     if (opt.verbose > 2)
         log_info ("using character set `%s'\n", get_native_charset ());