2 files changed, 5 insertions, 4 deletions
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  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* 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;