osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

packet-{kerberos,spnego}: move KRB5_KU_USAGE_* defined to packet-kerberos.h 

Change-Id: I4d4014c6def44144461497ad4d92b9f32b4d3140
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/37322
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Stefan Metzmacher 2020-05-27 11:05:32 +02:00 committed by Anders Broman
parent 5aaec7f16d
commit 8b35c401dc
4 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
epan/dissectors/asn1/kerberos/packet-kerberos-template.h
View File

@ -18,6 +18,19 @@
extern "C" {
#endif /* __cplusplus */
#ifndef KRB5_KU_USAGE_ACCEPTOR_SEAL
#define KRB5_KU_USAGE_ACCEPTOR_SEAL 22
#endif
#ifndef KRB5_KU_USAGE_ACCEPTOR_SIGN
#define KRB5_KU_USAGE_ACCEPTOR_SIGN 23
#endif
#ifndef KRB5_KU_USAGE_INITIATOR_SEAL
#define KRB5_KU_USAGE_INITIATOR_SEAL 24
#endif
#ifndef KRB5_KU_USAGE_INITIATOR_SIGN
#define KRB5_KU_USAGE_INITIATOR_SIGN 25
#endif
/* This is a list of callback functions a caller can use to specify that
octet strings in kerberos to be passed back to application specific
dissectors, outside of kerberos.

5
epan/dissectors/asn1/spnego/packet-spnego-template.c
View File

@ -651,11 +651,6 @@ rrc_rotate(guint8 *data, int len, guint16 rrc, int unrotate)
}
#define KRB5_KU_USAGE_ACCEPTOR_SEAL 22
#define KRB5_KU_USAGE_ACCEPTOR_SIGN 23
#define KRB5_KU_USAGE_INITIATOR_SEAL 24
#define KRB5_KU_USAGE_INITIATOR_SIGN 25
static void
decrypt_gssapi_krb_cfx_wrap(proto_tree *tree,
packet_info *pinfo,

15
epan/dissectors/packet-kerberos.h
View File

@ -26,6 +26,19 @@
extern "C" {
#endif /* __cplusplus */
#ifndef KRB5_KU_USAGE_ACCEPTOR_SEAL
#define KRB5_KU_USAGE_ACCEPTOR_SEAL 22
#endif
#ifndef KRB5_KU_USAGE_ACCEPTOR_SIGN
#define KRB5_KU_USAGE_ACCEPTOR_SIGN 23
#endif
#ifndef KRB5_KU_USAGE_INITIATOR_SEAL
#define KRB5_KU_USAGE_INITIATOR_SEAL 24
#endif
#ifndef KRB5_KU_USAGE_INITIATOR_SIGN
#define KRB5_KU_USAGE_INITIATOR_SIGN 25
#endif
/* This is a list of callback functions a caller can use to specify that
octet strings in kerberos to be passed back to application specific
dissectors, outside of kerberos.
@ -143,7 +156,7 @@ extern gboolean krb_decrypt;
int dissect_kerberos_ChangePasswdData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
/*--- End of included file: packet-kerberos-exp.h ---*/
#line 113 "./asn1/kerberos/packet-kerberos-template.h"
#line 126 "./asn1/kerberos/packet-kerberos-template.h"
#ifdef __cplusplus
}

9
epan/dissectors/packet-spnego.c
View File

@ -1103,11 +1103,6 @@ rrc_rotate(guint8 *data, int len, guint16 rrc, int unrotate)
}
#define KRB5_KU_USAGE_ACCEPTOR_SEAL 22
#define KRB5_KU_USAGE_ACCEPTOR_SIGN 23
#define KRB5_KU_USAGE_INITIATOR_SEAL 24
#define KRB5_KU_USAGE_INITIATOR_SIGN 25
static void
decrypt_gssapi_krb_cfx_wrap(proto_tree *tree,
packet_info *pinfo,
@ -1933,7 +1928,7 @@ void proto_register_spnego(void) {
NULL, HFILL }},
/*--- End of included file: packet-spnego-hfarr.c ---*/
#line 1388 "./asn1/spnego/packet-spnego-template.c"
#line 1383 "./asn1/spnego/packet-spnego-template.c"
};
/* List of subtrees */
@ -1956,7 +1951,7 @@ void proto_register_spnego(void) {
&ett_spnego_InitialContextToken_U,
/*--- End of included file: packet-spnego-ettarr.c ---*/
#line 1398 "./asn1/spnego/packet-spnego-template.c"
#line 1393 "./asn1/spnego/packet-spnego-template.c"
};
static ei_register_info ei[] = {