aboutsummaryrefslogtreecommitdiffstats
path: root/g10/gpg.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2014-08-18 09:45:00 +0000
committerWerner Koch <[email protected]>2014-08-18 09:45:00 +0000
commit57df1121c18b004dd763b35eabf7b51fc9e8ec38 (patch)
tree27650b4baab0966f55fe409f8697d0be485b234a /g10/gpg.c
parentyat2m: Support @set and @value. (diff)
downloadgnupg-57df1121c18b004dd763b35eabf7b51fc9e8ec38.tar.gz
gnupg-57df1121c18b004dd763b35eabf7b51fc9e8ec38.zip
gpg: Change default cipher for --symmetric from CAST5 to AES-128.
* g10/main.h (DEFAULT_CIPHER_ALGO): Chhange to AES or CAST5 or 3DES depending on configure option. * g10/gpg.c (main): Set opt.s2k_cipher_algo to DEFAULT_CIPHER_ALGO.
Diffstat (limited to 'g10/gpg.c')
-rw-r--r--g10/gpg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/gpg.c b/g10/gpg.c
index 7ba193b6f..ce1a87fbd 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -2072,7 +2072,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. */
- opt.s2k_cipher_algo = CIPHER_ALGO_CAST5;
+ opt.s2k_cipher_algo = DEFAULT_CIPHER_ALGO;
opt.completes_needed = 1;
opt.marginals_needed = 3;
opt.max_cert_depth = 5;