diff options
Diffstat (limited to 'source4/auth/ntlmssp/ntlmssp_server.c')
| -rw-r--r-- | source4/auth/ntlmssp/ntlmssp_server.c | 328 |
1 files changed, 164 insertions, 164 deletions
diff --git a/source4/auth/ntlmssp/ntlmssp_server.c b/source4/auth/ntlmssp/ntlmssp_server.c index 488aa63620..537cf6d383 100644 --- a/source4/auth/ntlmssp/ntlmssp_server.c +++ b/source4/auth/ntlmssp/ntlmssp_server.c @@ -36,15 +36,15 @@ * */ -static NTSTATUS ntlmssp_set_username(struct gensec_ntlmssp_state *gensec_ntlmssp_state, const char *user) +static NTSTATUS ntlmssp_set_username(struct ntlmssp_state *ntlmssp_state, const char *user) { if (!user) { /* it should be at least "" */ DEBUG(1, ("NTLMSSP failed to set username - cannot accept NULL username\n")); return NT_STATUS_INVALID_PARAMETER; } - gensec_ntlmssp_state->user = talloc_strdup(gensec_ntlmssp_state, user); - if (!gensec_ntlmssp_state->user) { + ntlmssp_state->user = talloc_strdup(ntlmssp_state, user); + if (!ntlmssp_state->user) { return NT_STATUS_NO_MEMORY; } return NT_STATUS_OK; @@ -54,10 +54,10 @@ static NTSTATUS ntlmssp_set_username(struct gensec_ntlmssp_state *gensec_ntlmssp * Set a domain on an NTLMSSP context - ensures it is talloc()ed * */ -static NTSTATUS ntlmssp_set_domain(struct gensec_ntlmssp_state *gensec_ntlmssp_state, const char *domain) +static NTSTATUS ntlmssp_set_domain(struct ntlmssp_state *ntlmssp_state, const char *domain) { - gensec_ntlmssp_state->domain = talloc_strdup(gensec_ntlmssp_state, domain); - if (!gensec_ntlmssp_state->domain) { + ntlmssp_state->domain = talloc_strdup(ntlmssp_state, domain); + if (!ntlmssp_state->domain) { return NT_STATUS_NO_MEMORY; } return NT_STATUS_OK; @@ -67,10 +67,10 @@ static NTSTATUS ntlmssp_set_domain(struct gensec_ntlmssp_state *gensec_ntlmssp_s * Set a workstation on an NTLMSSP context - ensures it is talloc()ed * */ -static NTSTATUS ntlmssp_set_workstation(struct gensec_ntlmssp_state *gensec_ntlmssp_state, const char *workstation) +static NTSTATUS ntlmssp_set_workstation(struct ntlmssp_state *ntlmssp_state, const char *workstation) { - gensec_ntlmssp_state->workstation = talloc_strdup(gensec_ntlmssp_state, workstation); - if (!gensec_ntlmssp_state->workstation) { + ntlmssp_state->workstation = talloc_strdup(ntlmssp_state, workstation); + if (!ntlmssp_state->workstation) { return NT_STATUS_NO_MEMORY; } return NT_STATUS_OK; @@ -80,24 +80,24 @@ static NTSTATUS ntlmssp_set_workstation(struct gensec_ntlmssp_state *gensec_ntlm * Determine correct target name flags for reply, given server role * and negotiated flags * - * @param gensec_ntlmssp_state NTLMSSP State + * @param ntlmssp_state NTLMSSP State * @param neg_flags The flags from the packet * @param chal_flags The flags to be set in the reply packet * @return The 'target name' string. */ -static const char *ntlmssp_target_name(struct gensec_ntlmssp_state *gensec_ntlmssp_state, +static const char *ntlmssp_target_name(struct ntlmssp_state *ntlmssp_state, uint32_t neg_flags, uint32_t *chal_flags) { if (neg_flags & NTLMSSP_REQUEST_TARGET) { *chal_flags |= NTLMSSP_NEGOTIATE_TARGET_INFO; *chal_flags |= NTLMSSP_REQUEST_TARGET; - if (gensec_ntlmssp_state->server.is_standalone) { + if (ntlmssp_state->server.is_standalone) { *chal_flags |= NTLMSSP_TARGET_TYPE_SERVER; - return gensec_ntlmssp_state->server.netbios_name; + return ntlmssp_state->server.netbios_name; } else { *chal_flags |= NTLMSSP_TARGET_TYPE_DOMAIN; - return gensec_ntlmssp_state->server.netbios_domain; + return ntlmssp_state->server.netbios_domain; }; } else { return ""; @@ -123,7 +123,7 @@ NTSTATUS ntlmssp_server_negotiate(struct gensec_security *gensec_security, struct gensec_ntlmssp_context *gensec_ntlmssp = talloc_get_type_abort(gensec_security->private_data, struct gensec_ntlmssp_context); - struct gensec_ntlmssp_state *gensec_ntlmssp_state = gensec_ntlmssp->ntlmssp_state; + struct ntlmssp_state *ntlmssp_state = gensec_ntlmssp->ntlmssp_state; DATA_BLOB struct_blob; uint32_t neg_flags = 0; uint32_t ntlmssp_command, chal_flags; @@ -151,10 +151,10 @@ NTSTATUS ntlmssp_server_negotiate(struct gensec_security *gensec_security, debug_ntlmssp_flags(neg_flags); } - ntlmssp_handle_neg_flags(gensec_ntlmssp_state, neg_flags, gensec_ntlmssp_state->allow_lm_key); + ntlmssp_handle_neg_flags(ntlmssp_state, neg_flags, ntlmssp_state->allow_lm_key); /* Ask our caller what challenge they would like in the packet */ - status = gensec_ntlmssp_state->get_challenge(gensec_ntlmssp_state, cryptkey); + status = ntlmssp_state->get_challenge(ntlmssp_state, cryptkey); if (!NT_STATUS_IS_OK(status)) { DEBUG(1, ("ntlmssp_server_negotiate: backend doesn't give a challenge: %s\n", nt_errstr(status))); @@ -162,8 +162,8 @@ NTSTATUS ntlmssp_server_negotiate(struct gensec_security *gensec_security, } /* Check if we may set the challenge */ - if (!gensec_ntlmssp_state->may_set_challenge(gensec_ntlmssp_state)) { - gensec_ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_NTLM2; + if (!ntlmssp_state->may_set_challenge(ntlmssp_state)) { + ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_NTLM2; } /* The flags we send back are not just the negotiated flags, @@ -171,25 +171,25 @@ NTSTATUS ntlmssp_server_negotiate(struct gensec_security *gensec_security, * operate on 'chal_flags' from here on */ - chal_flags = gensec_ntlmssp_state->neg_flags; + chal_flags = ntlmssp_state->neg_flags; /* get the right name to fill in as 'target' */ - target_name = ntlmssp_target_name(gensec_ntlmssp_state, + target_name = ntlmssp_target_name(ntlmssp_state, neg_flags, &chal_flags); if (target_name == NULL) return NT_STATUS_INVALID_PARAMETER; - gensec_ntlmssp_state->chal = data_blob_talloc(gensec_ntlmssp_state, cryptkey, 8); - gensec_ntlmssp_state->internal_chal = data_blob_talloc(gensec_ntlmssp_state, cryptkey, 8); + ntlmssp_state->chal = data_blob_talloc(ntlmssp_state, cryptkey, 8); + ntlmssp_state->internal_chal = data_blob_talloc(ntlmssp_state, cryptkey, 8); /* This creates the 'blob' of names that appears at the end of the packet */ if (chal_flags & NTLMSSP_NEGOTIATE_TARGET_INFO) { msrpc_gen(out_mem_ctx, &struct_blob, "aaaaa", MsvAvNbDomainName, target_name, - MsvAvNbComputerName, gensec_ntlmssp_state->server.netbios_name, - MsvAvDnsDomainName, gensec_ntlmssp_state->server.dns_domain, - MsvAvDnsComputerName, gensec_ntlmssp_state->server.dns_name, + MsvAvNbComputerName, ntlmssp_state->server.netbios_name, + MsvAvDnsDomainName, ntlmssp_state->server.dns_domain, + MsvAvDnsComputerName, ntlmssp_state->server.dns_name, MsvAvEOL, ""); } else { struct_blob = data_blob(NULL, 0); @@ -198,7 +198,7 @@ NTSTATUS ntlmssp_server_negotiate(struct gensec_security *gensec_security, { /* Marshal the packet in the right format, be it unicode or ASCII */ const char *gen_string; - if (gensec_ntlmssp_state->unicode) { + if (ntlmssp_state->unicode) { gen_string = "CdUdbddB"; } else { gen_string = "CdAdbddB"; @@ -215,7 +215,7 @@ NTSTATUS ntlmssp_server_negotiate(struct gensec_security *gensec_security, struct_blob.data, struct_blob.length); } - gensec_ntlmssp_state->expected_state = NTLMSSP_AUTH; + ntlmssp_state->expected_state = NTLMSSP_AUTH; return NT_STATUS_MORE_PROCESSING_REQUIRED; } @@ -223,12 +223,12 @@ NTSTATUS ntlmssp_server_negotiate(struct gensec_security *gensec_security, /** * Next state function for the Authenticate packet * - * @param gensec_ntlmssp_state NTLMSSP State + * @param ntlmssp_state NTLMSSP State * @param request The request, as a DATA_BLOB * @return Errors or NT_STATUS_OK. */ -static NTSTATUS ntlmssp_server_preauth(struct gensec_ntlmssp_state *gensec_ntlmssp_state, +static NTSTATUS ntlmssp_server_preauth(struct ntlmssp_state *ntlmssp_state, const DATA_BLOB request) { uint32_t ntlmssp_command, auth_flags; @@ -245,55 +245,55 @@ static NTSTATUS ntlmssp_server_preauth(struct gensec_ntlmssp_state *gensec_ntlms file_save("ntlmssp_auth.dat", request.data, request.length); #endif - if (gensec_ntlmssp_state->unicode) { + if (ntlmssp_state->unicode) { parse_string = "CdBBUUUBd"; } else { parse_string = "CdBBAAABd"; } /* zero these out */ - data_blob_free(&gensec_ntlmssp_state->session_key); - data_blob_free(&gensec_ntlmssp_state->lm_resp); - data_blob_free(&gensec_ntlmssp_state->nt_resp); - data_blob_free(&gensec_ntlmssp_state->encrypted_session_key); + data_blob_free(&ntlmssp_state->session_key); + data_blob_free(&ntlmssp_state->lm_resp); + data_blob_free(&ntlmssp_state->nt_resp); + data_blob_free(&ntlmssp_state->encrypted_session_key); - gensec_ntlmssp_state->user = NULL; - gensec_ntlmssp_state->domain = NULL; - gensec_ntlmssp_state->workstation = NULL; + ntlmssp_state->user = NULL; + ntlmssp_state->domain = NULL; + ntlmssp_state->workstation = NULL; /* now the NTLMSSP encoded auth hashes */ - if (!msrpc_parse(gensec_ntlmssp_state, + if (!msrpc_parse(ntlmssp_state, &request, parse_string, "NTLMSSP", &ntlmssp_command, - &gensec_ntlmssp_state->lm_resp, - &gensec_ntlmssp_state->nt_resp, + &ntlmssp_state->lm_resp, + &ntlmssp_state->nt_resp, &domain, &user, &workstation, - &gensec_ntlmssp_state->encrypted_session_key, + &ntlmssp_state->encrypted_session_key, &auth_flags)) { DEBUG(10, ("ntlmssp_server_auth: failed to parse NTLMSSP (nonfatal):\n")); dump_data(10, request.data, request.length); /* zero this out */ - data_blob_free(&gensec_ntlmssp_state->encrypted_session_key); + data_blob_free(&ntlmssp_state->encrypted_session_key); auth_flags = 0; /* Try again with a shorter string (Win9X truncates this packet) */ - if (gensec_ntlmssp_state->unicode) { + if (ntlmssp_state->unicode) { parse_string = "CdBBUUU"; } else { parse_string = "CdBBAAA"; } /* now the NTLMSSP encoded auth hashes */ - if (!msrpc_parse(gensec_ntlmssp_state, + if (!msrpc_parse(ntlmssp_state, &request, parse_string, "NTLMSSP", &ntlmssp_command, - &gensec_ntlmssp_state->lm_resp, - &gensec_ntlmssp_state->nt_resp, + &ntlmssp_state->lm_resp, + &ntlmssp_state->nt_resp, &domain, &user, &workstation)) { @@ -305,32 +305,32 @@ static NTSTATUS ntlmssp_server_preauth(struct gensec_ntlmssp_state *gensec_ntlms } if (auth_flags) - ntlmssp_handle_neg_flags(gensec_ntlmssp_state, auth_flags, gensec_ntlmssp_state->allow_lm_key); + ntlmssp_handle_neg_flags(ntlmssp_state, auth_flags, ntlmssp_state->allow_lm_key); - if (!NT_STATUS_IS_OK(nt_status = ntlmssp_set_domain(gensec_ntlmssp_state, domain))) { + if (!NT_STATUS_IS_OK(nt_status = ntlmssp_set_domain(ntlmssp_state, domain))) { /* zero this out */ - data_blob_free(&gensec_ntlmssp_state->encrypted_session_key); + data_blob_free(&ntlmssp_state->encrypted_session_key); return nt_status; } - if (!NT_STATUS_IS_OK(nt_status = ntlmssp_set_username(gensec_ntlmssp_state, user))) { + if (!NT_STATUS_IS_OK(nt_status = ntlmssp_set_username(ntlmssp_state, user))) { /* zero this out */ - data_blob_free(&gensec_ntlmssp_state->encrypted_session_key); + data_blob_free(&ntlmssp_state->encrypted_session_key); return nt_status; } - if (!NT_STATUS_IS_OK(nt_status = ntlmssp_set_workstation(gensec_ntlmssp_state, workstation))) { + if (!NT_STATUS_IS_OK(nt_status = ntlmssp_set_workstation(ntlmssp_state, workstation))) { /* zero this out */ - data_blob_free(&gensec_ntlmssp_state->encrypted_session_key); + data_blob_free(&ntlmssp_state->encrypted_session_key); return nt_status; } DEBUG(3,("Got user=[%s] domain=[%s] workstation=[%s] len1=%lu len2=%lu\n", - gensec_ntlmssp_state->user, gensec_ntlmssp_state->domain, gensec_ntlmssp_state->workstation, (unsigned long)gensec_ntlmssp_state->lm_resp.length, (unsigned long)gensec_ntlmssp_state->nt_resp.length)); + ntlmssp_state->user, ntlmssp_state->domain, ntlmssp_state->workstation, (unsigned long)ntlmssp_state->lm_resp.length, (unsigned long)ntlmssp_state->nt_resp.length)); #if 0 - file_save("nthash1.dat", &gensec_ntlmssp_state->nt_resp.data, &gensec_ntlmssp_state->nt_resp.length); - file_save("lmhash1.dat", &gensec_ntlmssp_state->lm_resp.data, &gensec_ntlmssp_state->lm_resp.length); + file_save("nthash1.dat", &ntlmssp_state->nt_resp.data, &ntlmssp_state->nt_resp.length); + file_save("lmhash1.dat", &ntlmssp_state->lm_resp.data, &ntlmssp_state->lm_resp.length); #endif /* NTLM2 uses a 'challenge' that is made of up both the server challenge, and a @@ -338,38 +338,38 @@ static NTSTATUS ntlmssp_server_preauth(struct gensec_ntlmssp_state *gensec_ntlms However, the NTLM2 flag may still be set for the real NTLMv2 logins, be careful. */ - if (gensec_ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_NTLM2) { - if (gensec_ntlmssp_state->nt_resp.length == 24 && gensec_ntlmssp_state->lm_resp.length == 24) { + if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_NTLM2) { + if (ntlmssp_state->nt_resp.length == 24 && ntlmssp_state->lm_resp.length == 24) { struct MD5Context md5_session_nonce_ctx; - SMB_ASSERT(gensec_ntlmssp_state->internal_chal.data - && gensec_ntlmssp_state->internal_chal.length == 8); + SMB_ASSERT(ntlmssp_state->internal_chal.data + && ntlmssp_state->internal_chal.length == 8); - gensec_ntlmssp_state->doing_ntlm2 = true; + ntlmssp_state->doing_ntlm2 = true; - memcpy(gensec_ntlmssp_state->crypt.ntlm2.session_nonce, gensec_ntlmssp_state->internal_chal.data, 8); - memcpy(&gensec_ntlmssp_state->crypt.ntlm2.session_nonce[8], gensec_ntlmssp_state->lm_resp.data, 8); + memcpy(ntlmssp_state->crypt.ntlm2.session_nonce, ntlmssp_state->internal_chal.data, 8); + memcpy(&ntlmssp_state->crypt.ntlm2.session_nonce[8], ntlmssp_state->lm_resp.data, 8); MD5Init(&md5_session_nonce_ctx); - MD5Update(&md5_session_nonce_ctx, gensec_ntlmssp_state->crypt.ntlm2.session_nonce, 16); + MD5Update(&md5_session_nonce_ctx, ntlmssp_state->crypt.ntlm2.session_nonce, 16); MD5Final(session_nonce_hash, &md5_session_nonce_ctx); - gensec_ntlmssp_state->chal = data_blob_talloc(gensec_ntlmssp_state, + ntlmssp_state->chal = data_blob_talloc(ntlmssp_state, session_nonce_hash, 8); /* LM response is no longer useful, zero it out */ - data_blob_free(&gensec_ntlmssp_state->lm_resp); + data_blob_free(&ntlmssp_state->lm_resp); /* We changed the effective challenge - set it */ if (!NT_STATUS_IS_OK(nt_status = - gensec_ntlmssp_state->set_challenge(gensec_ntlmssp_state, - &gensec_ntlmssp_state->chal))) { + ntlmssp_state->set_challenge(ntlmssp_state, + &ntlmssp_state->chal))) { /* zero this out */ - data_blob_free(&gensec_ntlmssp_state->encrypted_session_key); + data_blob_free(&ntlmssp_state->encrypted_session_key); return nt_status; } /* LM Key is incompatible... */ - gensec_ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_LM_KEY; + ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_LM_KEY; } } return NT_STATUS_OK; @@ -379,7 +379,7 @@ static NTSTATUS ntlmssp_server_preauth(struct gensec_ntlmssp_state *gensec_ntlms * Next state function for the Authenticate packet * (after authentication - figures out the session keys etc) * - * @param gensec_ntlmssp_state NTLMSSP State + * @param ntlmssp_state NTLMSSP State * @return Errors or NT_STATUS_OK. */ @@ -390,7 +390,7 @@ static NTSTATUS ntlmssp_server_postauth(struct gensec_security *gensec_security, struct gensec_ntlmssp_context *gensec_ntlmssp = talloc_get_type_abort(gensec_security->private_data, struct gensec_ntlmssp_context); - struct gensec_ntlmssp_state *gensec_ntlmssp_state = gensec_ntlmssp->ntlmssp_state; + struct ntlmssp_state *ntlmssp_state = gensec_ntlmssp->ntlmssp_state; NTSTATUS nt_status; DATA_BLOB session_key = data_blob(NULL, 0); @@ -406,11 +406,11 @@ static NTSTATUS ntlmssp_server_postauth(struct gensec_security *gensec_security, dump_data_pw("LM first-8:\n", lm_session_key->data, lm_session_key->length); /* Handle the different session key derivation for NTLM2 */ - if (gensec_ntlmssp_state->doing_ntlm2) { + if (ntlmssp_state->doing_ntlm2) { if (user_session_key && user_session_key->data && user_session_key->length == 16) { - session_key = data_blob_talloc(gensec_ntlmssp_state, NULL, 16); - hmac_md5(user_session_key->data, gensec_ntlmssp_state->crypt.ntlm2.session_nonce, - sizeof(gensec_ntlmssp_state->crypt.ntlm2.session_nonce), session_key.data); + session_key = data_blob_talloc(ntlmssp_state, NULL, 16); + hmac_md5(user_session_key->data, ntlmssp_state->crypt.ntlm2.session_nonce, + sizeof(ntlmssp_state->crypt.ntlm2.session_nonce), session_key.data); DEBUG(10,("ntlmssp_server_auth: Created NTLM2 session key.\n")); dump_data_pw("NTLM2 session key:\n", session_key.data, session_key.length); @@ -418,14 +418,14 @@ static NTSTATUS ntlmssp_server_postauth(struct gensec_security *gensec_security, DEBUG(10,("ntlmssp_server_auth: Failed to create NTLM2 session key.\n")); session_key = data_blob(NULL, 0); } - } else if ((gensec_ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_LM_KEY) + } else if ((ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_LM_KEY) /* Ensure we can never get here on NTLMv2 */ - && (gensec_ntlmssp_state->nt_resp.length == 0 || gensec_ntlmssp_state->nt_resp.length == 24)) { + && (ntlmssp_state->nt_resp.length == 0 || ntlmssp_state->nt_resp.length == 24)) { if (lm_session_key && lm_session_key->data && lm_session_key->length >= 8) { - if (gensec_ntlmssp_state->lm_resp.data && gensec_ntlmssp_state->lm_resp.length == 24) { - session_key = data_blob_talloc(gensec_ntlmssp_state, NULL, 16); - SMBsesskeygen_lm_sess_key(lm_session_key->data, gensec_ntlmssp_state->lm_resp.data, + if (ntlmssp_state->lm_resp.data && ntlmssp_state->lm_resp.length == 24) { + session_key = data_blob_talloc(ntlmssp_state, NULL, 16); + SMBsesskeygen_lm_sess_key(lm_session_key->data, ntlmssp_state->lm_resp.data, session_key.data); DEBUG(10,("ntlmssp_server_auth: Created NTLM session key.\n")); dump_data_pw("LM session key:\n", session_key.data, session_key.length); @@ -433,7 +433,7 @@ static NTSTATUS ntlmssp_server_postauth(struct gensec_security *gensec_security, /* When there is no LM response, just use zeros */ static const uint8_t zeros[24]; - session_key = data_blob_talloc(gensec_ntlmssp_state, NULL, 16); + session_key = data_blob_talloc(ntlmssp_state, NULL, 16); SMBsesskeygen_lm_sess_key(zeros, zeros, session_key.data); DEBUG(10,("ntlmssp_server_auth: Created NTLM session key.\n")); @@ -441,85 +441,85 @@ static NTSTATUS ntlmssp_server_postauth(struct gensec_security *gensec_security, } } else { /* LM Key not selected */ - gensec_ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_LM_KEY; + ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_LM_KEY; DEBUG(10,("ntlmssp_server_auth: Failed to create NTLM session key.\n")); session_key = data_blob(NULL, 0); } } else if (user_session_key && user_session_key->data) { - session_key = data_blob_talloc(gensec_ntlmssp_state, user_session_key->data, user_session_key->length); + session_key = data_blob_talloc(ntlmssp_state, user_session_key->data, user_session_key->length); DEBUG(10,("ntlmssp_server_auth: Using unmodified nt session key.\n")); dump_data_pw("unmodified session key:\n", session_key.data, session_key.length); /* LM Key not selected */ - gensec_ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_LM_KEY; + ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_LM_KEY; } else if (lm_session_key && lm_session_key->data) { /* Very weird to have LM key, but no user session key, but anyway.. */ - session_key = data_blob_talloc(gensec_ntlmssp_state, lm_session_key->data, lm_session_key->length); + session_key = data_blob_talloc(ntlmssp_state, lm_session_key->data, lm_session_key->length); DEBUG(10,("ntlmssp_server_auth: Using unmodified lm session key.\n")); dump_data_pw("unmodified session key:\n", session_key.data, session_key.length); /* LM Key not selected */ - gensec_ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_LM_KEY; + ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_LM_KEY; } else { DEBUG(10,("ntlmssp_server_auth: Failed to create unmodified session key.\n")); session_key = data_blob(NULL, 0); /* LM Key not selected */ - gensec_ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_LM_KEY; + ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_LM_KEY; } /* With KEY_EXCH, the client supplies the proposed session key, but encrypts it with the long-term key */ - if (gensec_ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_KEY_EXCH) { - if (!gensec_ntlmssp_state->encrypted_session_key.data - || gensec_ntlmssp_state->encrypted_session_key.length != 16) { - data_blob_free(&gensec_ntlmssp_state->encrypted_session_key); + if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_KEY_EXCH) { + if (!ntlmssp_state->encrypted_session_key.data + || ntlmssp_state->encrypted_session_key.length != 16) { + data_blob_free(&ntlmssp_state->encrypted_session_key); DEBUG(1, ("Client-supplied KEY_EXCH session key was of invalid length (%u)!\n", - (unsigned)gensec_ntlmssp_state->encrypted_session_key.length)); + (unsigned)ntlmssp_state->encrypted_session_key.length)); return NT_STATUS_INVALID_PARAMETER; } else if (!session_key.data || session_key.length != 16) { DEBUG(5, ("server session key is invalid (len == %u), cannot do KEY_EXCH!\n", (unsigned)session_key.length)); - gensec_ntlmssp_state->session_key = session_key; + ntlmssp_state->session_key = session_key; } else { dump_data_pw("KEY_EXCH session key (enc):\n", - gensec_ntlmssp_state->encrypted_session_key.data, - gensec_ntlmssp_state->encrypted_session_key.length); - arcfour_crypt(gensec_ntlmssp_state->encrypted_session_key.data, + ntlmssp_state->encrypted_session_key.data, + ntlmssp_state->encrypted_session_key.length); + arcfour_crypt(ntlmssp_state->encrypted_session_key.data, session_key.data, - gensec_ntlmssp_state->encrypted_session_key.length); - gensec_ntlmssp_state->session_key = data_blob_talloc(gensec_ntlmssp_state, - gensec_ntlmssp_state->encrypted_session_key.data, - gensec_ntlmssp_state->encrypted_session_key.length); - dump_data_pw("KEY_EXCH session key:\n", gensec_ntlmssp_state->encrypted_session_key.data, - gensec_ntlmssp_state->encrypted_session_key.length); + ntlmssp_state->encrypted_session_key.length); + ntlmssp_state->session_key = data_blob_talloc(ntlmssp_state, + ntlmssp_state->encrypted_session_key.data, + ntlmssp_state->encrypted_session_key.length); + dump_data_pw("KEY_EXCH session key:\n", ntlmssp_state->encrypted_session_key.data, + ntlmssp_state->encrypted_session_key.length); talloc_free(session_key.data); } } else { - gensec_ntlmssp_state->session_key = session_key; + ntlmssp_state->session_key = session_key; } if ((gensec_security->want_features & GENSEC_FEATURE_SIGN) || (gensec_security->want_features & GENSEC_FEATURE_SEAL)) { - nt_status = ntlmssp_sign_init(gensec_ntlmssp_state); + nt_status = ntlmssp_sign_init(ntlmssp_state); } else { nt_status = NT_STATUS_OK; } - data_blob_free(&gensec_ntlmssp_state->encrypted_session_key); + data_blob_free(&ntlmssp_state->encrypted_session_key); /* allow arbitarily many authentications, but watch that this will cause a - memory leak, until the gensec_ntlmssp_state is shutdown + memory leak, until the ntlmssp_state is shutdown */ - if (gensec_ntlmssp_state->server_multiple_authentications) { - gensec_ntlmssp_state->expected_state = NTLMSSP_AUTH; + if (ntlmssp_state->server_multiple_authentications) { + ntlmssp_state->expected_state = NTLMSSP_AUTH; } else { - gensec_ntlmssp_state->expected_state = NTLMSSP_DONE; + ntlmssp_state->expected_state = NTLMSSP_DONE; } return nt_status; @@ -543,7 +543,7 @@ NTSTATUS ntlmssp_server_auth(struct gensec_security *gensec_security, struct gensec_ntlmssp_context *gensec_ntlmssp = talloc_get_type_abort(gensec_security->private_data, struct gensec_ntlmssp_context); - struct gensec_ntlmssp_state *gensec_ntlmssp_state = gensec_ntlmssp->ntlmssp_state; + struct ntlmssp_state *ntlmssp_state = gensec_ntlmssp->ntlmssp_state; DATA_BLOB user_session_key = data_blob_null; DATA_BLOB lm_session_key = data_blob_null; NTSTATUS nt_status; @@ -551,7 +551,7 @@ NTSTATUS ntlmssp_server_auth(struct gensec_security *gensec_security, /* zero the outbound NTLMSSP packet */ *out = data_blob_null; - nt_status = ntlmssp_server_preauth(gensec_ntlmssp_state, in); + nt_status = ntlmssp_server_preauth(ntlmssp_state, in); if (!NT_STATUS_IS_OK(nt_status)) { return nt_status; } @@ -564,7 +564,7 @@ NTSTATUS ntlmssp_server_auth(struct gensec_security *gensec_security, */ /* Finally, actually ask if the password is OK */ - nt_status = gensec_ntlmssp_state->check_password(gensec_ntlmssp_state, + nt_status = ntlmssp_state->check_password(ntlmssp_state, &user_session_key, &lm_session_key); if (!NT_STATUS_IS_OK(nt_status)) { @@ -586,11 +586,11 @@ NTSTATUS ntlmssp_server_auth(struct gensec_security *gensec_security, * @return an 8 byte random challenge */ -static NTSTATUS auth_ntlmssp_get_challenge(const struct gensec_ntlmssp_state *gensec_ntlmssp_state, +static NTSTATUS auth_ntlmssp_get_challenge(const struct ntlmssp_state *ntlmssp_state, uint8_t chal[8]) { struct gensec_ntlmssp_context *gensec_ntlmssp = - talloc_get_type_abort(gensec_ntlmssp_state->callback_private, + talloc_get_type_abort(ntlmssp_state->callback_private, struct gensec_ntlmssp_context); struct auth_context *auth_context = gensec_ntlmssp->auth_context; NTSTATUS status; @@ -610,10 +610,10 @@ static NTSTATUS auth_ntlmssp_get_challenge(const struct gensec_ntlmssp_state *ge * * @return If the effective challenge used by the auth subsystem may be modified */ -static bool auth_ntlmssp_may_set_challenge(const struct gensec_ntlmssp_state *gensec_ntlmssp_state) +static bool auth_ntlmssp_may_set_challenge(const struct ntlmssp_state *ntlmssp_state) { struct gensec_ntlmssp_context *gensec_ntlmssp = - talloc_get_type_abort(gensec_ntlmssp_state->callback_private, + talloc_get_type_abort(ntlmssp_state->callback_private, struct gensec_ntlmssp_context); struct auth_context *auth_context = gensec_ntlmssp->auth_context; @@ -624,10 +624,10 @@ static bool auth_ntlmssp_may_set_challenge(const struct gensec_ntlmssp_state *ge * NTLM2 authentication modifies the effective challenge, * @param challenge The new challenge value */ -static NTSTATUS auth_ntlmssp_set_challenge(struct gensec_ntlmssp_state *gensec_ntlmssp_state, DATA_BLOB *challenge) +static NTSTATUS auth_ntlmssp_set_challenge(struct ntlmssp_state *ntlmssp_state, DATA_BLOB *challenge) { struct gensec_ntlmssp_context *gensec_ntlmssp = - talloc_get_type_abort(gensec_ntlmssp_state->callback_private, + talloc_get_type_abort(ntlmssp_state->callback_private, struct gensec_ntlmssp_context); struct auth_context *auth_context = gensec_ntlmssp->auth_context; NTSTATUS nt_status; @@ -652,17 +652,17 @@ static NTSTATUS auth_ntlmssp_set_challenge(struct gensec_ntlmssp_state *gensec_n * Return the session keys used on the connection. */ -static NTSTATUS auth_ntlmssp_check_password(struct gensec_ntlmssp_state *gensec_ntlmssp_state, +static NTSTATUS auth_ntlmssp_check_password(struct ntlmssp_state *ntlmssp_state, DATA_BLOB *user_session_key, DATA_BLOB *lm_session_key) { struct gensec_ntlmssp_context *gensec_ntlmssp = - talloc_get_type_abort(gensec_ntlmssp_state->callback_private, + talloc_get_type_abort(ntlmssp_state->callback_private, struct gensec_ntlmssp_context); struct auth_context *auth_context = gensec_ntlmssp->auth_context; NTSTATUS nt_status; struct auth_usersupplied_info *user_info; - user_info = talloc(gensec_ntlmssp_state, struct auth_usersupplied_info); + user_info = talloc(ntlmssp_state, struct auth_usersupplied_info); if (!user_info) { return NT_STATUS_NO_MEMORY; } @@ -670,16 +670,16 @@ static NTSTATUS auth_ntlmssp_check_password(struct gensec_ntlmssp_state *gensec_ user_info->logon_parameters = MSV1_0_ALLOW_SERVER_TRUST_ACCOUNT | MSV1_0_ALLOW_WORKSTATION_TRUST_ACCOUNT; user_info->flags = 0; user_info->mapped_state = false; - user_info->client.account_name = gensec_ntlmssp_state->user; - user_info->client.domain_name = gensec_ntlmssp_state->domain; - user_info->workstation_name = gensec_ntlmssp_state->workstation; + user_info->client.account_name = ntlmssp_state->user; + user_info->client.domain_name = ntlmssp_state->domain; + user_info->workstation_name = ntlmssp_state->workstation; user_info->remote_host = gensec_get_remote_address(gensec_ntlmssp->gensec_security); user_info->password_state = AUTH_PASSWORD_RESPONSE; - user_info->password.response.lanman = gensec_ntlmssp_state->lm_resp; - user_info->password.response.lanman.data = talloc_steal(user_info, gensec_ntlmssp_state->lm_resp.data); - user_info->password.response.nt = gensec_ntlmssp_state->nt_resp; - user_info->password.response.nt.data = talloc_steal(user_info, gensec_ntlmssp_state->nt_resp.data); + user_info->password.response.lanman = ntlmssp_state->lm_resp; + user_info->password.response.lanman.data = talloc_steal(user_info, ntlmssp_state->lm_resp.data); + user_info->password.response.nt = ntlmssp_state->nt_resp; + user_info->password.response.nt.data = talloc_steal(user_info, ntlmssp_state->nt_resp.data); nt_status = auth_context->check_password(auth_context, gensec_ntlmssp, @@ -718,9 +718,9 @@ NTSTATUS gensec_ntlmssp_session_info(struct gensec_security *gensec_security, struct gensec_ntlmssp_context *gensec_ntlmssp = talloc_get_type_abort(gensec_security->private_data, struct gensec_ntlmssp_context); - struct gensec_ntlmssp_state *gensec_ntlmssp_state = gensec_ntlmssp->ntlmssp_state; + struct ntlmssp_state *ntlmssp_state = gensec_ntlmssp->ntlmssp_state; - nt_status = auth_generate_session_info(gensec_ntlmssp_state, + nt_status = auth_generate_session_info(ntlmssp_state, gensec_security->event_ctx, gensec_security->settings->lp_ctx, gensec_ntlmssp->server_info, @@ -728,8 +728,8 @@ NTSTATUS gensec_ntlmssp_session_info(struct gensec_security *gensec_security, NT_STATUS_NOT_OK_RETURN(nt_status); (*session_info)->session_key = data_blob_talloc(*session_info, - gensec_ntlmssp_state->session_key.data, - gensec_ntlmssp_state->session_key.length); + ntlmssp_state->session_key.data, + ntlmssp_state->session_key.length); return NT_STATUS_OK; } @@ -741,7 +741,7 @@ NTSTATUS gensec_ntlmssp_session_info(struct gensec_security *gensec_security, NTSTATUS gensec_ntlmssp_server_start(struct gensec_security *gensec_security) { NTSTATUS nt_status; - struct gensec_ntlmssp_state *gensec_ntlmssp_state; + struct ntlmssp_state *ntlmssp_state; struct gensec_ntlmssp_context *gensec_ntlmssp; nt_status = gensec_ntlmssp_start(gensec_security); @@ -749,66 +749,66 @@ NTSTATUS gensec_ntlmssp_server_start(struct gensec_security *gensec_security) gensec_ntlmssp = talloc_get_type_abort(gensec_security->private_data, struct gensec_ntlmssp_context); - gensec_ntlmssp_state = gensec_ntlmssp->ntlmssp_state; + ntlmssp_state = gensec_ntlmssp->ntlmssp_state; - gensec_ntlmssp_state->role = NTLMSSP_SERVER; + ntlmssp_state->role = NTLMSSP_SERVER; - gensec_ntlmssp_state->expected_state = NTLMSSP_NEGOTIATE; + ntlmssp_state->expected_state = NTLMSSP_NEGOTIATE; - gensec_ntlmssp_state->allow_lm_key = (lp_lanman_auth(gensec_security->settings->lp_ctx) + ntlmssp_state->allow_lm_key = (lp_lanman_auth(gensec_security->settings->lp_ctx) && gensec_setting_bool(gensec_security->settings, "ntlmssp_server", "allow_lm_key", false)); - gensec_ntlmssp_state->server_multiple_authentications = false; + ntlmssp_state->server_multiple_authentications = false; - gensec_ntlmssp_state->neg_flags = + ntlmssp_state->neg_flags = NTLMSSP_NEGOTIATE_NTLM | NTLMSSP_NEGOTIATE_VERSION; - gensec_ntlmssp_state->lm_resp = data_blob(NULL, 0); - gensec_ntlmssp_state->nt_resp = data_blob(NULL, 0); - gensec_ntlmssp_state->encrypted_session_key = data_blob(NULL, 0); + ntlmssp_state->lm_resp = data_blob(NULL, 0); + ntlmssp_state->nt_resp = data_blob(NULL, 0); + ntlmssp_state->encrypted_session_key = data_blob(NULL, 0); if (gensec_setting_bool(gensec_security->settings, "ntlmssp_server", "128bit", true)) { - gensec_ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_128; + ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_128; } if (gensec_setting_bool(gensec_security->settings, "ntlmssp_server", "56bit", true)) { - gensec_ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_56; + ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_56; } if (gensec_setting_bool(gensec_security->settings, "ntlmssp_server", "keyexchange", true)) { - gensec_ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_KEY_EXCH; + ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_KEY_EXCH; } if (gensec_setting_bool(gensec_security->settings, "ntlmssp_server", "alwayssign", true)) { - gensec_ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_ALWAYS_SIGN; + ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_ALWAYS_SIGN; } if (gensec_setting_bool(gensec_security->settings, "ntlmssp_server", "ntlm2", true)) { - gensec_ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_NTLM2; + ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_NTLM2; } if (gensec_security->want_features & GENSEC_FEATURE_SIGN) { - gensec_ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SIGN; + ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SIGN; } if (gensec_security->want_features & GENSEC_FEATURE_SEAL) { - gensec_ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SEAL; + ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SEAL; } gensec_ntlmssp->auth_context = gensec_security->auth_context; - gensec_ntlmssp_state->get_challenge = auth_ntlmssp_get_challenge; - gensec_ntlmssp_state->may_set_challenge = auth_ntlmssp_may_set_challenge; - gensec_ntlmssp_state->set_challenge = auth_ntlmssp_set_challenge; - gensec_ntlmssp_state->check_password = auth_ntlmssp_check_password; + ntlmssp_state->get_challenge = auth_ntlmssp_get_challenge; + ntlmssp_state->may_set_challenge = auth_ntlmssp_may_set_challenge; + ntlmssp_state->set_challenge = auth_ntlmssp_set_challenge; + ntlmssp_state->check_password = auth_ntlmssp_check_password; if (lp_server_role(gensec_security->settings->lp_ctx) == ROLE_STANDALONE) { - gensec_ntlmssp_state->server.is_standalone = true; + ntlmssp_state->server.is_standalone = true; } else { - gensec_ntlmssp_state->server.is_standalone = false; + ntlmssp_state->server.is_standalone = false; } - gensec_ntlmssp_state->server.netbios_name = lp_netbios_name(gensec_security->settings->lp_ctx); + ntlmssp_state->server.netbios_name = lp_netbios_name(gensec_security->settings->lp_ctx); - gensec_ntlmssp_state->server.netbios_domain = lp_workgroup(gensec_security->settings->lp_ctx); + ntlmssp_state->server.netbios_domain = lp_workgroup(gensec_security->settings->lp_ctx); { char dnsdomname[MAXHOSTNAMELEN], dnsname[MAXHOSTNAMELEN]; @@ -818,20 +818,20 @@ NTSTATUS gensec_ntlmssp_server_start(struct gensec_security *gensec_security) safe_strcpy(dnsdomname, lp_dnsdomain(gensec_security->settings->lp_ctx), sizeof(dnsdomname) - 1); /* Find out the DNS host name */ - safe_strcpy(dnsname, gensec_ntlmssp_state->server.netbios_name, sizeof(dnsname) - 1); + safe_strcpy(dnsname, ntlmssp_state->server.netbios_name, sizeof(dnsname) - 1); if (dnsdomname[0] != '\0') { safe_strcat(dnsname, ".", sizeof(dnsname) - 1); safe_strcat(dnsname, dnsdomname, sizeof(dnsname) - 1); } strlower_m(dnsname); - gensec_ntlmssp_state->server.dns_name = talloc_strdup(gensec_ntlmssp_state, + ntlmssp_state->server.dns_name = talloc_strdup(ntlmssp_state, dnsname); - NT_STATUS_HAVE_NO_MEMORY(gensec_ntlmssp_state->server.dns_name); + NT_STATUS_HAVE_NO_MEMORY(ntlmssp_state->server.dns_name); - gensec_ntlmssp_state->server.dns_domain = talloc_strdup(gensec_ntlmssp_state, + ntlmssp_state->server.dns_domain = talloc_strdup(ntlmssp_state, dnsdomname); - NT_STATUS_HAVE_NO_MEMORY(gensec_ntlmssp_state->server.dns_domain); + NT_STATUS_HAVE_NO_MEMORY(ntlmssp_state->server.dns_domain); } return NT_STATUS_OK; |