sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-06 13:18:07 +03:00
Code

CVE-2017-12151: s3:libsmb: add cli_state_is_encryption_on() helper function

Browse Source 
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 <metze@samba.org>
This commit is contained in:
Stefan Metzmacher 2017-08-14 12:13:18 +02:00 committed by Karolin Seeger
parent 81f1804d45
commit 17019aa27f
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source3/libsmb/clientgen.c
View File

@ -339,6 +339,19 @@ uint16_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)
{
uint16_t tid = cli_state_get_tid(cli);

1
source3/libsmb/proto.h
View File

@ -174,6 +174,7 @@ const char *cli_state_remote_realm(struct cli_state *cli);
uint16_t cli_state_get_vc_num(struct cli_state *cli);
uint16_t cli_setpid(struct cli_state *cli, uint16_t pid);
uint16_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);
uint16_t cli_state_get_tid(struct cli_state *cli);
uint16_t cli_state_set_tid(struct cli_state *cli, uint16_t tid);