diff options
| author | Justus Winter <[email protected]> | 2017-06-07 14:09:07 +0000 |
|---|---|---|
| committer | Justus Winter <[email protected]> | 2017-06-07 14:54:44 +0000 |
| commit | e051e396156211449568afa0ca7505dc13eaa3b4 (patch) | |
| tree | f576501d9ac2c1eddeab08b8dc7182f314b685b8 /common/compliance.c | |
| parent | common,gpg,sm: Initialize compliance module. (diff) | |
| download | gnupg-e051e396156211449568afa0ca7505dc13eaa3b4.tar.gz gnupg-e051e396156211449568afa0ca7505dc13eaa3b4.zip | |
common: Add cipher mode to compliance predicate.
* common/compliance.c (gnupg_cipher_is_compliant): Add mode parameter.
* common/compliance.h (gnupg_cipher_is_compliant): Likewise.
* g10/mainproc.c (proc_encrypted): Adapt callsite.
* sm/decrypt.c (gpgsm_decrypt): Likewise.
GnuPG-bug-id: 3059
Signed-off-by: Justus Winter <[email protected]>
Diffstat (limited to 'common/compliance.c')
| -rw-r--r-- | common/compliance.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/common/compliance.c b/common/compliance.c index c2daa654e..bcf621a45 100644 --- a/common/compliance.c +++ b/common/compliance.c @@ -193,9 +193,11 @@ gnupg_pk_is_compliant (enum gnupg_compliance_mode compliance, int algo, } -/* Return true if CIPHER is compliant to the given COMPLIANCE mode. */ +/* Return true if (CIPHER, MODE) is compliant to the given COMPLIANCE mode. */ int -gnupg_cipher_is_compliant (enum gnupg_compliance_mode compliance, cipher_algo_t cipher) +gnupg_cipher_is_compliant (enum gnupg_compliance_mode compliance, + cipher_algo_t cipher, + enum gcry_cipher_modes mode) { log_assert (initialized); @@ -208,7 +210,15 @@ gnupg_cipher_is_compliant (enum gnupg_compliance_mode compliance, cipher_algo_t case CIPHER_ALGO_AES192: case CIPHER_ALGO_AES256: case CIPHER_ALGO_3DES: - return 1; + switch (module) + { + case GNUPG_MODULE_NAME_GPG: + return mode == GCRY_CIPHER_MODE_CFB; + case GNUPG_MODULE_NAME_GPGSM: + return mode == GCRY_CIPHER_MODE_CBC; + } + log_assert (!"reached"); + default: return 0; } |