[svn] GnuPG - r4896 - in trunk: scripts sm

[svn author wk]

Author: wk
Date: 2008-12-10 11:57:47 +0100 (Wed, 10 Dec 2008)
New Revision: 4896

Modified:
   trunk/scripts/mail-to-translators
   trunk/sm/ChangeLog
   trunk/sm/gpgsm.c
Log:
fix a gpgconf default.  Cosmetic changes.


Modified: trunk/sm/ChangeLog
===================================================================
--- trunk/sm/ChangeLog	2008-12-09 12:32:53 UTC (rev 4895)
+++ trunk/sm/ChangeLog	2008-12-10 10:57:47 UTC (rev 4896)
@@ -1,3 +1,10 @@
+2008-12-10  Werner Koch  <wk at g10code.com>
+
+	* gpgsm.c (our_cipher_test_algo): Use the GCRY constants as we now
+	require 1.4.
+	(our_md_test_algo): Ditto.  Add SHA224.
+	(main) <aGpgConfList>: Update default cipher algo.
+
 2008-12-09  Werner Koch  <wk at g10code.com>
 
 	* gpgsm.c (main): Call i18n_init before init_common_subsystems.

Modified: trunk/scripts/mail-to-translators
===================================================================
--- trunk/scripts/mail-to-translators	2008-12-09 12:32:53 UTC (rev 4895)
+++ trunk/scripts/mail-to-translators	2008-12-10 10:57:47 UTC (rev 4896)
@@ -48,15 +48,20 @@
 more than one version of a project (we maintain 1.4 and 2.0) and thus
 I'd ask you *not to use the TP Robot* for GnuPG.
 
+The release candidate for 2.0.10 is available at:
+
+  ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-2.0.10rc1.tar.bz2
+  ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-2.0.10rc1.tar.bz2.sig
+
 Output of msgfmt is:
 $(msgfmt --check --statistics $file 2>&1 | head)
 
 If you are not able to continue the translation work, I suggest to
-pass this message on to another translator and drop a a short note to
+pass this message on to another translator and drop a short note to
 gnupg-hackers at gnupg.org .
 
 
-Thanks,
+Happy hacking,
 
   Werner
 

Modified: trunk/sm/gpgsm.c
===================================================================
--- trunk/sm/gpgsm.c	2008-12-09 12:32:53 UTC (rev 4895)
+++ trunk/sm/gpgsm.c	2008-12-10 10:57:47 UTC (rev 4896)
@@ -448,10 +448,10 @@
     case GCRY_CIPHER_SERPENT128:
     case GCRY_CIPHER_SERPENT192:
     case GCRY_CIPHER_SERPENT256:
-    case 309 /*GCRY_CIPHER_SEED*/:
-    case 310 /*GCRY_CIPHER_CAMELLIA128*/:
-    case 311 /*GCRY_CIPHER_CAMELLIA192*/:
-    case 312 /*GCRY_CIPHER_CAMELLIA256*/:
+    case GCRY_CIPHER_SEED:
+    case GCRY_CIPHER_CAMELLIA128:
+    case GCRY_CIPHER_CAMELLIA192:
+    case GCRY_CIPHER_CAMELLIA256:
       return gcry_cipher_test_algo (algo);
     default:
       return 1;
@@ -467,10 +467,11 @@
     case GCRY_MD_MD5:
     case GCRY_MD_SHA1:
     case GCRY_MD_RMD160:
+    case GCRY_MD_SHA224:
     case GCRY_MD_SHA256:
     case GCRY_MD_SHA384:
     case GCRY_MD_SHA512:
-    case 305 /*GCRY_MD_WHIRLPOOL*/:
+    case GCRY_MD_WHIRLPOOL:
       return gcry_md_test_algo (algo);
     default:
       return 1;
@@ -890,6 +891,8 @@
   
   create_dotlock (NULL); /* register locking cleanup */
 
+  /* Note: If you change this default cipher algorithm , please
+     remember to update the Gpgconflist entry as well.  */
   opt.def_cipher_algoid = "AES";  /*des-EDE3-CBC*/
 
   opt.homedir = default_homedir ();
@@ -1604,7 +1607,7 @@
 #ifndef HAVE_W32_SYSTEM
         printf ("prefer-system-dirmngr:%lu:\n", GC_OPT_FLAG_NONE);
 #endif
-        printf ("cipher-algo:%lu:\"3DES:\n", GC_OPT_FLAG_DEFAULT);
+        printf ("cipher-algo:%lu:\"AES:\n", GC_OPT_FLAG_DEFAULT);
         printf ("p12-charset:%lu:\n", GC_OPT_FLAG_DEFAULT);
         printf ("default-key:%lu:\n", GC_OPT_FLAG_DEFAULT);
         printf ("encrypt-to:%lu:\n", GC_OPT_FLAG_DEFAULT);