diff options
| author | Günther Deschner <gd@samba.org> | 2013-09-18 18:36:19 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2013-09-19 11:09:44 +0200 |
| commit | 5a628490e46f428432cd9b32c2b4b3a34a3736ae (patch) | |
| tree | 60edea1ce1ca5d130cc54aae0e566cf9a88a2e3a /source3/librpc | |
| parent | a32a83ba9d6c7b5bbe9077973e5402ba65c068e7 (diff) | |
| download | samba-5a628490e46f428432cd9b32c2b4b3a34a3736ae.tar.gz samba-5a628490e46f428432cd9b32c2b4b3a34a3736ae.tar.bz2 samba-5a628490e46f428432cd9b32c2b4b3a34a3736ae.zip | |
s3-rpc: use gensec for schannel footer processing.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Pair-Programmed-With: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3/librpc')
| -rw-r--r-- | source3/librpc/rpc/dcerpc_helpers.c | 35 |
1 files changed, 3 insertions, 32 deletions
diff --git a/source3/librpc/rpc/dcerpc_helpers.c b/source3/librpc/rpc/dcerpc_helpers.c index 06b0f68064..7f7116355c 100644 --- a/source3/librpc/rpc/dcerpc_helpers.c +++ b/source3/librpc/rpc/dcerpc_helpers.c @@ -269,7 +269,6 @@ NTSTATUS dcerpc_guess_sizes(struct pipe_auth_data *auth, size_t max_len; size_t mod_len; struct gensec_security *gensec_security; - struct schannel_state *schannel_auth; /* no auth token cases first */ switch (auth->auth_level) { @@ -303,16 +302,11 @@ NTSTATUS dcerpc_guess_sizes(struct pipe_auth_data *auth, case DCERPC_AUTH_TYPE_SPNEGO: case DCERPC_AUTH_TYPE_NTLMSSP: case DCERPC_AUTH_TYPE_KRB5: + case DCERPC_AUTH_TYPE_SCHANNEL: gensec_security = talloc_get_type_abort(auth->auth_ctx, struct gensec_security); *auth_len = gensec_sig_size(gensec_security, max_len); break; - - case DCERPC_AUTH_TYPE_SCHANNEL: - schannel_auth = talloc_get_type_abort(auth->auth_ctx, - struct schannel_state); - *auth_len = netsec_outgoing_sig_size(schannel_auth); - break; default: return NT_STATUS_INVALID_PARAMETER; } @@ -544,7 +538,6 @@ static NTSTATUS get_schannel_auth_footer(TALLOC_CTX *mem_ctx, NTSTATUS dcerpc_add_auth_footer(struct pipe_auth_data *auth, size_t pad_len, DATA_BLOB *rpc_out) { - struct schannel_state *schannel_auth; struct gensec_security *gensec_security; char pad[CLIENT_NDR_PADDING_SIZE] = { 0, }; DATA_BLOB auth_info; @@ -596,19 +589,13 @@ NTSTATUS dcerpc_add_auth_footer(struct pipe_auth_data *auth, case DCERPC_AUTH_TYPE_SPNEGO: case DCERPC_AUTH_TYPE_KRB5: case DCERPC_AUTH_TYPE_NTLMSSP: + case DCERPC_AUTH_TYPE_SCHANNEL: gensec_security = talloc_get_type_abort(auth->auth_ctx, struct gensec_security); status = add_generic_auth_footer(gensec_security, auth->auth_level, rpc_out); break; - case DCERPC_AUTH_TYPE_SCHANNEL: - schannel_auth = talloc_get_type_abort(auth->auth_ctx, - struct schannel_state); - status = add_schannel_auth_footer(schannel_auth, - auth->auth_level, - rpc_out); - break; default: status = NT_STATUS_INVALID_PARAMETER; break; @@ -636,7 +623,6 @@ NTSTATUS dcerpc_check_auth(struct pipe_auth_data *auth, DATA_BLOB *raw_pkt, size_t *pad_len) { - struct schannel_state *schannel_auth; struct gensec_security *gensec_security; NTSTATUS status; struct dcerpc_auth auth_info; @@ -706,6 +692,7 @@ NTSTATUS dcerpc_check_auth(struct pipe_auth_data *auth, case DCERPC_AUTH_TYPE_SPNEGO: case DCERPC_AUTH_TYPE_KRB5: case DCERPC_AUTH_TYPE_NTLMSSP: + case DCERPC_AUTH_TYPE_SCHANNEL: DEBUG(10, ("GENSEC auth\n")); @@ -719,22 +706,6 @@ NTSTATUS dcerpc_check_auth(struct pipe_auth_data *auth, return status; } break; - - case DCERPC_AUTH_TYPE_SCHANNEL: - - DEBUG(10, ("SCHANNEL auth\n")); - - schannel_auth = talloc_get_type_abort(auth->auth_ctx, - struct schannel_state); - status = get_schannel_auth_footer(pkt, schannel_auth, - auth->auth_level, - &data, &full_pkt, - &auth_info.credentials); - if (!NT_STATUS_IS_OK(status)) { - return status; - } - break; - default: DEBUG(0, ("process_request_pdu: " "unknown auth type %u set.\n", |