aboutsummaryrefslogtreecommitdiffstats
path: root/g10
diff options
context:
space:
mode:
Diffstat (limited to 'g10')
-rw-r--r--g10/ChangeLog5
-rw-r--r--g10/keygen.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 0327d1628..195175aa5 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -15,6 +15,11 @@
behavior should only apply while data signing and not encryption.
Noted by Roger Sondermann.
+2002-04-19 Werner Koch <[email protected]>
+
+ * keygen.c (keygen_set_std_prefs): Put back 3DES because the RFC
+ says it is good form to do so.
+
2002-04-19 David Shaw <[email protected]>
* keyedit.c (menu_deluid): Only cause a trust update if we delete
diff --git a/g10/keygen.c b/g10/keygen.c
index 437a61abf..00b4eef31 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -222,7 +222,7 @@ keygen_set_std_prefs (const char *string)
if ( !check_cipher_algo(CIPHER_ALGO_IDEA) )
string = "S7 S3 S2 S1 H2 H3 Z2 Z1";
else
- string = "S7 S3 H2 H3 Z2 Z1";
+ string = "S7 S3 S2 H2 H3 Z2 Z1";
/* If we have it, IDEA goes *after* 3DES so it won't be used
unless we're encrypting along with a V3 key. Ideally, we