summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2010-01-08 13:36:37 -0700
committerGünther Deschner <gd@samba.org>2010-03-24 17:34:53 +0100
commite0c7d9c8aa10ee0eb927d248b3d46fb0f0a52524 (patch)
tree65ecb84d5aba51c7bd82df06b58ee5620d24421c
parentc64e6e0a0fd29fb462af90a2a0195280ef5e0696 (diff)
downloadsamba-e0c7d9c8aa10ee0eb927d248b3d46fb0f0a52524.tar.gz
samba-e0c7d9c8aa10ee0eb927d248b3d46fb0f0a52524.tar.bz2
samba-e0c7d9c8aa10ee0eb927d248b3d46fb0f0a52524.zip
s4:ntlmssp: rename calc_ntlmv2_key => calc_ntlmv2_key_talloc
metze Signed-off-by: Günther Deschner <gd@samba.org>
-rw-r--r--source4/auth/ntlmssp/ntlmssp_sign.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/auth/ntlmssp/ntlmssp_sign.c b/source4/auth/ntlmssp/ntlmssp_sign.c
index 3b25db571e..56d7cbac59 100644
--- a/source4/auth/ntlmssp/ntlmssp_sign.c
+++ b/source4/auth/ntlmssp/ntlmssp_sign.c
@@ -40,7 +40,7 @@
*
*/
-static void calc_ntlmv2_key(TALLOC_CTX *mem_ctx,
+static void calc_ntlmv2_key_talloc(TALLOC_CTX *mem_ctx,
DATA_BLOB *subkey,
DATA_BLOB session_key,
const char *constant)
@@ -413,7 +413,7 @@ NTSTATUS ntlmssp_sign_init(struct ntlmssp_state *ntlmssp_state)
weak_session_key.length);
/* SEND: sign key */
- calc_ntlmv2_key(ntlmssp_state,
+ calc_ntlmv2_key_talloc(ntlmssp_state,
&ntlmssp_state->crypt.ntlm2.send_sign_key,
ntlmssp_state->session_key, send_sign_const);
dump_data_pw("NTLMSSP send sign key:\n",
@@ -421,7 +421,7 @@ NTSTATUS ntlmssp_sign_init(struct ntlmssp_state *ntlmssp_state)
ntlmssp_state->crypt.ntlm2.send_sign_key.length);
/* SEND: seal ARCFOUR pad */
- calc_ntlmv2_key(mem_ctx,
+ calc_ntlmv2_key_talloc(mem_ctx,
&send_seal_key,
weak_session_key, send_seal_const);
dump_data_pw("NTLMSSP send seal key:\n",
@@ -437,7 +437,7 @@ NTSTATUS ntlmssp_sign_init(struct ntlmssp_state *ntlmssp_state)
ntlmssp_state->crypt.ntlm2.send_seq_num = 0;
/* RECV: sign key */
- calc_ntlmv2_key(ntlmssp_state,
+ calc_ntlmv2_key_talloc(ntlmssp_state,
&ntlmssp_state->crypt.ntlm2.recv_sign_key,
ntlmssp_state->session_key, recv_sign_const);
dump_data_pw("NTLMSSP recv sign key:\n",
@@ -445,7 +445,7 @@ NTSTATUS ntlmssp_sign_init(struct ntlmssp_state *ntlmssp_state)
ntlmssp_state->crypt.ntlm2.recv_sign_key.length);
/* RECV: seal ARCFOUR pad */
- calc_ntlmv2_key(mem_ctx,
+ calc_ntlmv2_key_talloc(mem_ctx,
&recv_seal_key,
weak_session_key, recv_seal_const);
dump_data_pw("NTLMSSP recv seal key:\n",