From 986d928ce2a561b04fda7730de6a94f9b1e703d6 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Mon, 18 Sep 2000 14:35:34 +0000 Subject: See ChangeLog: Mon Sep 18 16:35:45 CEST 2000 Werner Koch --- g10/pubkey-enc.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'g10/pubkey-enc.c') diff --git a/g10/pubkey-enc.c b/g10/pubkey-enc.c index e6cbec4a0..646aca017 100644 --- a/g10/pubkey-enc.c +++ b/g10/pubkey-enc.c @@ -106,14 +106,11 @@ get_session_key( PKT_pubkey_enc *k, DEK *dek ) PKT_secret_key *sk = NULL; int rc; - if( is_RSA(k->pubkey_algo) ) /* warn about that */ - write_status(STATUS_RSA_OR_IDEA); - rc = openpgp_pk_test_algo( k->pubkey_algo, 0 ); if( rc ) goto leave; - if( k->keyid[0] || k->keyid[1] ) { + if( (k->keyid[0] || k->keyid[1]) && !opt.try_all_secrets ) { sk = gcry_xcalloc( 1, sizeof *sk ); sk->pubkey_algo = k->pubkey_algo; /* we want a pubkey with this algo*/ if( !(rc = get_seckey( sk, k->keyid )) ) -- cgit v1.2.3