sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-19 18:50:24 +03:00
Code

libcli/smb: make use of data_blob_string_const_null()

Browse Source 
metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Mon Apr 16 12:21:17 CEST 2012 on sn-devel-104
This commit is contained in:
Stefan Metzmacher 2012-04-16 10:25:12 +02:00
parent 1e7f8d5ad0
commit b23f5a9418
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libcli/smb/smbXcli_base.c
View File

@ -4145,10 +4145,8 @@ NTSTATUS smb2cli_session_set_session_key(struct smbXcli_session *session,
}
if (conn->protocol >= PROTOCOL_SMB2_24) {
#define _STRING_BLOB(x) data_blob_const((const uint8_t *)(x), sizeof(x))
const DATA_BLOB label = _STRING_BLOB("SMB2AESCMAC");
const DATA_BLOB context = _STRING_BLOB("SmbSign");
#undef _STRING_BLOB
const DATA_BLOB label = data_blob_string_const_null("SMB2AESCMAC");
const DATA_BLOB context = data_blob_string_const_null("SmbSign");
smb2_key_derivation(session_key, sizeof(session_key),
label.data, label.length,
@ -4164,10 +4162,8 @@ NTSTATUS smb2cli_session_set_session_key(struct smbXcli_session *session,
}
if (conn->protocol >= PROTOCOL_SMB2_24) {
#define _STRING_BLOB(x) data_blob_const((const uint8_t *)(x), sizeof(x))
const DATA_BLOB label = _STRING_BLOB("SMB2APP");
const DATA_BLOB context = _STRING_BLOB("SmbRpc");
#undef _STRING_BLOB
const DATA_BLOB label = data_blob_string_const_null("SMB2APP");
const DATA_BLOB context = data_blob_string_const_null("SmbRpc");
smb2_key_derivation(session_key, sizeof(session_key),
label.data, label.length,
@ -4269,10 +4265,8 @@ NTSTATUS smb2cli_session_set_channel_key(struct smbXcli_session *session,
}
if (conn->protocol >= PROTOCOL_SMB2_24) {
#define _STRING_BLOB(x) data_blob_const((const uint8_t *)(x), sizeof(x))
const DATA_BLOB label = _STRING_BLOB("SMB2AESCMAC");
const DATA_BLOB context = _STRING_BLOB("SmbSign");
#undef _STRING_BLOB
const DATA_BLOB label = data_blob_string_const_null("SMB2AESCMAC");
const DATA_BLOB context = data_blob_string_const_null("SmbSign");
smb2_key_derivation(channel_key, sizeof(channel_key),
label.data, label.length,