libcli/smb/smb2_signing: rename smb2_key_deviration -> smb2_key_derivation

Autobuild-User: Michael Adam <obnox@samba.org>
Autobuild-Date: Wed Feb 29 09:01:54 CET 2012 on sn-devel-104

diff --git a/libcli/smb/smb2_signing.c b/libcli/smb/smb2_signing.c
index 4204ed1f85a13a5e9c2628d0f6488951861f74ec..43c9ba5c1c00a85092a8ef8534efc29efc90e9a3 100644 (file)
--- 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 34d8ba2f4e9176d60eff8386ee8872559392b8fa..200274ba6d3049c61be31e1dddbdc481c5d0a578 100644 (file)
--- 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 e64a9c7ddd4d33603bbaa2dd73698ba9f2ca9fbb..bdb6e48030894bded07d5f43e5047e0a5cac285b 100644 (file)
--- 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);