diff options
| author | Werner Koch <wk@gnupg.org> | 2010-06-17 17:44:44 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2010-06-17 17:44:44 +0200 |
| commit | 006fd75aea5cc766bc223e435e5a07b543d658d3 (patch) | |
| tree | 2f4365e73bf0a8b5272426fcf1fde9b75be4002e /g10 | |
| parent | Add makefiles to build a w32 development package. (diff) | |
| download | gnupg2-006fd75aea5cc766bc223e435e5a07b543d658d3.tar.xz gnupg2-006fd75aea5cc766bc223e435e5a07b543d658d3.zip | |
Avoid using the protect-tool to import pkcs#12.
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 5 | ||||
| -rw-r--r-- | g10/gpg.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index c661be1c9..e54a8edfc 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -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-06-07 Werner Koch <wk@g10code.com> * cpr.c: Use estream for status output. @@ -1976,11 +1976,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; |