diff options
| author | Stefan Metzmacher <metze@samba.org> | 2012-02-27 09:27:51 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-02-27 12:51:34 +0100 |
| commit | 7309e11ad58eb562859190ce99cb51ecbacbc540 (patch) | |
| tree | 96a072dea51612e7d6e7fc64cefe873c98a10d19 /libcli/smb/smb2_signing.c | |
| parent | 910251e8ed89c3ffe769a1007ec197c9c58805b3 (diff) | |
| download | samba-7309e11ad58eb562859190ce99cb51ecbacbc540.tar.gz samba-7309e11ad58eb562859190ce99cb51ecbacbc540.tar.bz2 samba-7309e11ad58eb562859190ce99cb51ecbacbc540.zip | |
libcli/smb/smb2_signing: rename session_key to signing_key
metze
Diffstat (limited to 'libcli/smb/smb2_signing.c')
| -rw-r--r-- | libcli/smb/smb2_signing.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libcli/smb/smb2_signing.c b/libcli/smb/smb2_signing.c index 3687ace9b4..d3ff4c04e7 100644 --- a/libcli/smb/smb2_signing.c +++ b/libcli/smb/smb2_signing.c @@ -23,7 +23,7 @@ #include "../libcli/smb/smb_common.h" #include "../lib/crypto/crypto.h" -NTSTATUS smb2_signing_sign_pdu(DATA_BLOB session_key, +NTSTATUS smb2_signing_sign_pdu(DATA_BLOB signing_key, struct iovec *vector, int count) { @@ -52,9 +52,9 @@ NTSTATUS smb2_signing_sign_pdu(DATA_BLOB session_key, return NT_STATUS_OK; } - if (session_key.length == 0) { + if (signing_key.length == 0) { DEBUG(2,("Wrong session key length %u for SMB2 signing\n", - (unsigned)session_key.length)); + (unsigned)signing_key.length)); return NT_STATUS_ACCESS_DENIED; } @@ -63,7 +63,7 @@ NTSTATUS smb2_signing_sign_pdu(DATA_BLOB session_key, SIVAL(hdr, SMB2_HDR_FLAGS, IVAL(hdr, SMB2_HDR_FLAGS) | SMB2_HDR_FLAG_SIGNED); ZERO_STRUCT(m); - hmac_sha256_init(session_key.data, MIN(session_key.length, 16), &m); + hmac_sha256_init(signing_key.data, MIN(signing_key.length, 16), &m); for (i=0; i < count; i++) { hmac_sha256_update((const uint8_t *)vector[i].iov_base, vector[i].iov_len, &m); @@ -76,7 +76,7 @@ NTSTATUS smb2_signing_sign_pdu(DATA_BLOB session_key, return NT_STATUS_OK; } -NTSTATUS smb2_signing_check_pdu(DATA_BLOB session_key, +NTSTATUS smb2_signing_check_pdu(DATA_BLOB signing_key, const struct iovec *vector, int count) { @@ -107,7 +107,7 @@ NTSTATUS smb2_signing_check_pdu(DATA_BLOB session_key, return NT_STATUS_OK; } - if (session_key.length == 0) { + if (signing_key.length == 0) { /* we don't have the session key yet */ return NT_STATUS_OK; } @@ -115,7 +115,7 @@ NTSTATUS smb2_signing_check_pdu(DATA_BLOB session_key, sig = hdr+SMB2_HDR_SIGNATURE; ZERO_STRUCT(m); - hmac_sha256_init(session_key.data, MIN(session_key.length, 16), &m); + hmac_sha256_init(signing_key.data, MIN(signing_key.length, 16), &m); hmac_sha256_update(hdr, SMB2_HDR_SIGNATURE, &m); hmac_sha256_update(zero_sig, 16, &m); for (i=1; i < count; i++) { |