diff options
| author | Justus Winter <[email protected]> | 2017-06-06 14:01:40 +0000 |
|---|---|---|
| committer | Justus Winter <[email protected]> | 2017-06-08 12:22:54 +0000 |
| commit | a64a55e10420cf11e00062b590dffe5d0c3e8192 (patch) | |
| tree | 28b9c216316dd1a1aa48b397f68f475023dfea03 /g10/decrypt-data.c | |
| parent | gpg: Fix computation of compliance with CO_DE_VS. (diff) | |
| download | gnupg-a64a55e10420cf11e00062b590dffe5d0c3e8192.tar.gz gnupg-a64a55e10420cf11e00062b590dffe5d0c3e8192.zip | |
common,gpg,sm: Restrict the use of algorithms according to CO_DE_VS.
* common/compliance.c (gnupg_pk_is_allowed): New function.
(gnupg_cipher_is_allowed): Likewise.
(gnupg_digest_is_allowed): Likewise.
* common/compliance.h (enum pk_use_case): New definition.
(gnupg_pk_is_allowed): New prototype.
(gnupg_cipher_is_allowed): Likewise.
(gnupg_digest_is_allowed): Likewise.
* g10/decrypt-data.c (decrypt_data): Restrict use of algorithms using
the new predicates.
* g10/encrypt.c (encrypt_crypt): Likewise.
* g10/gpg.c (main): Likewise.
* g10/pubkey-enc.c (get_session_key): Likewise.
* g10/sig-check.c (check_signature2): Likewise.
* g10/sign.c (do_sign): Likewise.
* sm/decrypt.c (gpgsm_decrypt): Likewise.
* sm/encrypt.c (gpgsm_encrypt): Likewise.
* sm/gpgsm.c (main): Likewise.
* sm/sign.c (gpgsm_sign): Likewise.
* sm/verify.c (gpgsm_verify): Likewise.
--
With this change, policies can effectively restrict what algorithms
are used for different purposes. The algorithm policy for CO_DE_VS is
implemented.
GnuPG-bug-id: 3191
Signed-off-by: Justus Winter <[email protected]>
Diffstat (limited to 'g10/decrypt-data.c')
| -rw-r--r-- | g10/decrypt-data.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/g10/decrypt-data.c b/g10/decrypt-data.c index 96e2487ec..702330185 100644 --- a/g10/decrypt-data.c +++ b/g10/decrypt-data.c @@ -29,6 +29,7 @@ #include "options.h" #include "../common/i18n.h" #include "../common/status.h" +#include "../common/compliance.h" static int mdc_decode_filter ( void *opaque, int control, IOBUF a, @@ -97,6 +98,17 @@ decrypt_data (ctrl_t ctrl, void *procctx, PKT_encrypted *ed, DEK *dek) dek->algo_info_printed = 1; } + /* Check compliance. */ + if (! gnupg_cipher_is_allowed (opt.compliance, 0, dek->algo, GCRY_CIPHER_MODE_CFB)) + { + log_error (_ ("you may not use cipher algorithm '%s'" + " while in %s mode\n"), + openpgp_cipher_algo_name (dek->algo), + gnupg_compliance_option_string (opt.compliance)); + rc = gpg_error (GPG_ERR_CIPHER_ALGO); + goto leave; + } + { char buf[20]; |