diff options
| author | Stefan Metzmacher <metze@samba.org> | 2019-12-23 13:51:05 +0100 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2020-01-22 21:34:45 +0000 |
| commit | 1b97f84785fb09e74ca621af59c2f3a20753f4c5 (patch) | |
| tree | 65f0800c0e7268682f363688ac2de55ca140d489 /epan/dissectors/packet-gssapi.c | |
| parent | 6afa37bb1a9bd8608e633bdbb1b31383407f12b8 (diff) | |
packet-gssapi: add gssapi_{header,trailer}_tvb
Change-Id: I3a9cebec0b8cb39eee99d23b3609241f106c045a
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/35708
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'epan/dissectors/packet-gssapi.c')
| -rw-r--r-- | epan/dissectors/packet-gssapi.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/epan/dissectors/packet-gssapi.c b/epan/dissectors/packet-gssapi.c index ca0cfcbeb7..6622783132 100644 --- a/epan/dissectors/packet-gssapi.c +++ b/epan/dissectors/packet-gssapi.c @@ -670,12 +670,12 @@ wrap_dissect_gssapi_verf(tvbuff_t *tvb, int offset, packet_info *pinfo, } tvbuff_t * -wrap_dissect_gssapi_payload(tvbuff_t *header_tvb _U_, +wrap_dissect_gssapi_payload(tvbuff_t *header_tvb, tvbuff_t *payload_tvb, - tvbuff_t *trailer_tvb _U_, + tvbuff_t *trailer_tvb, tvbuff_t *auth_tvb, packet_info *pinfo, - dcerpc_auth_info *auth_info _U_) + dcerpc_auth_info *auth_info) { tvbuff_t *result; gssapi_encrypt_info_t gssapi_encrypt; @@ -689,8 +689,15 @@ wrap_dissect_gssapi_payload(tvbuff_t *header_tvb _U_, return NULL; } + if (!auth_info->hdr_signing) { + header_tvb = NULL; + trailer_tvb = NULL; + } + gssapi_encrypt.decrypt_gssapi_tvb=DECRYPT_GSSAPI_DCE; + gssapi_encrypt.gssapi_header_tvb=header_tvb; gssapi_encrypt.gssapi_encrypted_tvb=payload_tvb; + gssapi_encrypt.gssapi_trailer_tvb=trailer_tvb; dissect_gssapi(auth_tvb, pinfo, NULL, &gssapi_encrypt); result=gssapi_encrypt.gssapi_decrypted_tvb; |