aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--g10/ChangeLog3
-rw-r--r--g10/seckey-cert.c3
2 files changed, 5 insertions, 1 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 204308c9f..c20310f0d 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,5 +1,8 @@
2002-10-01 David Shaw <[email protected]>
+ * seckey-cert.c (do_check): Don't give the IDEA warning unless the
+ cipher in question is in fact IDEA.
+
* import.c (import_one): Make sure that a newly imported key
starts with a clean ownertrust.
(import_revoke_cert): Remove ultimate trust when revoking an
diff --git a/g10/seckey-cert.c b/g10/seckey-cert.c
index d2d39dacf..d19ac683a 100644
--- a/g10/seckey-cert.c
+++ b/g10/seckey-cert.c
@@ -58,7 +58,8 @@ do_check( PKT_secret_key *sk, const char *tryagain_text )
if( check_cipher_algo( sk->protect.algo ) ) {
log_info(_("protection algorithm %d%s is not supported\n"),
sk->protect.algo,sk->protect.algo==1?" (IDEA)":"" );
- idea_cipher_warn(0);
+ if(sk->protect.algo==CIPHER_ALGO_IDEA)
+ idea_cipher_warn(0);
return G10ERR_CIPHER_ALGO;
}
keyid_from_sk( sk, keyid );