aboutsummaryrefslogtreecommitdiffstats
path: root/g10/encrypt.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2017-07-27 12:54:50 +0000
committerWerner Koch <[email protected]>2017-07-27 12:57:32 +0000
commit1bd22a85b4f06324037b3500d2fa8af62733c926 (patch)
tree6f91cd47cd0086b9c92fcc7fcbcf38148ec1dd36 /g10/encrypt.c
parentgpg,sm: Fix compliance checking for decryption. (diff)
downloadgnupg-1bd22a85b4f06324037b3500d2fa8af62733c926.tar.gz
gnupg-1bd22a85b4f06324037b3500d2fa8af62733c926.zip
gpg,sm: Allow encryption (with warning) to any key in de-vs mode.
* g10/encrypt.c (encrypt_crypt): Do not abort for a non-compliant key. * sm/encrypt.c (gpgsm_encrypt): Ditto. -- GnuPG-bug-id: 3306 Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'g10/encrypt.c')
-rw-r--r--g10/encrypt.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/g10/encrypt.c b/g10/encrypt.c
index c63ec8838..c7982d448 100644
--- a/g10/encrypt.c
+++ b/g10/encrypt.c
@@ -657,16 +657,12 @@ encrypt_crypt (ctrl_t ctrl, int filefd, const char *filename,
PKT_public_key *pk = pkr->pk;
unsigned int nbits = nbits_from_pk (pk);
- if (! gnupg_pk_is_allowed (opt.compliance, PK_USE_ENCRYPTION,
- pk->pubkey_algo, pk->pkey, nbits, NULL))
- {
- log_error (_("key %s not suitable for encryption"
- " while in %s mode\n"),
- keystr_from_pk (pk),
- gnupg_compliance_option_string (opt.compliance));
- rc = gpg_error (GPG_ERR_PUBKEY_ALGO);
- goto leave;
- }
+ if (!gnupg_pk_is_compliant (opt.compliance,
+ pk->pubkey_algo, pk->pkey, nbits, NULL))
+ log_info (_("WARNING: key %s is not suitable for encryption"
+ " in %s mode\n"),
+ keystr_from_pk (pk),
+ gnupg_compliance_option_string (opt.compliance));
if (compliant
&& !gnupg_pk_is_compliant (CO_DE_VS, pk->pubkey_algo, pk->pkey,