security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-23 10:29:58 +01:00
Code Activity

Make CAST5 the default s2k algo tomatch the doc and gpg 1.4.

Browse Source
This commit is contained in:
Werner Koch 2010-06-17 12:58:51 +00:00
parent 5b41186bd0
commit 68e18c961d
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/gpg.texi
View File

@ -845,7 +845,8 @@ key rings.
@c man:.RS @c man:.RS
The listing shows you the key with its secondary keys and all user 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 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 trust and the second is the calculated trust value. Letters are used for
the values: the values:

5
g10/ChangeLog
View File

@ -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> 2010-05-12 Werner Koch <wk@g10code.com>
* armor.c (radix64_read): Change fix 2006-04-28 to fix bug#1179. * armor.c (radix64_read): Change fix 2006-04-28 to fix bug#1179.

4
g10/gpg.c
View File

@ -1973,11 +1973,7 @@ main (int argc, char **argv)
opt.compress_algo = -1; /* defaults to DEFAULT_COMPRESS_ALGO */ opt.compress_algo = -1; /* defaults to DEFAULT_COMPRESS_ALGO */
opt.s2k_mode = 3; /* iterated+salted */ opt.s2k_mode = 3; /* iterated+salted */
opt.s2k_count = 0; /* Auto-calibrate when needed. */ opt.s2k_count = 0; /* Auto-calibrate when needed. */
#ifdef USE_CAST5
opt.s2k_cipher_algo = CIPHER_ALGO_CAST5; opt.s2k_cipher_algo = CIPHER_ALGO_CAST5;
#else
opt.s2k_cipher_algo = CIPHER_ALGO_3DES;
#endif
opt.completes_needed = 1; opt.completes_needed = 1;
opt.marginals_needed = 3; opt.marginals_needed = 3;
opt.max_cert_depth = 5; opt.max_cert_depth = 5;

2
tests/openpgp/ChangeLog
View File

@ -2,7 +2,7 @@
* armor.test: Add test for bug#1179. * 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. the control of the gpg-agent.
(prepared.stamp): Create gpg-agent.conf. (prepared.stamp): Create gpg-agent.conf.
* defs.inc: Do not create gpg-agent.conf * defs.inc: Do not create gpg-agent.conf