diff options
| author | Michael Adam <obnox@samba.org> | 2012-02-29 05:49:49 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2012-02-29 09:01:54 +0100 |
| commit | f981257240976bbc88251248ad9a7f56277e22a8 (patch) | |
| tree | f948bd667ed938902b9e8f68f6daed507607ad9a | |
| parent | 65d42ab727d4a335ef4265030d16d31aae015371 (diff) | |
| download | samba-f981257240976bbc88251248ad9a7f56277e22a8.tar.gz samba-f981257240976bbc88251248ad9a7f56277e22a8.tar.bz2 samba-f981257240976bbc88251248ad9a7f56277e22a8.zip | |
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
| -rw-r--r-- | libcli/smb/smb2_signing.c | 2 | ||||
| -rw-r--r-- | libcli/smb/smb2_signing.h | 2 | ||||
| -rw-r--r-- | libcli/smb/smbXcli_base.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libcli/smb/smb2_signing.c b/libcli/smb/smb2_signing.c index 4204ed1f85..43c9ba5c1c 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 34d8ba2f4e..200274ba6d 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 e64a9c7ddd..bdb6e48030 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); |