diff options
Diffstat (limited to '')
| -rw-r--r-- | sm/decrypt.c | 3 | ||||
| -rw-r--r-- | sm/encrypt.c | 6 | ||||
| -rw-r--r-- | sm/gpgsm.c | 12 |
3 files changed, 13 insertions, 8 deletions
diff --git a/sm/decrypt.c b/sm/decrypt.c index 16181df00..170ad5ad3 100644 --- a/sm/decrypt.c +++ b/sm/decrypt.c @@ -481,7 +481,8 @@ gpgsm_decrypt (ctrl_t ctrl, int in_fd, estream_t out_fp) int pk_algo = gpgsm_get_key_algo_info (cert, &nbits); /* Check compliance. */ - if (! gnupg_pk_is_allowed (opt.compliance, PK_USE_DECRYPTION, + if (! gnupg_pk_is_allowed (opt.compliance, + PK_USE_DECRYPTION, pk_algo, NULL, nbits, NULL)) { log_error ("certificate ID 0x%08lX not suitable for " diff --git a/sm/encrypt.c b/sm/encrypt.c index 9957bb90f..2819a22b5 100644 --- a/sm/encrypt.c +++ b/sm/encrypt.c @@ -407,9 +407,9 @@ gpgsm_encrypt (ctrl_t ctrl, certlist_t recplist, int data_fd, estream_t out_fp) } /* Check compliance. */ - if (! gnupg_cipher_is_allowed (opt.compliance, 1, - gcry_cipher_map_name (opt.def_cipher_algoid), - gcry_cipher_mode_from_oid (opt.def_cipher_algoid))) + if (!gnupg_cipher_is_allowed + (opt.compliance, 1, gcry_cipher_map_name (opt.def_cipher_algoid), + gcry_cipher_mode_from_oid (opt.def_cipher_algoid))) { log_error (_("you may not use cipher algorithm '%s'" " while in %s mode\n"), diff --git a/sm/gpgsm.c b/sm/gpgsm.c index 5277140f2..4e337fe8c 100644 --- a/sm/gpgsm.c +++ b/sm/gpgsm.c @@ -1625,11 +1625,13 @@ main ( int argc, char **argv) GCRY_CIPHER_MODE_NONE) && ! gnupg_cipher_is_allowed (opt.compliance, cmd == aEncr || cmd == aSignEncr, - gcry_cipher_mode_from_oid (opt.def_cipher_algoid), + gcry_cipher_mode_from_oid + (opt.def_cipher_algoid), GCRY_CIPHER_MODE_NONE)) log_error (_("you may not use cipher algorithm '%s'" " while in %s mode\n"), - opt.def_cipher_algoid, gnupg_compliance_option_string (opt.compliance)); + opt.def_cipher_algoid, + gnupg_compliance_option_string (opt.compliance)); if (forced_digest_algo && ! gnupg_digest_is_allowed (opt.compliance, @@ -1639,7 +1641,8 @@ main ( int argc, char **argv) opt.forced_digest_algo)) log_error (_("you may not use digest algorithm '%s'" " while in %s mode\n"), - forced_digest_algo, gnupg_compliance_option_string (opt.compliance)); + forced_digest_algo, + gnupg_compliance_option_string (opt.compliance)); if (extra_digest_algo && ! gnupg_digest_is_allowed (opt.compliance, @@ -1649,7 +1652,8 @@ main ( int argc, char **argv) opt.extra_digest_algo)) log_error (_("you may not use digest algorithm '%s'" " while in %s mode\n"), - forced_digest_algo, gnupg_compliance_option_string (opt.compliance)); + forced_digest_algo, + gnupg_compliance_option_string (opt.compliance)); if (log_get_errorcount(0)) gpgsm_exit(2); |