aboutsummaryrefslogtreecommitdiffstats
path: root/g10/main.h
diff options
context:
space:
mode:
Diffstat (limited to 'g10/main.h')
-rw-r--r--g10/main.h11
1 files changed, 9 insertions, 2 deletions
diff --git a/g10/main.h b/g10/main.h
index b2efaae3b..4eb1b5f31 100644
--- a/g10/main.h
+++ b/g10/main.h
@@ -26,11 +26,18 @@
#include "util.h"
/* It could be argued that the default cipher should be 3DES rather
- than CAST5, and the default compression should be 0
+ than AES128, and the default compression should be 0
(i.e. uncompressed) rather than 1 (zip). However, the real world
issues of speed and size come into play here. */
-#define DEFAULT_CIPHER_ALGO CIPHER_ALGO_CAST5
+#if GPG_USE_AES128
+# define DEFAULT_CIPHER_ALGO CIPHER_ALGO_AES
+#elif GPG_USE_CAST5
+# define DEFAULT_CIPHER_ALGO CIPHER_ALGO_CAST5
+#else
+# define DEFAULT_CIPHER_ALGO CIPHER_ALGO_3DES
+#endif
+
#define DEFAULT_DIGEST_ALGO DIGEST_ALGO_SHA1
#define DEFAULT_S2K_DIGEST_ALGO DIGEST_ALGO_SHA1
#ifdef HAVE_ZIP