sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

r9418: SPNEGO fixes:

Browse Source 
- Fix mixing of code and data
- send mechListMic again in SPENGO server
- only send optomistic first packet in the client.
(This used to be commit 9941da8081)
This commit is contained in:
Andrew Bartlett 2005-08-20 06:36:35 +00:00 committed by Gerald (Jerry) Carter
parent 897e9f2b4d
commit 7f7b6a59b4
1 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source4/auth/gensec/spnego.c
View File

@ -408,11 +408,11 @@ static NTSTATUS gensec_spnego_create_negTokenInit(struct gensec_security *gensec
DATA_BLOB null_data_blob = data_blob(NULL,0); DATA_BLOB null_data_blob = data_blob(NULL,0);
const char **mechTypes = NULL; const char **mechTypes = NULL;
DATA_BLOB unwrapped_out = data_blob(NULL, 0); DATA_BLOB unwrapped_out = data_blob(NULL, 0);
const struct gensec_security_ops_wrapper *all_sec;
mechTypes = gensec_security_oids(out_mem_ctx, GENSEC_OID_SPNEGO); mechTypes = gensec_security_oids(out_mem_ctx, GENSEC_OID_SPNEGO);
const struct gensec_security_ops_wrapper *all_sec all_sec = gensec_security_by_oid_list(out_mem_ctx,
= gensec_security_by_oid_list(out_mem_ctx,
mechTypes, mechTypes,
GENSEC_OID_SPNEGO); GENSEC_OID_SPNEGO);
for (i=0; all_sec && all_sec[i].op; i++) { for (i=0; all_sec && all_sec[i].op; i++) {
@ -432,15 +432,16 @@ static NTSTATUS gensec_spnego_create_negTokenInit(struct gensec_security *gensec
continue; continue;
} }
/* In the client, try and produce the first (optimistic) packet */
if (spnego_state->state_position = SPNEGO_CLIENT_START) {
nt_status = gensec_update(spnego_state->sub_sec_security, nt_status = gensec_update(spnego_state->sub_sec_security,
out_mem_ctx, out_mem_ctx,
null_data_blob, null_data_blob,
&unwrapped_out); &unwrapped_out);
if (!NT_STATUS_EQUAL(nt_status, NT_STATUS_INVALID_PARAMETER) if (!NT_STATUS_EQUAL(nt_status, NT_STATUS_MORE_PROCESSING_REQUIRED)
&& !NT_STATUS_EQUAL(nt_status, NT_STATUS_MORE_PROCESSING_REQUIRED)
&& !NT_STATUS_IS_OK(nt_status)) { && !NT_STATUS_IS_OK(nt_status)) {
DEBUG(3, ("SPNEGO(%s) creating NEG_TOKEN_INIT failed: %s\n", DEBUG(1, ("SPNEGO(%s) creating NEG_TOKEN_INIT failed: %s\n",
spnego_state->sub_sec_security->ops->name, nt_errstr(nt_status))); spnego_state->sub_sec_security->ops->name, nt_errstr(nt_status)));
talloc_free(spnego_state->sub_sec_security); talloc_free(spnego_state->sub_sec_security);
spnego_state->sub_sec_security = NULL; spnego_state->sub_sec_security = NULL;
@ -448,11 +449,21 @@ static NTSTATUS gensec_spnego_create_negTokenInit(struct gensec_security *gensec
continue; continue;
} }
}
spnego_out.type = SPNEGO_NEG_TOKEN_INIT; spnego_out.type = SPNEGO_NEG_TOKEN_INIT;
/* List the remaining mechs as options */
spnego_out.negTokenInit.mechTypes = gensec_security_oids_from_ops_wrapped(out_mem_ctx, spnego_out.negTokenInit.mechTypes = gensec_security_oids_from_ops_wrapped(out_mem_ctx,
&all_sec[i]); &all_sec[i]);
spnego_out.negTokenInit.reqFlags = 0; spnego_out.negTokenInit.reqFlags = 0;
if (spnego_state->state_position = SPNEGO_SERVER_START) {
spnego_out.negTokenInit.mechListMIC
= data_blob_string_const(talloc_asprintf(out_mem_ctx, "%s$@%s", lp_netbios_name(), lp_realm()));
} else {
spnego_out.negTokenInit.mechListMIC = null_data_blob; spnego_out.negTokenInit.mechListMIC = null_data_blob;
}
spnego_out.negTokenInit.mechToken = unwrapped_out; spnego_out.negTokenInit.mechToken = unwrapped_out;
if (spnego_write_data(out_mem_ctx, out, &spnego_out) == -1) { if (spnego_write_data(out_mem_ctx, out, &spnego_out) == -1) {