[SCM] Samba Shared Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  f981257 libcli/smb/smb2_signing: rename smb2_key_deviration -> smb2_key_derivation
      from  65d42ab s3:torture/test_smb2: test path based calls during reauth in SMB2-MULTI-CHANNEL

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit f981257240976bbc88251248ad9a7f56277e22a8
Author: Michael Adam <obnox at samba.org>
Date:   Wed Feb 29 05:49:49 2012 +0100

    libcli/smb/smb2_signing: rename smb2_key_deviration -> smb2_key_derivation
    
    Autobuild-User: Michael Adam <obnox at samba.org>
    Autobuild-Date: Wed Feb 29 09:01:54 CET 2012 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 libcli/smb/smb2_signing.c |    2 +-
 libcli/smb/smb2_signing.h |    2 +-
 libcli/smb/smbXcli_base.c |    6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/smb/smb2_signing.c b/libcli/smb/smb2_signing.c
index 4204ed1..43c9ba5 100644
--- a/libcli/smb/smb2_signing.c
+++ b/libcli/smb/smb2_signing.c
@@ -176,7 +176,7 @@ NTSTATUS smb2_signing_check_pdu(DATA_BLOB signing_key,
 	return NT_STATUS_OK;
 }
 
-void smb2_key_deviration(const uint8_t *KI, size_t KI_len,
+void smb2_key_derivation(const uint8_t *KI, size_t KI_len,
 			 const uint8_t *Label, size_t Label_len,
 			 const uint8_t *Context, size_t Context_len,
 			 uint8_t KO[16])
diff --git a/libcli/smb/smb2_signing.h b/libcli/smb/smb2_signing.h
index 34d8ba2..200274b 100644
--- a/libcli/smb/smb2_signing.h
+++ b/libcli/smb/smb2_signing.h
@@ -33,7 +33,7 @@ NTSTATUS smb2_signing_check_pdu(DATA_BLOB signing_key,
 				const struct iovec *vector,
 				int count);
 
-void smb2_key_deviration(const uint8_t *KI, size_t KI_len,
+void smb2_key_derivation(const uint8_t *KI, size_t KI_len,
 			 const uint8_t *Label, size_t Label_len,
 			 const uint8_t *Context, size_t Context_len,
 			 uint8_t KO[16]);
diff --git a/libcli/smb/smbXcli_base.c b/libcli/smb/smbXcli_base.c
index e64a9c7..bdb6e48 100644
--- a/libcli/smb/smbXcli_base.c
+++ b/libcli/smb/smbXcli_base.c
@@ -4143,7 +4143,7 @@ NTSTATUS smb2cli_session_set_session_key(struct smbXcli_session *session,
 		const DATA_BLOB context = _STRING_BLOB("SmbSign");
 #undef _STRING_BLOB
 
-		smb2_key_deviration(session_key, sizeof(session_key),
+		smb2_key_derivation(session_key, sizeof(session_key),
 				    label.data, label.length,
 				    context.data, context.length,
 				    session->smb2.signing_key.data);
@@ -4162,7 +4162,7 @@ NTSTATUS smb2cli_session_set_session_key(struct smbXcli_session *session,
 		const DATA_BLOB context = _STRING_BLOB("SmbRpc");
 #undef _STRING_BLOB
 
-		smb2_key_deviration(session_key, sizeof(session_key),
+		smb2_key_derivation(session_key, sizeof(session_key),
 				    label.data, label.length,
 				    context.data, context.length,
 				    session->smb2.application_key.data);
@@ -4267,7 +4267,7 @@ NTSTATUS smb2cli_session_set_channel_key(struct smbXcli_session *session,
 		const DATA_BLOB context = _STRING_BLOB("SmbSign");
 #undef _STRING_BLOB
 
-		smb2_key_deviration(channel_key, sizeof(channel_key),
+		smb2_key_derivation(channel_key, sizeof(channel_key),
 				    label.data, label.length,
 				    context.data, context.length,
 				    session->smb2.channel_signing_key.data);


-- 
Samba Shared Repository