diff options
| author | Werner Koch <wk@gnupg.org> | 2020-07-03 15:47:55 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2020-07-03 16:15:29 +0200 |
| commit | 969abcf40cdfc65f3ee859c5e62889e1a8ccde91 (patch) | |
| tree | 85bb8618a5c78574db04cad63d91328cba652ffd /g10/encrypt.c | |
| parent | scd:nks: Implement writecert for the Signature card v2. (diff) | |
| download | gnupg2-969abcf40cdfc65f3ee859c5e62889e1a8ccde91.tar.xz gnupg2-969abcf40cdfc65f3ee859c5e62889e1a8ccde91.zip | |
sm: Exclude rsaPSS from de-vs compliance mode.
* common/compliance.h (PK_ALGO_FLAG_RSAPSS): New.
* common/compliance.c (gnupg_pk_is_compliant): Add arg alog_flags and
test rsaPSS. Adjust all callers.
(gnupg_pk_is_allowed): Ditto.
* sm/misc.c (gpgsm_ksba_cms_get_sig_val): New wrapper function.
(gpgsm_get_hash_algo_from_sigval): New.
* sm/certcheck.c (gpgsm_check_cms_signature): Change type of sigval
arg. Add arg pkalgoflags. Use the PK_ALGO_FLAG_RSAPSS.
* sm/verify.c (gpgsm_verify): Use the new wrapper and new fucntion to
also get the algo flags. Pass algo flags along.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'g10/encrypt.c')
| -rw-r--r-- | g10/encrypt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/g10/encrypt.c b/g10/encrypt.c index 972d13c7c..39626f1e2 100644 --- a/g10/encrypt.c +++ b/g10/encrypt.c @@ -785,15 +785,15 @@ 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_compliant (opt.compliance, - pk->pubkey_algo, pk->pkey, nbits, NULL)) + if (!gnupg_pk_is_compliant (opt.compliance, pk->pubkey_algo, 0, + 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, + && !gnupg_pk_is_compliant (CO_DE_VS, pk->pubkey_algo, 0, pk->pkey, nbits, NULL)) compliant = 0; } |