mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
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>
This commit is contained in:
parent
c1663c690b
commit
969abcf40c
16 changed files with 175 additions and 89 deletions
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue