diff options
| author | Ralph Boehme <slow@samba.org> | 2015-11-30 17:03:26 +0100 |
|---|---|---|
| committer | Ralph Boehme <slow@samba.org> | 2016-01-22 11:06:05 +0100 |
| commit | b74bef8f7d3452f9a5aee4c934c9ff62afc2b2bd (patch) | |
| tree | 5901f019a48d5f0364f6bf8aa3f08a5edd10357a /source3/utils | |
| parent | f95549957ec73a67bee0093a17e84808adfe97de (diff) | |
| download | samba-b74bef8f7d3452f9a5aee4c934c9ff62afc2b2bd.tar.gz | |
smbstatus: add support for SMB1 signing and CIFS UNIX extensions encryption
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Ralph Böhme <slow@samba.org>
Autobuild-Date(master): Fri Jan 22 11:06:05 CET 2016 on sn-devel-144
Diffstat (limited to 'source3/utils')
| -rw-r--r-- | source3/utils/status.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/source3/utils/status.c b/source3/utils/status.c index 4717234304a..9aefd5eb97f 100644 --- a/source3/utils/status.c +++ b/source3/utils/status.c @@ -322,6 +322,9 @@ static int traverse_connections(const struct connections_key *key, if (smbXsrv_is_encrypted(crec->encryption_flags)) { switch (crec->cipher) { + case SMB_ENCRYPTION_GSSAPI: + encryption = "GSSAPI"; + break; case SMB2_ENCRYPTION_AES128_CCM: encryption = "AES-128-CCM"; break; @@ -340,6 +343,8 @@ static int traverse_connections(const struct connections_key *key, signing = "AES-128-CMAC"; } else if (crec->dialect >= SMB2_DIALECT_REVISION_202) { signing = "HMAC-SHA256"; + } else { + signing = "HMAC-MD5"; } } @@ -416,6 +421,9 @@ static int traverse_sessionid(const char *key, struct sessionid *session, } } else if (smbXsrv_is_partially_encrypted(session->encryption_flags)) { switch (session->cipher) { + case SMB_ENCRYPTION_GSSAPI: + encryption = "partial(GSSAPI)"; + break; case SMB2_ENCRYPTION_AES128_CCM: encryption = "partial(AES-128-CCM)"; break; @@ -434,12 +442,16 @@ static int traverse_sessionid(const char *key, struct sessionid *session, signing = "AES-128-CMAC"; } else if (session->connection_dialect >= SMB2_DIALECT_REVISION_202) { signing = "HMAC-SHA256"; + } else { + signing = "HMAC-MD5"; } } else if (smbXsrv_is_partially_signed(session->signing_flags)) { if (session->connection_dialect >= SMB3_DIALECT_REVISION_302) { signing = "partial(AES-128-CMAC)"; } else if (session->connection_dialect >= SMB2_DIALECT_REVISION_202) { signing = "partial(HMAC-SHA256)"; + } else { + signing = "partial(HMAC-MD5)"; } } |