diff options
| author | Stefan Metzmacher <metze@samba.org> | 2017-07-07 09:05:29 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2017-07-25 13:51:08 +0200 |
| commit | e60222d5c31b524a8b952b46ef04ef86fc15b87d (patch) | |
| tree | 00a8596c361b18723a9d25f5d20154b804c1aaea /auth/gensec | |
| parent | 909d190ec2d7cf45ec49fb7f63de8dcc759559f6 (diff) | |
| download | samba-e60222d5c31b524a8b952b46ef04ef86fc15b87d.tar.gz | |
auth/spnego: introduce a 'struct spnego_negTokenTarg *ta' helper variable in gensec_spnego_update_server()
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'auth/gensec')
| -rw-r--r-- | auth/gensec/spnego.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/auth/gensec/spnego.c b/auth/gensec/spnego.c index 0f3aae12b25..137a4a31a01 100644 --- a/auth/gensec/spnego.c +++ b/auth/gensec/spnego.c @@ -1108,6 +1108,7 @@ static NTSTATUS gensec_spnego_update_server(struct gensec_security *gensec_secur case SPNEGO_SERVER_TARG: { + const struct spnego_negTokenTarg *ta = &spnego_in->negTokenTarg; NTSTATUS nt_status; bool have_sign = true; bool new_spnego = false; @@ -1120,7 +1121,7 @@ static NTSTATUS gensec_spnego_update_server(struct gensec_security *gensec_secur } if (spnego_state->needs_mic_check) { - if (spnego_in->negTokenTarg.responseToken.length != 0) { + if (ta->responseToken.length != 0) { DEBUG(1, ("SPNEGO: Did not setup a mech in NEG_TOKEN_INIT\n")); return NT_STATUS_INVALID_PARAMETER; } @@ -1130,7 +1131,7 @@ static NTSTATUS gensec_spnego_update_server(struct gensec_security *gensec_secur spnego_state->mech_types.length, spnego_state->mech_types.data, spnego_state->mech_types.length, - &spnego_in->negTokenTarg.mechListMIC); + &ta->mechListMIC); if (NT_STATUS_IS_OK(nt_status)) { spnego_state->needs_mic_check = false; spnego_state->done_mic_check = true; @@ -1144,7 +1145,7 @@ static NTSTATUS gensec_spnego_update_server(struct gensec_security *gensec_secur if (!spnego_state->sub_sec_ready) { nt_status = gensec_update_ev(spnego_state->sub_sec_security, out_mem_ctx, ev, - spnego_in->negTokenTarg.responseToken, + ta->responseToken, &unwrapped_out); if (NT_STATUS_IS_OK(nt_status)) { spnego_state->sub_sec_ready = true; @@ -1163,7 +1164,7 @@ static NTSTATUS gensec_spnego_update_server(struct gensec_security *gensec_secur } new_spnego = gensec_have_feature(spnego_state->sub_sec_security, GENSEC_FEATURE_NEW_SPNEGO); - if (spnego_in->negTokenTarg.mechListMIC.length > 0) { + if (ta->mechListMIC.length > 0) { new_spnego = true; } @@ -1172,13 +1173,13 @@ static NTSTATUS gensec_spnego_update_server(struct gensec_security *gensec_secur spnego_state->needs_mic_sign = true; } - if (have_sign && spnego_in->negTokenTarg.mechListMIC.length > 0) { + if (have_sign && ta->mechListMIC.length > 0) { nt_status = gensec_check_packet(spnego_state->sub_sec_security, spnego_state->mech_types.data, spnego_state->mech_types.length, spnego_state->mech_types.data, spnego_state->mech_types.length, - &spnego_in->negTokenTarg.mechListMIC); + &ta->mechListMIC); if (!NT_STATUS_IS_OK(nt_status)) { DEBUG(2,("GENSEC SPNEGO: failed to verify mechListMIC: %s\n", nt_errstr(nt_status))); |