diff options
| author | Richard Sharpe <realrichardsharpe@gmail.com> | 2014-05-26 16:05:36 -0700 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-06-09 15:00:19 +0000 |
| commit | b62f155f461dfde96a59f8fdcc53c687e67274d7 (patch) | |
| tree | 88882fa0da8af80c2e98236cb65de47d6beefcbd /asn1 | |
| parent | 338ad80f3115eb3399732e1f49d460746412108d (diff) | |
| download | wireshark-b62f155f461dfde96a59f8fdcc53c687e67274d7.tar.gz | |
Improve the fix by removing code that miss dissects SPNEGO stuff ... as well
as remove redundant stuff from the spnego.cnf file.
Signed-off-by: Richard Sharpe <realrichardsharpe@gmail.com>
Change-Id: I90a962a39dc4da0f13055c9b3893c26044f1fc97
Reviewed-on: https://code.wireshark.org/review/1809
Reviewed-by: Tomáš Kukosa <tomas.kukosa@unify.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
(cherry picked from commit 88a64b9e2b1e39c643277edeb4c4ae969a0b39a5)
Reviewed-on: https://code.wireshark.org/review/2069
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/spnego/spnego.cnf | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/asn1/spnego/spnego.cnf b/asn1/spnego/spnego.cnf index 9d9e760cb2..2eaec5b0d5 100644 --- a/asn1/spnego/spnego.cnf +++ b/asn1/spnego/spnego.cnf @@ -131,31 +131,6 @@ NegotiationToken if (mechToken_tvb && next_level_value) call_dissector(next_level_value->handle, mechToken_tvb, actx->pinfo, tree); - -#.FN_PARS NegTokenInit/mechListMIC - - VAL_PTR = &mechListMIC_tvb - -#.FN_BODY NegTokenInit/mechListMIC - - tvbuff_t *mechListMIC_tvb; - - -%(DEFAULT_BODY)s - - - /* - * Now, we should be able to dispatch, if we've gotten a tvbuff for - * the MIC and we have information on how to dissect its contents. - */ - if (mechListMIC_tvb && (tvb_reported_length(mechListMIC_tvb) > 0) ){ - gssapi_oid_value *value=next_level_value; - - if(value){ - call_dissector(value->handle, mechListMIC_tvb, actx->pinfo, tree); - } - } - #.FN_BODY NegTokenTarg/supportedMech conversation_t *conversation; @@ -201,30 +176,4 @@ NegotiationToken } } - -#.FN_PARS NegTokenTarg/mechListMIC - - VAL_PTR = &mechListMIC_tvb - -#.FN_BODY NegTokenTarg/mechListMIC - - tvbuff_t *mechListMIC_tvb; - - -%(DEFAULT_BODY)s - - - /* - * Now, we should be able to dispatch, if we've gotten a tvbuff for - * the MIC and we have information on how to dissect its contents. - */ - if (mechListMIC_tvb && (tvb_reported_length(mechListMIC_tvb) > 0) ){ - gssapi_oid_value *value=next_level_value; - - if(value){ - call_dissector(value->handle, mechListMIC_tvb, actx->pinfo, tree); - } - } - - #.END |