diff --git a/doc/gpg.texi b/doc/gpg.texi index edb95ea50..8ff5ac339 100644 --- a/doc/gpg.texi +++ b/doc/gpg.texi @@ -845,7 +845,8 @@ key rings. @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: diff --git a/g10/ChangeLog b/g10/ChangeLog index 698861917..cbe1a182e 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2010-06-17 Werner Koch + + * 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 * armor.c (radix64_read): Change fix 2006-04-28 to fix bug#1179. diff --git a/g10/gpg.c b/g10/gpg.c index 3dee35614..7e648fb9d 100644 --- a/g10/gpg.c +++ b/g10/gpg.c @@ -1973,11 +1973,7 @@ main (int argc, char **argv) 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; diff --git a/tests/openpgp/ChangeLog b/tests/openpgp/ChangeLog index 8fb93cf73..beb6197d9 100644 --- a/tests/openpgp/ChangeLog +++ b/tests/openpgp/ChangeLog @@ -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