aboutsummaryrefslogtreecommitdiffstats
path: root/g10/mainproc.c
diff options
context:
space:
mode:
authorJustus Winter <[email protected]>2017-06-07 14:09:07 +0000
committerJustus Winter <[email protected]>2017-06-07 14:54:44 +0000
commite051e396156211449568afa0ca7505dc13eaa3b4 (patch)
treef576501d9ac2c1eddeab08b8dc7182f314b685b8 /g10/mainproc.c
parentcommon,gpg,sm: Initialize compliance module. (diff)
downloadgnupg-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 '')
-rw-r--r--g10/mainproc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/mainproc.c b/g10/mainproc.c
index 21ea6cafb..26cd0a9cc 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -607,7 +607,7 @@ proc_encrypted (CTX c, PACKET *pkt)
/* Overriding session key voids compliance. */
&& opt.override_session_key == NULL
/* Check symmetric cipher. */
- && gnupg_cipher_is_compliant (CO_DE_VS, c->dek->algo))
+ && gnupg_cipher_is_compliant (CO_DE_VS, c->dek->algo, GCRY_CIPHER_MODE_CFB))
{
struct kidlist_item *i;
int compliant = 1;