diff options
Diffstat (limited to '')
| -rw-r--r-- | g10/pubkey-enc.c | 42 |
1 files changed, 18 insertions, 24 deletions
diff --git a/g10/pubkey-enc.c b/g10/pubkey-enc.c index 0ddb8d7bb..013fd2f1b 100644 --- a/g10/pubkey-enc.c +++ b/g10/pubkey-enc.c @@ -90,19 +90,16 @@ get_session_key (ctrl_t ctrl, PKT_pubkey_enc * k, DEK * dek) sk->pubkey_algo = k->pubkey_algo; /* We want a pubkey with this algo. */ if (!(rc = get_seckey (ctrl, sk, k->keyid))) { - /* Check compliance. */ - if (! gnupg_pk_is_allowed (opt.compliance, PK_USE_DECRYPTION, - sk->pubkey_algo, - sk->pkey, nbits_from_pk (sk), NULL)) - { - log_info (_("key %s not suitable for decryption" - " while in %s mode\n"), - keystr_from_pk (sk), - gnupg_compliance_option_string (opt.compliance)); - rc = gpg_error (GPG_ERR_PUBKEY_ALGO); - } - else - rc = get_it (ctrl, k, dek, sk, k->keyid); + /* Print compliance warning. */ + if (!gnupg_pk_is_compliant (opt.compliance, + sk->pubkey_algo, + sk->pkey, nbits_from_pk (sk), NULL)) + log_info (_("Note: key %s was not suitable for encryption" + " in %s mode\n"), + keystr_from_pk (sk), + gnupg_compliance_option_string (opt.compliance)); + + rc = get_it (ctrl, k, dek, sk, k->keyid); } } else if (opt.skip_hidden_recipients) @@ -131,17 +128,14 @@ get_session_key (ctrl_t ctrl, PKT_pubkey_enc * k, DEK * dek) log_info (_("anonymous recipient; trying secret key %s ...\n"), keystr (keyid)); - /* Check compliance. */ - if (! gnupg_pk_is_allowed (opt.compliance, PK_USE_DECRYPTION, - sk->pubkey_algo, - sk->pkey, nbits_from_pk (sk), NULL)) - { - log_info (_("key %s not suitable for decryption" - " while in %s mode\n"), - keystr_from_pk (sk), - gnupg_compliance_option_string (opt.compliance)); - continue; - } + /* Print compliance warning. */ + if (!gnupg_pk_is_compliant (opt.compliance, + sk->pubkey_algo, + sk->pkey, nbits_from_pk (sk), NULL)) + log_info (_("Note: key %s was not suitable for encryption" + " in %s mode\n"), + keystr_from_pk (sk), + gnupg_compliance_option_string (opt.compliance)); rc = get_it (ctrl, k, dek, sk, keyid); if (!rc) |