CVE-2016-2114: libcli/smb: let mandatory signing imply allowed signing
authorRalph Boehme <slow@samba.org>
Tue, 22 Mar 2016 15:25:32 +0000 (16:25 +0100)
committerStefan Metzmacher <metze@samba.org>
Tue, 12 Apr 2016 17:25:26 +0000 (19:25 +0200)
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11687

Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>

Signed-off-by: Ralph Boehme <slow@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: G√ľnther Deschner <gd@samba.org>
libcli/smb/smb_signing.c

index e128e8f8a0bd77ca35a10af4251beb1f0d493e02..a7bc819f48965c8e040b74fd4635f827005bbc9d 100644 (file)
@@ -424,6 +424,10 @@ bool smb_signing_set_negotiated(struct smb_signing_state *si,
                return true;
        }
 
+       if (mandatory) {
+               allowed = true;
+       }
+
        if (!si->allowed && mandatory) {
                return false;
        }