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 /common/compliance.h | |
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 'common/compliance.h')
-rw-r--r-- | common/compliance.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/common/compliance.h b/common/compliance.h index d36c7c131..7c74da38a 100644 --- a/common/compliance.h +++ b/common/compliance.h @@ -48,11 +48,17 @@ enum pk_use_case PK_USE_SIGNING, PK_USE_VERIFICATION, }; +/* Flags to distinguish public key algorithm variants. */ +#define PK_ALGO_FLAG_RSAPSS 1 /* Use rsaPSS padding. */ + + int gnupg_pk_is_compliant (enum gnupg_compliance_mode compliance, int algo, + unsigned int algo_flags, gcry_mpi_t key[], unsigned int keylength, const char *curvename); int gnupg_pk_is_allowed (enum gnupg_compliance_mode compliance, - enum pk_use_case use, int algo, gcry_mpi_t key[], + enum pk_use_case use, int algo, + unsigned int algo_flags, gcry_mpi_t key[], unsigned int keylength, const char *curvename); int gnupg_cipher_is_compliant (enum gnupg_compliance_mode compliance, cipher_algo_t cipher, |