diff options
| author | Ralph Boehme <slow@samba.org> | 2016-03-22 16:25:32 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2016-03-30 04:37:55 +0200 |
| commit | 0b05bc97d72fd15c6cb7c2115dd3c34f1d5fc225 (patch) | |
| tree | 612f0260f7e3682e7b0c77be3d2b50d55c0a6241 /libcli | |
| parent | cc8bbc363c2a5d59ce7a83d3b70885092a69a275 (diff) | |
| download | samba-0b05bc97d72fd15c6cb7c2115dd3c34f1d5fc225.tar.gz | |
CVE-2016-2114: libcli/smb: let mandatory signing imply allowed signing
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>
Diffstat (limited to 'libcli')
| -rw-r--r-- | libcli/smb/smb_signing.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libcli/smb/smb_signing.c b/libcli/smb/smb_signing.c index e128e8f8a0b..a7bc819f489 100644 --- a/libcli/smb/smb_signing.c +++ b/libcli/smb/smb_signing.c @@ -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; } |