sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

libcli: add getters for smb2 {signing,encryption,decryption} keys

Browse Source 
Adds:
- smb2cli_session_signing_key()
- smb2cli_session_encryption_key()
- smb2cli_session_decryption_key()

Signed-off-by: Aurelien Aptel <aaptel@suse.com>
Reviewed-by: Noel Power <npower@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
This commit is contained in:
Aurelien Aptel 2019-02-06 19:23:35 +01:00 committed by David Disseldorp
parent 7ff94b18e2
commit 67825c9647
2 changed files with 88 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
libcli/smb/smbXcli_base.c
View File

@ -5561,6 +5561,85 @@ bool smbXcli_session_is_authenticated(struct smbXcli_session *session)
return true;
}
NTSTATUS smb2cli_session_signing_key(struct smbXcli_session *session,
TALLOC_CTX *mem_ctx,
DATA_BLOB *key)
{
DATA_BLOB *sig = NULL;
if (session->conn == NULL) {
return NT_STATUS_NO_USER_SESSION_KEY;
}
/*
* Use channel signing key if there is one, otherwise fallback
* to session.
*/
if (session->smb2_channel.signing_key.length != 0) {
sig = &session->smb2_channel.signing_key;
} else if (session->smb2->signing_key.length != 0) {
sig = &session->smb2->signing_key;
} else {
return NT_STATUS_NO_USER_SESSION_KEY;
}
*key = data_blob_dup_talloc(mem_ctx, *sig);
if (key->data == NULL) {
return NT_STATUS_NO_MEMORY;
}
return NT_STATUS_OK;
}
NTSTATUS smb2cli_session_encryption_key(struct smbXcli_session *session,
TALLOC_CTX *mem_ctx,
DATA_BLOB *key)
{
if (session->conn == NULL) {
return NT_STATUS_NO_USER_SESSION_KEY;
}
if (session->conn->protocol < PROTOCOL_SMB3_00) {
return NT_STATUS_NO_USER_SESSION_KEY;
}
if (session->smb2->encryption_key.length == 0) {
return NT_STATUS_NO_USER_SESSION_KEY;
}
*key = data_blob_dup_talloc(mem_ctx, session->smb2->encryption_key);
if (key->data == NULL) {
return NT_STATUS_NO_MEMORY;
}
return NT_STATUS_OK;
}
NTSTATUS smb2cli_session_decryption_key(struct smbXcli_session *session,
TALLOC_CTX *mem_ctx,
DATA_BLOB *key)
{
if (session->conn == NULL) {
return NT_STATUS_NO_USER_SESSION_KEY;
}
if (session->conn->protocol < PROTOCOL_SMB3_00) {
return NT_STATUS_NO_USER_SESSION_KEY;
}
if (session->smb2->decryption_key.length == 0) {
return NT_STATUS_NO_USER_SESSION_KEY;
}
*key = data_blob_dup_talloc(mem_ctx, session->smb2->decryption_key);
if (key->data == NULL) {
return NT_STATUS_NO_MEMORY;
}
return NT_STATUS_OK;
}
NTSTATUS smbXcli_session_application_key(struct smbXcli_session *session,
TALLOC_CTX *mem_ctx,
DATA_BLOB *key)

9
libcli/smb/smbXcli_base.h
View File

@ -468,6 +468,15 @@ struct smbXcli_session *smbXcli_session_copy(TALLOC_CTX *mem_ctx,
struct smbXcli_session *src);
bool smbXcli_session_is_guest(struct smbXcli_session *session);
bool smbXcli_session_is_authenticated(struct smbXcli_session *session);
NTSTATUS smb2cli_session_signing_key(struct smbXcli_session *session,
TALLOC_CTX *mem_ctx,
DATA_BLOB *key);
NTSTATUS smb2cli_session_encryption_key(struct smbXcli_session *session,
TALLOC_CTX *mem_ctx,
DATA_BLOB *key);
NTSTATUS smb2cli_session_decryption_key(struct smbXcli_session *session,
TALLOC_CTX *mem_ctx,
DATA_BLOB *key);
NTSTATUS smbXcli_session_application_key(struct smbXcli_session *session,
TALLOC_CTX *mem_ctx,
DATA_BLOB *key);