mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-23 10:29:58 +01:00
Make CAST5 the default s2k algo tomatch the doc and gpg 1.4.
This commit is contained in:
parent
5b41186bd0
commit
68e18c961d
@ -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:
|
||||
|
@ -1,3 +1,8 @@
|
||||
2010-06-17 Werner Koch <wk@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@g10code.com>
|
||||
|
||||
* armor.c (radix64_read): Change fix 2006-04-28 to fix bug#1179.
|
||||
|
@ -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;
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user