From c38e3a7086164b1c58e003dd627b207ffcbe856e Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 14 Aug 2017 12:13:18 +0200 Subject: [PATCH] CVE-2017-12151: s3:libsmb: add cli_state_is_encryption_on() helper function This allows to check if the current cli_state uses encryption (either via unix extentions or via SMB3). BUG: https://bugzilla.samba.org/show_bug.cgi?id=12996 Signed-off-by: Stefan Metzmacher --- source3/libsmb/clientgen.c | 13 +++++++++++++ source3/libsmb/proto.h | 1 + 2 files changed, 14 insertions(+) diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c index 039176e5cac..44afee1d4a0 100644 --- a/source3/libsmb/clientgen.c +++ b/source3/libsmb/clientgen.c @@ -321,6 +321,19 @@ uint32_t cli_getpid(struct cli_state *cli) return cli->smb1.pid; } +bool cli_state_is_encryption_on(struct cli_state *cli) +{ + if (smbXcli_conn_protocol(cli->conn) < PROTOCOL_SMB2_02) { + return smb1cli_conn_encryption_on(cli->conn); + } + + if (cli->smb2.tcon == NULL) { + return false; + } + + return smb2cli_tcon_is_encryption_on(cli->smb2.tcon); +} + bool cli_state_has_tcon(struct cli_state *cli) { uint32_t tid; diff --git a/source3/libsmb/proto.h b/source3/libsmb/proto.h index d0326258030..11fa409c821 100644 --- a/source3/libsmb/proto.h +++ b/source3/libsmb/proto.h @@ -193,6 +193,7 @@ void cli_shutdown(struct cli_state *cli); uint16_t cli_state_get_vc_num(struct cli_state *cli); uint32_t cli_setpid(struct cli_state *cli, uint32_t pid); uint32_t cli_getpid(struct cli_state *cli); +bool cli_state_is_encryption_on(struct cli_state *cli); bool cli_state_has_tcon(struct cli_state *cli); uint32_t cli_state_get_tid(struct cli_state *cli); uint32_t cli_state_set_tid(struct cli_state *cli, uint32_t tid); -- 2.11.4.GIT