security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

gpg: Fix computation of compliance with CO_DE_VS. 

* g10/mainproc.c (proc_encrypted): Symmetric encryption is also in
compliance with CO_DE_VS.

GnuPG-bug-id: 3059
Signed-off-by: Justus Winter <justus@g10code.com>
This commit is contained in:
Justus Winter 2017-06-08 13:55:47 +02:00
parent 9b43220b8a
commit b03fab09e1
No known key found for this signature in database
GPG Key ID: DD1A52F9DA8C9020
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
g10/mainproc.c
View File

@ -602,8 +602,8 @@ proc_encrypted (CTX c, PACKET *pkt)
/* Compute compliance with CO_DE_VS. */
if (!result && is_status_enabled ()
/* Symmetric encryption voids compliance. */
&& c->symkeys == 0
/* Symmetric encryption and asymmetric encryption voids compliance. */
&& ((c->symkeys > 0) != (c->pkenc_list != NULL))
/* Overriding session key voids compliance. */
&& opt.override_session_key == NULL
/* Check symmetric cipher. */
@ -613,7 +613,8 @@ proc_encrypted (CTX c, PACKET *pkt)
int compliant = 1;
PKT_public_key *pk = xmalloc (sizeof *pk);
log_assert (c->pkenc_list || !"where else did the session key come from!?");
log_assert (c->pkenc_list || c->symkeys
|| !"where else did the session key come from!?");
/* Now check that every key used to encrypt the session key is
* compliant. */