diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 7 | ||||
| -rw-r--r-- | g10/keygen.c | 4 | ||||
| -rw-r--r-- | g10/pkclist.c | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 268af9290..89fcf0341 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,10 @@ +Fri Sep 15 18:40:36 CEST 2000 Werner Koch <[email protected]> + + * keygen.c (keygen_add_std_prefs): Changed order of preferences to + twofish, cast5, blowfish. + + * pkclist.c (algo_available): Removed hack to disable Twofish. + Thu Sep 14 17:45:11 CEST 2000 Werner Koch <[email protected]> * parse-packet.c (dump_sig_subpkt): Dump key flags. Print special diff --git a/g10/keygen.c b/g10/keygen.c index 2f68e0d41..0fc838c4f 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -136,8 +136,8 @@ keygen_add_std_prefs( PKT_signature *sig, void *opaque ) keygen_add_key_expire( sig, opaque ); buf[0] = CIPHER_ALGO_TWOFISH; - buf[1] = CIPHER_ALGO_BLOWFISH; - buf[2] = CIPHER_ALGO_CAST5; + buf[1] = CIPHER_ALGO_CAST5; + buf[2] = CIPHER_ALGO_BLOWFISH; build_sig_subpkt( sig, SIGSUBPKT_PREF_SYM, buf, 3 ); buf[0] = DIGEST_ALGO_RMD160; diff --git a/g10/pkclist.c b/g10/pkclist.c index 9bd42e226..250446fe7 100644 --- a/g10/pkclist.c +++ b/g10/pkclist.c @@ -1032,8 +1032,6 @@ static int algo_available( int preftype, int algo ) { if( preftype == PREFTYPE_SYM ) { - if( algo == CIPHER_ALGO_TWOFISH ) - return 0; /* we don't want to generate Twofish messages for now*/ return algo && !check_cipher_algo( algo ); } else if( preftype == PREFTYPE_HASH ) { |