[svn] GnuPG - r5358 - in branches/STABLE-BRANCH-2-0: doc g10 tests/openpgp

[svn author wk]

Author: wk
Date: 2010-06-17 14:58:51 +0200 (Thu, 17 Jun 2010)
New Revision: 5358

Modified:
   branches/STABLE-BRANCH-2-0/doc/gpg.texi
   branches/STABLE-BRANCH-2-0/g10/ChangeLog
   branches/STABLE-BRANCH-2-0/g10/gpg.c
   branches/STABLE-BRANCH-2-0/tests/openpgp/ChangeLog
Log:
Make CAST5 the default s2k algo tomatch the doc and gpg 1.4.


Modified: branches/STABLE-BRANCH-2-0/g10/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-2-0/g10/ChangeLog	2010-06-11 13:51:11 UTC (rev 5357)
+++ branches/STABLE-BRANCH-2-0/g10/ChangeLog	2010-06-17 12:58:51 UTC (rev 5358)
@@ -1,3 +1,8 @@
+2010-06-17  Werner Koch  <wk at g10code.com>
+
+	* gpg.c (main): Use CAST5 as default s2k algo.  The macro
+	USE_CAST5 was only used with GnuPG 1.x.
+
 2010-05-12  Werner Koch  <wk at g10code.com>
 
 	* armor.c (radix64_read): Change fix 2006-04-28 to fix bug#1179.

Modified: branches/STABLE-BRANCH-2-0/tests/openpgp/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-2-0/tests/openpgp/ChangeLog	2010-06-11 13:51:11 UTC (rev 5357)
+++ branches/STABLE-BRANCH-2-0/tests/openpgp/ChangeLog	2010-06-17 12:58:51 UTC (rev 5358)
@@ -2,7 +2,7 @@
 
 	* armor.test: Add test for bug#1179.
 
-	* Makefile.am (TESTS_ENVIRONMENT): New.  Start all scripts udner
+	* Makefile.am (TESTS_ENVIRONMENT): New.  Start all scripts under
 	the control of the gpg-agent.
 	(prepared.stamp): Create gpg-agent.conf.
 	* defs.inc: Do not create gpg-agent.conf

Modified: branches/STABLE-BRANCH-2-0/doc/gpg.texi
===================================================================
--- branches/STABLE-BRANCH-2-0/doc/gpg.texi	2010-06-11 13:51:11 UTC (rev 5357)
+++ branches/STABLE-BRANCH-2-0/doc/gpg.texi	2010-06-17 12:58:51 UTC (rev 5358)
@@ -845,7 +845,8 @@
 
 @c man:.RS
 The listing shows you the key with its secondary keys and all user
-ids. Selected keys or user ids are indicated by an asterisk. The trust
+ids.  The primary user id is indicated by a dot, and selected keys or
+user ids are indicated by an asterisk.  The trust
 value is displayed with the primary key: the first is the assigned owner
 trust and the second is the calculated trust value. Letters are used for
 the values:

Modified: branches/STABLE-BRANCH-2-0/g10/gpg.c
===================================================================
--- branches/STABLE-BRANCH-2-0/g10/gpg.c	2010-06-11 13:51:11 UTC (rev 5357)
+++ branches/STABLE-BRANCH-2-0/g10/gpg.c	2010-06-17 12:58:51 UTC (rev 5358)
@@ -1973,11 +1973,7 @@
     opt.compress_algo = -1; /* defaults to DEFAULT_COMPRESS_ALGO */
     opt.s2k_mode = 3; /* iterated+salted */
     opt.s2k_count = 0; /* Auto-calibrate when needed.  */
-#ifdef USE_CAST5
     opt.s2k_cipher_algo = CIPHER_ALGO_CAST5;
-#else
-    opt.s2k_cipher_algo = CIPHER_ALGO_3DES;
-#endif
     opt.completes_needed = 1;
     opt.marginals_needed = 3;
     opt.max_cert_depth = 5;