From 25a89b701596aea4e62ffdf11777022687ea5f44 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 7 Jan 2010 10:10:13 +0100 Subject: s4:ntlmssp: move sign/seal states to a private ntlmssp_crypt_state union MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit metze Signed-off-by: Günther Deschner --- source4/auth/ntlmssp/ntlmssp.h | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) (limited to 'source4/auth/ntlmssp/ntlmssp.h') diff --git a/source4/auth/ntlmssp/ntlmssp.h b/source4/auth/ntlmssp/ntlmssp.h index e8035661ce..6276c9e03e 100644 --- a/source4/auth/ntlmssp/ntlmssp.h +++ b/source4/auth/ntlmssp/ntlmssp.h @@ -44,6 +44,8 @@ enum ntlmssp_message_type #define NTLMSSP_FEATURE_SEAL 0x00000004 #define NTLMSSP_FEATURE_CCACHE 0x00000008 +union ntlmssp_crypt_state; + struct ntlmssp_state { enum ntlmssp_role role; @@ -127,23 +129,7 @@ struct ntlmssp_state */ NTSTATUS (*check_password)(struct ntlmssp_state *ntlmssp_state, DATA_BLOB *nt_session_key, DATA_BLOB *lm_session_key); - union { - /* NTLM */ - struct { - uint32_t seq_num; - struct arcfour_state *arcfour_state; - } ntlm; - - /* NTLM2 */ - struct { - uint32_t send_seq_num; - uint32_t recv_seq_num; - uint8_t send_sign_key[16]; - uint8_t recv_sign_key[16]; - struct arcfour_state *send_seal_arcfour_state; - struct arcfour_state *recv_seal_arcfour_state; - } ntlm2; - } crypt; + union ntlmssp_crypt_state *crypt; }; struct gensec_ntlmssp_context { -- cgit