diff options
| author | David Shaw <[email protected]> | 2002-10-02 22:01:29 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2002-10-02 22:01:29 +0000 |
| commit | 58972f24c406ab1619efac2b3ff91e13923efe5f (patch) | |
| tree | a7d38634c3621ec7b8412eda3f3641d5be8fbd73 /g10/seckey-cert.c | |
| parent | * longlong.h: Some whitespace changes in HPPA to fix assembler problems on (diff) | |
| download | gnupg-58972f24c406ab1619efac2b3ff91e13923efe5f.tar.gz gnupg-58972f24c406ab1619efac2b3ff91e13923efe5f.zip | |
* import.c (import_secret_one): Check for an illegal (>110) protection
cipher when importing a secret key.
* keylist.c (list_keyblock_print): Show a '#' for a secret-parts-missing
key.
* parse_packet.c (parse_key): Some comments.
* revoke.c (gen_revoke): Remove some debugging code.
* trustdb.c (verify_own_keys): Make trusted-key a non-deprecated option
again.
* seckey-cert.c (do_check): Don't give the IDEA warning unless the cipher
in question is in fact IDEA.
Diffstat (limited to 'g10/seckey-cert.c')
| -rw-r--r-- | g10/seckey-cert.c | 3 |
1 files changed, 2 insertions, 1 deletions
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 ); |