Kerberos: Add support for MS-KILE Key List Request messages
This adds the MS-KILE pre-authentication data types KERB-KEY-LIST-REQ [161] and KERB-KEY-LIST-REP [162] as per the latest Microsoft' Open Specifications. Keys obtained from KERB-KEY-LIST-REP are learnt and saved for further use in other packets. References: - [MS-KILE] 2.2.11 KERB-KEY-LIST-REQ https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-kile/a8198db9-b537-4256-b903-80a716540398 - [MS-KILE] 2.2.12 KERB-KEY-LIST-REP https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-kile/38a494fc-2885-47eb-b008-3a1b574f3614 - [MS-KILE] 3.3.5.7.8 Key List Request https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-kile/732211ae-4891-40d3-b2b6-85ebd6f5ffff
This commit is contained in:
Martin Gallo
Pascal Quantin
parent
01de470856
commit
85df6d0273
|
|
@ -116,6 +116,8 @@ PADATA-TYPE ::= INTEGER {
|
|||
pA-PKU2U-NAME(148), -- [PKU2U]
|
||||
pA-REQ-ENC-PA-REP(149), -- [RFC6806]
|
||||
pA-SPAKE(151), -- draft-ietf-kitten-krb-spake-preauth-09
|
||||
pA-KERB-KEY-LIST-REQ(161), -- [MS-KILE]
|
||||
pA-KERB-KEY-LIST-REP(162), -- [MS-KILE]
|
||||
pA-SUPPORTED-ETYPES(165), -- [MS-KILE]
|
||||
pA-EXTENDED-ERROR(166), -- [MS-KILE]
|
||||
pA-PAC-OPTIONS(167), -- [MS-KILE]
|
||||
|
|
@ -236,7 +238,7 @@ ADDR-TYPE ::= INTEGER {
|
|||
|
||||
-- error-codes (WS extension)
|
||||
ERROR-CODE ::= INTEGER {
|
||||
--error table constants
|
||||
--error table constants
|
||||
eRR-NONE(0),
|
||||
eRR-NAME-EXP(1),
|
||||
eRR-SERVICE-EXP(2),
|
||||
|
|
@ -557,7 +559,7 @@ LR-TYPE ::= INTEGER {
|
|||
-- MS-KILE: https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-kile
|
||||
-- MS-SFU: https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-sfu
|
||||
PA-PAC-REQUEST ::= SEQUENCE {
|
||||
include-pac[0] BOOLEAN -- Indicates whether a PAC
|
||||
include-pac[0] BOOLEAN -- Indicates whether a PAC
|
||||
-- should be included or not
|
||||
}
|
||||
|
||||
|
|
@ -812,7 +814,7 @@ KRB5SignedPathData ::= SEQUENCE {
|
|||
|
||||
KRB5SignedPath ::= SEQUENCE {
|
||||
-- DERcoded KRB5SignedPathData
|
||||
-- krbtgt key (etype), KeyUsage = XXX
|
||||
-- krbtgt key (etype), KeyUsage = XXX
|
||||
etype[0] ENCTYPE,
|
||||
cksum[1] Checksum,
|
||||
-- srvs delegated though
|
||||
|
|
@ -868,6 +870,19 @@ KERB-AD-RESTRICTION-ENTRY ::= [UNIVERSAL 16] SEQUENCE {
|
|||
restriction [1] OCTET STRING -- LSAP_TOKEN_INFO_INTEGRITY structure
|
||||
}
|
||||
|
||||
-- [MS-KILE]
|
||||
|
||||
-- Section 2.2.11
|
||||
PA-KERB-KEY-LIST-REQ ::= SEQUENCE OF ENCTYPE
|
||||
|
||||
-- Section 2.2.12
|
||||
|
||||
-- This is EncryptionKey but we're redefining it so it's named
|
||||
PA-KERB-KEY-LIST-REP-Key ::= EncryptionKey
|
||||
|
||||
PA-KERB-KEY-LIST-REP ::= SEQUENCE OF PA-KERB-KEY-LIST-REP-Key
|
||||
|
||||
|
||||
END
|
||||
|
||||
-- etags -r '/\([A-Za-z][-A-Za-z0-9]*\).*::=/\1/' k5.asn1
|
||||
|
|
|
|||
|
|
@ -38,11 +38,13 @@ ETYPE-INFO2-ENTRY/salt info2_salt
|
|||
AP-REQ/_untag/authenticator authenticator_enc_part
|
||||
PA-FX-FAST-REQUEST/armored-data armored_data_request
|
||||
PA-FX-FAST-REPLY/armored-data armored_data_reply
|
||||
PA-KERB-KEY-LIST-REP/_item kerbKeyListRep_key
|
||||
|
||||
#.FIELD_ATTR
|
||||
KDC-REQ-BODY/etype ABBREV=kdc-req-body.etype
|
||||
ETYPE-INFO-ENTRY/salt ABBREV=info_salt
|
||||
ETYPE-INFO2-ENTRY/salt ABBREV=info2_salt
|
||||
PA-KERB-KEY-LIST-REP/_item ABBREV=kerbKeyListRep.key NAME="key"
|
||||
|
||||
#.OMIT_ASSIGNMENT
|
||||
AD-AND-OR
|
||||
|
|
@ -255,6 +257,12 @@ KrbFastArmorTypes PROT_PREFIX UPPER_CASE
|
|||
case KERBEROS_PA_ENCRYPTED_CHALLENGE:
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, sub_tree, tvb, offset,hf_index, dissect_kerberos_EncryptedChallenge);
|
||||
break;
|
||||
case KERBEROS_PA_KERB_KEY_LIST_REQ:
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, sub_tree, tvb, offset, hf_index, dissect_kerberos_PA_KERB_KEY_LIST_REQ);
|
||||
break;
|
||||
case KERBEROS_PA_KERB_KEY_LIST_REP:
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, sub_tree, tvb, offset, hf_index, dissect_kerberos_PA_KERB_KEY_LIST_REP);
|
||||
break;
|
||||
case KERBEROS_PA_SUPPORTED_ETYPES:
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, sub_tree, tvb, offset,hf_index, dissect_kerberos_PA_SUPPORTED_ENCTYPES);
|
||||
break;
|
||||
|
|
@ -513,6 +521,18 @@ KrbFastArmorTypes PROT_PREFIX UPPER_CASE
|
|||
private_data->save_encryption_key_parent_hf_index = save_encryption_key_parent_hf_index;
|
||||
private_data->save_encryption_key_fn = saved_encryption_key_fn;
|
||||
|
||||
#.FN_BODY PA-KERB-KEY-LIST-REP/_item
|
||||
kerberos_private_data_t *private_data = kerberos_get_private_data(actx);
|
||||
gint save_encryption_key_parent_hf_index = private_data->save_encryption_key_parent_hf_index;
|
||||
kerberos_key_save_fn saved_encryption_key_fn = private_data->save_encryption_key_fn;
|
||||
private_data->save_encryption_key_parent_hf_index = hf_kerberos_kerbKeyListRep_key;
|
||||
##ifdef HAVE_KERBEROS
|
||||
private_data->save_encryption_key_fn = save_encryption_key;
|
||||
##endif
|
||||
%(DEFAULT_BODY)s
|
||||
private_data->save_encryption_key_parent_hf_index = save_encryption_key_parent_hf_index;
|
||||
private_data->save_encryption_key_fn = saved_encryption_key_fn;
|
||||
|
||||
#.FN_BODY AUTHDATA-TYPE VAL_PTR=&(private_data->ad_type)
|
||||
kerberos_private_data_t *private_data = kerberos_get_private_data(actx);
|
||||
%(DEFAULT_BODY)s
|
||||
|
|
|
|||
|
|
@ -168,6 +168,8 @@ static int dissect_kerberos_AD_IF_RELEVANT(gboolean implicit_tag _U_, tvbuff_t *
|
|||
static int dissect_kerberos_PA_AUTHENTICATION_SET_ELEM(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
|
||||
static int dissect_kerberos_PA_FX_FAST_REQUEST(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
|
||||
static int dissect_kerberos_EncryptedChallenge(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
|
||||
static int dissect_kerberos_PA_KERB_KEY_LIST_REQ(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
|
||||
static int dissect_kerberos_PA_KERB_KEY_LIST_REP(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
|
||||
static int dissect_kerberos_PA_FX_FAST_REPLY(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
|
||||
static int dissect_kerberos_PA_PAC_OPTIONS(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
|
||||
static int dissect_kerberos_KERB_AD_RESTRICTION_ENTRY(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
|
||||
|
|
|
|||
|
|
@ -176,6 +176,8 @@ static int dissect_kerberos_AD_IF_RELEVANT(gboolean implicit_tag _U_, tvbuff_t *
|
|||
static int dissect_kerberos_PA_AUTHENTICATION_SET_ELEM(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
|
||||
static int dissect_kerberos_PA_FX_FAST_REQUEST(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
|
||||
static int dissect_kerberos_EncryptedChallenge(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
|
||||
static int dissect_kerberos_PA_KERB_KEY_LIST_REQ(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
|
||||
static int dissect_kerberos_PA_KERB_KEY_LIST_REP(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
|
||||
static int dissect_kerberos_PA_FX_FAST_REPLY(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
|
||||
static int dissect_kerberos_PA_PAC_OPTIONS(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
|
||||
static int dissect_kerberos_KERB_AD_RESTRICTION_ENTRY(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
|
||||
|
|
@ -430,6 +432,8 @@ static int hf_kerberos_options = -1; /* BIT_STRING */
|
|||
static int hf_kerberos_flags_01 = -1; /* PAC_OPTIONS_FLAGS */
|
||||
static int hf_kerberos_restriction_type = -1; /* Int32 */
|
||||
static int hf_kerberos_restriction = -1; /* OCTET_STRING */
|
||||
static int hf_kerberos_PA_KERB_KEY_LIST_REQ_item = -1; /* ENCTYPE */
|
||||
static int hf_kerberos_kerbKeyListRep_key = -1; /* PA_KERB_KEY_LIST_REP_item */
|
||||
static int hf_kerberos_newpasswd = -1; /* OCTET_STRING */
|
||||
static int hf_kerberos_targname = -1; /* PrincipalName */
|
||||
static int hf_kerberos_targrealm = -1; /* Realm */
|
||||
|
|
@ -520,7 +524,7 @@ static int hf_kerberos_PAC_OPTIONS_FLAGS_forward_to_full_dc = -1;
|
|||
static int hf_kerberos_PAC_OPTIONS_FLAGS_resource_based_constrained_delegation = -1;
|
||||
|
||||
/*--- End of included file: packet-kerberos-hf.c ---*/
|
||||
#line 284 "./asn1/kerberos/packet-kerberos-template.c"
|
||||
#line 286 "./asn1/kerberos/packet-kerberos-template.c"
|
||||
|
||||
/* Initialize the subtree pointers */
|
||||
static gint ett_kerberos = -1;
|
||||
|
|
@ -612,6 +616,8 @@ static gint ett_kerberos_S4UUserID = -1;
|
|||
static gint ett_kerberos_PAC_OPTIONS_FLAGS = -1;
|
||||
static gint ett_kerberos_PA_PAC_OPTIONS = -1;
|
||||
static gint ett_kerberos_KERB_AD_RESTRICTION_ENTRY_U = -1;
|
||||
static gint ett_kerberos_PA_KERB_KEY_LIST_REQ = -1;
|
||||
static gint ett_kerberos_PA_KERB_KEY_LIST_REP = -1;
|
||||
static gint ett_kerberos_ChangePasswdData = -1;
|
||||
static gint ett_kerberos_PA_AUTHENTICATION_SET_ELEM = -1;
|
||||
static gint ett_kerberos_KrbFastArmor = -1;
|
||||
|
|
@ -633,7 +639,7 @@ static gint ett_kerberos_SPAKEResponse = -1;
|
|||
static gint ett_kerberos_PA_SPAKE = -1;
|
||||
|
||||
/*--- End of included file: packet-kerberos-ett.c ---*/
|
||||
#line 309 "./asn1/kerberos/packet-kerberos-template.c"
|
||||
#line 311 "./asn1/kerberos/packet-kerberos-template.c"
|
||||
|
||||
static expert_field ei_kerberos_missing_keytype = EI_INIT;
|
||||
static expert_field ei_kerberos_decrypted_keytype = EI_INIT;
|
||||
|
|
@ -750,6 +756,8 @@ typedef enum _KERBEROS_PADATA_TYPE_enum {
|
|||
KERBEROS_PA_PKU2U_NAME = 148,
|
||||
KERBEROS_PA_REQ_ENC_PA_REP = 149,
|
||||
KERBEROS_PA_SPAKE = 151,
|
||||
KERBEROS_PA_KERB_KEY_LIST_REQ = 161,
|
||||
KERBEROS_PA_KERB_KEY_LIST_REP = 162,
|
||||
KERBEROS_PA_SUPPORTED_ETYPES = 165,
|
||||
KERBEROS_PA_EXTENDED_ERROR = 166,
|
||||
KERBEROS_PA_PAC_OPTIONS = 167,
|
||||
|
|
@ -762,7 +770,7 @@ typedef enum _KERBEROS_KRBFASTARMORTYPES_enum {
|
|||
} KERBEROS_KRBFASTARMORTYPES_enum;
|
||||
|
||||
/*--- End of included file: packet-kerberos-val.h ---*/
|
||||
#line 323 "./asn1/kerberos/packet-kerberos-template.c"
|
||||
#line 325 "./asn1/kerberos/packet-kerberos-template.c"
|
||||
|
||||
static void
|
||||
call_kerberos_callbacks(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int tag, kerberos_callbacks *cb)
|
||||
|
|
@ -4417,7 +4425,7 @@ static const value_string kerberos_ENCTYPE_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_kerberos_ENCTYPE(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 327 "./asn1/kerberos/kerberos.cnf"
|
||||
#line 335 "./asn1/kerberos/kerberos.cnf"
|
||||
kerberos_private_data_t *private_data = kerberos_get_private_data(actx);
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&(private_data->etype));
|
||||
|
|
@ -4442,7 +4450,7 @@ dissect_kerberos_UInt32(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
static int
|
||||
dissect_kerberos_T_encryptedTicketData_cipher(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 331 "./asn1/kerberos/kerberos.cnf"
|
||||
#line 339 "./asn1/kerberos/kerberos.cnf"
|
||||
#ifdef HAVE_KERBEROS
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_index, dissect_krb5_decrypt_ticket_data);
|
||||
#else
|
||||
|
|
@ -4569,7 +4577,7 @@ static const value_string kerberos_CKSUMTYPE_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_kerberos_CKSUMTYPE(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 387 "./asn1/kerberos/kerberos.cnf"
|
||||
#line 395 "./asn1/kerberos/kerberos.cnf"
|
||||
kerberos_private_data_t *private_data = kerberos_get_private_data(actx);
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&(private_data->checksum_type));
|
||||
|
|
@ -4584,7 +4592,7 @@ dissect_kerberos_CKSUMTYPE(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
|
|||
|
||||
static int
|
||||
dissect_kerberos_T_checksum(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 391 "./asn1/kerberos/kerberos.cnf"
|
||||
#line 399 "./asn1/kerberos/kerberos.cnf"
|
||||
tvbuff_t *next_tvb;
|
||||
kerberos_private_data_t *private_data = kerberos_get_private_data(actx);
|
||||
|
||||
|
|
@ -4651,7 +4659,7 @@ dissect_kerberos_Int32(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
static int
|
||||
dissect_kerberos_T_keytype(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 405 "./asn1/kerberos/kerberos.cnf"
|
||||
#line 413 "./asn1/kerberos/kerberos.cnf"
|
||||
kerberos_private_data_t *private_data = kerberos_get_private_data(actx);
|
||||
|
||||
private_data->key_hidden_item = proto_tree_add_item(tree, hf_krb_key_hidden_item,
|
||||
|
|
@ -4673,7 +4681,7 @@ dissect_kerberos_T_keytype(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
|
|||
|
||||
static int
|
||||
dissect_kerberos_T_keyvalue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 418 "./asn1/kerberos/kerberos.cnf"
|
||||
#line 426 "./asn1/kerberos/kerberos.cnf"
|
||||
tvbuff_t *out_tvb;
|
||||
kerberos_private_data_t *private_data = kerberos_get_private_data(actx);
|
||||
|
||||
|
|
@ -4700,7 +4708,7 @@ static const ber_sequence_t EncryptionKey_sequence[] = {
|
|||
|
||||
static int
|
||||
dissect_kerberos_EncryptionKey(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 429 "./asn1/kerberos/kerberos.cnf"
|
||||
#line 437 "./asn1/kerberos/kerberos.cnf"
|
||||
kerberos_private_data_t *private_data = kerberos_get_private_data(actx);
|
||||
#ifdef HAVE_KERBEROS
|
||||
int start_offset = offset;
|
||||
|
|
@ -4730,7 +4738,7 @@ dissect_kerberos_EncryptionKey(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_kerberos_T_authenticator_subkey(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 448 "./asn1/kerberos/kerberos.cnf"
|
||||
#line 456 "./asn1/kerberos/kerberos.cnf"
|
||||
kerberos_private_data_t *private_data = kerberos_get_private_data(actx);
|
||||
gint save_encryption_key_parent_hf_index = private_data->save_encryption_key_parent_hf_index;
|
||||
kerberos_key_save_fn saved_encryption_key_fn = private_data->save_encryption_key_fn;
|
||||
|
|
@ -4779,7 +4787,7 @@ static const value_string kerberos_AUTHDATA_TYPE_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_kerberos_AUTHDATA_TYPE(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 517 "./asn1/kerberos/kerberos.cnf"
|
||||
#line 537 "./asn1/kerberos/kerberos.cnf"
|
||||
kerberos_private_data_t *private_data = kerberos_get_private_data(actx);
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&(private_data->ad_type));
|
||||
|
|
@ -4794,7 +4802,7 @@ dissect_kerberos_AUTHDATA_TYPE(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_kerberos_T_ad_data(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 521 "./asn1/kerberos/kerberos.cnf"
|
||||
#line 541 "./asn1/kerberos/kerberos.cnf"
|
||||
kerberos_private_data_t *private_data = kerberos_get_private_data(actx);
|
||||
|
||||
switch(private_data->ad_type){
|
||||
|
|
@ -4924,7 +4932,7 @@ dissect_kerberos_TicketFlags(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_kerberos_T_encTicketPart_key(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 493 "./asn1/kerberos/kerberos.cnf"
|
||||
#line 501 "./asn1/kerberos/kerberos.cnf"
|
||||
kerberos_private_data_t *private_data = kerberos_get_private_data(actx);
|
||||
gint save_encryption_key_parent_hf_index = private_data->save_encryption_key_parent_hf_index;
|
||||
kerberos_key_save_fn saved_encryption_key_fn = private_data->save_encryption_key_fn;
|
||||
|
|
@ -4983,7 +4991,7 @@ static const value_string kerberos_ADDR_TYPE_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_kerberos_ADDR_TYPE(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 554 "./asn1/kerberos/kerberos.cnf"
|
||||
#line 574 "./asn1/kerberos/kerberos.cnf"
|
||||
kerberos_private_data_t *private_data = kerberos_get_private_data(actx);
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&(private_data->addr_type));
|
||||
|
|
@ -4998,7 +5006,7 @@ dissect_kerberos_ADDR_TYPE(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
|
|||
|
||||
static int
|
||||
dissect_kerberos_T_address(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 276 "./asn1/kerberos/kerberos.cnf"
|
||||
#line 284 "./asn1/kerberos/kerberos.cnf"
|
||||
gint8 appclass;
|
||||
gboolean pc;
|
||||
gint32 tag;
|
||||
|
|
@ -5133,7 +5141,7 @@ static const value_string kerberos_MESSAGE_TYPE_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_kerberos_MESSAGE_TYPE(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 110 "./asn1/kerberos/kerberos.cnf"
|
||||
#line 112 "./asn1/kerberos/kerberos.cnf"
|
||||
kerberos_private_data_t *private_data = kerberos_get_private_data(actx);
|
||||
guint32 msgtype;
|
||||
|
||||
|
|
@ -5143,7 +5151,7 @@ dissect_kerberos_MESSAGE_TYPE(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
|
||||
|
||||
#line 116 "./asn1/kerberos/kerberos.cnf"
|
||||
#line 118 "./asn1/kerberos/kerberos.cnf"
|
||||
if (gbl_do_col_info) {
|
||||
col_add_str(actx->pinfo->cinfo, COL_INFO,
|
||||
val_to_str(msgtype, krb5_msg_types,
|
||||
|
|
@ -5226,6 +5234,8 @@ static const value_string kerberos_PADATA_TYPE_vals[] = {
|
|||
{ KERBEROS_PA_PKU2U_NAME, "pA-PKU2U-NAME" },
|
||||
{ KERBEROS_PA_REQ_ENC_PA_REP, "pA-REQ-ENC-PA-REP" },
|
||||
{ KERBEROS_PA_SPAKE, "pA-SPAKE" },
|
||||
{ KERBEROS_PA_KERB_KEY_LIST_REQ, "pA-KERB-KEY-LIST-REQ" },
|
||||
{ KERBEROS_PA_KERB_KEY_LIST_REP, "pA-KERB-KEY-LIST-REP" },
|
||||
{ KERBEROS_PA_SUPPORTED_ETYPES, "pA-SUPPORTED-ETYPES" },
|
||||
{ KERBEROS_PA_EXTENDED_ERROR, "pA-EXTENDED-ERROR" },
|
||||
{ KERBEROS_PA_PAC_OPTIONS, "pA-PAC-OPTIONS" },
|
||||
|
|
@ -5236,14 +5246,14 @@ static const value_string kerberos_PADATA_TYPE_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_kerberos_PADATA_TYPE(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 175 "./asn1/kerberos/kerberos.cnf"
|
||||
#line 177 "./asn1/kerberos/kerberos.cnf"
|
||||
kerberos_private_data_t* private_data = kerberos_get_private_data(actx);
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&(private_data->padata_type));
|
||||
|
||||
|
||||
|
||||
#line 178 "./asn1/kerberos/kerberos.cnf"
|
||||
#line 180 "./asn1/kerberos/kerberos.cnf"
|
||||
if(tree){
|
||||
proto_item_append_text(tree, " %s",
|
||||
val_to_str(private_data->padata_type, kerberos_PADATA_TYPE_vals,
|
||||
|
|
@ -5258,7 +5268,7 @@ dissect_kerberos_PADATA_TYPE(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_kerberos_T_padata_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 185 "./asn1/kerberos/kerberos.cnf"
|
||||
#line 187 "./asn1/kerberos/kerberos.cnf"
|
||||
proto_tree *sub_tree=tree;
|
||||
kerberos_private_data_t* private_data = kerberos_get_private_data(actx);
|
||||
|
||||
|
|
@ -5332,6 +5342,12 @@ dissect_kerberos_T_padata_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
|
|||
case KERBEROS_PA_ENCRYPTED_CHALLENGE:
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, sub_tree, tvb, offset,hf_index, dissect_kerberos_EncryptedChallenge);
|
||||
break;
|
||||
case KERBEROS_PA_KERB_KEY_LIST_REQ:
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, sub_tree, tvb, offset, hf_index, dissect_kerberos_PA_KERB_KEY_LIST_REQ);
|
||||
break;
|
||||
case KERBEROS_PA_KERB_KEY_LIST_REP:
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, sub_tree, tvb, offset, hf_index, dissect_kerberos_PA_KERB_KEY_LIST_REP);
|
||||
break;
|
||||
case KERBEROS_PA_SUPPORTED_ETYPES:
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, sub_tree, tvb, offset,hf_index, dissect_kerberos_PA_SUPPORTED_ENCTYPES);
|
||||
break;
|
||||
|
|
@ -5445,7 +5461,7 @@ dissect_kerberos_SEQUENCE_OF_ENCTYPE(gboolean implicit_tag _U_, tvbuff_t *tvb _U
|
|||
|
||||
static int
|
||||
dissect_kerberos_T_encryptedAuthorizationData_cipher(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 338 "./asn1/kerberos/kerberos.cnf"
|
||||
#line 346 "./asn1/kerberos/kerberos.cnf"
|
||||
#ifdef HAVE_KERBEROS
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_index, dissect_krb5_decrypt_authorization_data);
|
||||
#else
|
||||
|
|
@ -5507,7 +5523,7 @@ static const ber_sequence_t KDC_REQ_BODY_sequence[] = {
|
|||
|
||||
static int
|
||||
dissect_kerberos_KDC_REQ_BODY(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 558 "./asn1/kerberos/kerberos.cnf"
|
||||
#line 578 "./asn1/kerberos/kerberos.cnf"
|
||||
conversation_t *conversation;
|
||||
|
||||
/*
|
||||
|
|
@ -5568,7 +5584,7 @@ dissect_kerberos_AS_REQ(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
static int
|
||||
dissect_kerberos_T_encryptedKDCREPData_cipher(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 352 "./asn1/kerberos/kerberos.cnf"
|
||||
#line 360 "./asn1/kerberos/kerberos.cnf"
|
||||
#ifdef HAVE_KERBEROS
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_index, dissect_krb5_decrypt_KDC_REP_data);
|
||||
#else
|
||||
|
|
@ -5658,7 +5674,7 @@ static int * const APOptions_bits[] = {
|
|||
|
||||
static int
|
||||
dissect_kerberos_APOptions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 98 "./asn1/kerberos/kerberos.cnf"
|
||||
#line 100 "./asn1/kerberos/kerberos.cnf"
|
||||
tvbuff_t *out_tvb = NULL;
|
||||
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
|
||||
APOptions_bits, 3, hf_index, ett_kerberos_APOptions,
|
||||
|
|
@ -5682,7 +5698,7 @@ dissect_kerberos_APOptions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
|
|||
|
||||
static int
|
||||
dissect_kerberos_T_encryptedAuthenticator_cipher(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 345 "./asn1/kerberos/kerberos.cnf"
|
||||
#line 353 "./asn1/kerberos/kerberos.cnf"
|
||||
#ifdef HAVE_KERBEROS
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_index, dissect_krb5_decrypt_authenticator_data);
|
||||
#else
|
||||
|
|
@ -5744,7 +5760,7 @@ dissect_kerberos_AP_REQ(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
static int
|
||||
dissect_kerberos_T_encryptedAPREPData_cipher(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 366 "./asn1/kerberos/kerberos.cnf"
|
||||
#line 374 "./asn1/kerberos/kerberos.cnf"
|
||||
#ifdef HAVE_KERBEROS
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_index, dissect_krb5_decrypt_AP_REP_data);
|
||||
#else
|
||||
|
|
@ -5804,7 +5820,7 @@ dissect_kerberos_AP_REP(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
static int
|
||||
dissect_kerberos_T_kRB_SAFE_BODY_user_data(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 581 "./asn1/kerberos/kerberos.cnf"
|
||||
#line 601 "./asn1/kerberos/kerberos.cnf"
|
||||
kerberos_private_data_t* private_data = kerberos_get_private_data(actx);
|
||||
tvbuff_t *new_tvb;
|
||||
offset=dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_index, &new_tvb);
|
||||
|
|
@ -5867,7 +5883,7 @@ dissect_kerberos_KRB_SAFE(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
|
|||
|
||||
static int
|
||||
dissect_kerberos_T_encryptedKrbPrivData_cipher(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 373 "./asn1/kerberos/kerberos.cnf"
|
||||
#line 381 "./asn1/kerberos/kerberos.cnf"
|
||||
#ifdef HAVE_KERBEROS
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_index, dissect_krb5_decrypt_PRIV_data);
|
||||
#else
|
||||
|
|
@ -5927,7 +5943,7 @@ dissect_kerberos_KRB_PRIV(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
|
|||
|
||||
static int
|
||||
dissect_kerberos_T_encryptedKrbCredData_cipher(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 380 "./asn1/kerberos/kerberos.cnf"
|
||||
#line 388 "./asn1/kerberos/kerberos.cnf"
|
||||
#ifdef HAVE_KERBEROS
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_index, dissect_krb5_decrypt_CRED_data);
|
||||
#else
|
||||
|
|
@ -5988,7 +6004,7 @@ dissect_kerberos_KRB_CRED(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
|
|||
|
||||
static int
|
||||
dissect_kerberos_T_encKDCRepPart_key(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 472 "./asn1/kerberos/kerberos.cnf"
|
||||
#line 480 "./asn1/kerberos/kerberos.cnf"
|
||||
kerberos_private_data_t *private_data = kerberos_get_private_data(actx);
|
||||
gint save_encryption_key_parent_hf_index = private_data->save_encryption_key_parent_hf_index;
|
||||
kerberos_key_save_fn saved_encryption_key_fn = private_data->save_encryption_key_fn;
|
||||
|
|
@ -6082,14 +6098,14 @@ dissect_kerberos_METHOD_DATA(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_kerberos_T_encrypted_pa_data(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 597 "./asn1/kerberos/kerberos.cnf"
|
||||
#line 617 "./asn1/kerberos/kerberos.cnf"
|
||||
kerberos_private_data_t* private_data = kerberos_get_private_data(actx);
|
||||
private_data->is_enc_padata = TRUE;
|
||||
|
||||
|
||||
offset = dissect_kerberos_METHOD_DATA(implicit_tag, tvb, offset, actx, tree, hf_index);
|
||||
|
||||
#line 601 "./asn1/kerberos/kerberos.cnf"
|
||||
#line 621 "./asn1/kerberos/kerberos.cnf"
|
||||
private_data->is_enc_padata = FALSE;
|
||||
|
||||
|
||||
|
|
@ -6146,7 +6162,7 @@ dissect_kerberos_EncTGSRepPart(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_kerberos_T_encAPRepPart_subkey(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 460 "./asn1/kerberos/kerberos.cnf"
|
||||
#line 468 "./asn1/kerberos/kerberos.cnf"
|
||||
kerberos_private_data_t *private_data = kerberos_get_private_data(actx);
|
||||
gint save_encryption_key_parent_hf_index = private_data->save_encryption_key_parent_hf_index;
|
||||
kerberos_key_save_fn saved_encryption_key_fn = private_data->save_encryption_key_fn;
|
||||
|
|
@ -6195,7 +6211,7 @@ dissect_kerberos_EncAPRepPart(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_kerberos_T_encKrbPrivPart_user_data(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 589 "./asn1/kerberos/kerberos.cnf"
|
||||
#line 609 "./asn1/kerberos/kerberos.cnf"
|
||||
kerberos_private_data_t* private_data = kerberos_get_private_data(actx);
|
||||
tvbuff_t *new_tvb;
|
||||
offset=dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_index, &new_tvb);
|
||||
|
|
@ -6241,7 +6257,7 @@ dissect_kerberos_ENC_KRB_PRIV_PART(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_kerberos_T_krbCredInfo_key(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 505 "./asn1/kerberos/kerberos.cnf"
|
||||
#line 513 "./asn1/kerberos/kerberos.cnf"
|
||||
kerberos_private_data_t *private_data = kerberos_get_private_data(actx);
|
||||
gint save_encryption_key_parent_hf_index = private_data->save_encryption_key_parent_hf_index;
|
||||
kerberos_key_save_fn saved_encryption_key_fn = private_data->save_encryption_key_fn;
|
||||
|
|
@ -6430,7 +6446,7 @@ static const value_string kerberos_ERROR_CODE_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_kerberos_ERROR_CODE(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 132 "./asn1/kerberos/kerberos.cnf"
|
||||
#line 134 "./asn1/kerberos/kerberos.cnf"
|
||||
kerberos_private_data_t *private_data = kerberos_get_private_data(actx);
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&private_data->errorcode);
|
||||
|
|
@ -6438,7 +6454,7 @@ dissect_kerberos_ERROR_CODE(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
|
|||
|
||||
|
||||
|
||||
#line 136 "./asn1/kerberos/kerberos.cnf"
|
||||
#line 138 "./asn1/kerberos/kerberos.cnf"
|
||||
if (private_data->errorcode) {
|
||||
col_add_fstr(actx->pinfo->cinfo, COL_INFO,
|
||||
"KRB Error: %s",
|
||||
|
|
@ -6454,7 +6470,7 @@ dissect_kerberos_ERROR_CODE(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
|
|||
|
||||
static int
|
||||
dissect_kerberos_T_e_data(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 145 "./asn1/kerberos/kerberos.cnf"
|
||||
#line 147 "./asn1/kerberos/kerberos.cnf"
|
||||
kerberos_private_data_t *private_data = kerberos_get_private_data(actx);
|
||||
|
||||
switch (private_data->errorcode) {
|
||||
|
|
@ -6562,7 +6578,7 @@ dissect_kerberos_Applications(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_kerberos_T_pA_ENC_TIMESTAMP_cipher(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 359 "./asn1/kerberos/kerberos.cnf"
|
||||
#line 367 "./asn1/kerberos/kerberos.cnf"
|
||||
#ifdef HAVE_KERBEROS
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_index, dissect_krb5_decrypt_PA_ENC_TIMESTAMP);
|
||||
#else
|
||||
|
|
@ -6746,7 +6762,7 @@ dissect_kerberos_PA_S4U2Self(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_kerberos_T_subject_certificate(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 551 "./asn1/kerberos/kerberos.cnf"
|
||||
#line 571 "./asn1/kerberos/kerberos.cnf"
|
||||
offset=dissect_ber_octet_string_wcb(implicit_tag, actx, tree, tvb, offset,hf_index, dissect_x509af_Certificate);
|
||||
|
||||
|
||||
|
|
@ -6856,6 +6872,63 @@ dissect_kerberos_KERB_AD_RESTRICTION_ENTRY(gboolean implicit_tag _U_, tvbuff_t *
|
|||
}
|
||||
|
||||
|
||||
static const ber_sequence_t PA_KERB_KEY_LIST_REQ_sequence_of[1] = {
|
||||
{ &hf_kerberos_PA_KERB_KEY_LIST_REQ_item, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_kerberos_ENCTYPE },
|
||||
};
|
||||
|
||||
static int
|
||||
dissect_kerberos_PA_KERB_KEY_LIST_REQ(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
|
||||
PA_KERB_KEY_LIST_REQ_sequence_of, hf_index, ett_kerberos_PA_KERB_KEY_LIST_REQ);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
||||
|
||||
static int
|
||||
dissect_kerberos_PA_KERB_KEY_LIST_REP_Key(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
offset = dissect_kerberos_EncryptionKey(implicit_tag, tvb, offset, actx, tree, hf_index);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
||||
|
||||
static int
|
||||
dissect_kerberos_PA_KERB_KEY_LIST_REP_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 525 "./asn1/kerberos/kerberos.cnf"
|
||||
kerberos_private_data_t *private_data = kerberos_get_private_data(actx);
|
||||
gint save_encryption_key_parent_hf_index = private_data->save_encryption_key_parent_hf_index;
|
||||
kerberos_key_save_fn saved_encryption_key_fn = private_data->save_encryption_key_fn;
|
||||
private_data->save_encryption_key_parent_hf_index = hf_kerberos_kerbKeyListRep_key;
|
||||
#ifdef HAVE_KERBEROS
|
||||
private_data->save_encryption_key_fn = save_encryption_key;
|
||||
#endif
|
||||
offset = dissect_kerberos_PA_KERB_KEY_LIST_REP_Key(implicit_tag, tvb, offset, actx, tree, hf_index);
|
||||
|
||||
private_data->save_encryption_key_parent_hf_index = save_encryption_key_parent_hf_index;
|
||||
private_data->save_encryption_key_fn = saved_encryption_key_fn;
|
||||
|
||||
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
||||
static const ber_sequence_t PA_KERB_KEY_LIST_REP_sequence_of[1] = {
|
||||
{ &hf_kerberos_kerbKeyListRep_key, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_kerberos_PA_KERB_KEY_LIST_REP_item },
|
||||
};
|
||||
|
||||
static int
|
||||
dissect_kerberos_PA_KERB_KEY_LIST_REP(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
|
||||
PA_KERB_KEY_LIST_REP_sequence_of, hf_index, ett_kerberos_PA_KERB_KEY_LIST_REP);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
||||
static const ber_sequence_t ChangePasswdData_sequence[] = {
|
||||
{ &hf_kerberos_newpasswd , BER_CLASS_CON, 0, 0, dissect_kerberos_OCTET_STRING },
|
||||
{ &hf_kerberos_targname , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_kerberos_PrincipalName },
|
||||
|
|
@ -6897,7 +6970,7 @@ static const value_string kerberos_KrbFastArmorTypes_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_kerberos_KrbFastArmorTypes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 628 "./asn1/kerberos/kerberos.cnf"
|
||||
#line 648 "./asn1/kerberos/kerberos.cnf"
|
||||
kerberos_private_data_t *private_data = kerberos_get_private_data(actx);
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&(private_data->fast_type));
|
||||
|
|
@ -6912,7 +6985,7 @@ dissect_kerberos_KrbFastArmorTypes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_kerberos_T_armor_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 632 "./asn1/kerberos/kerberos.cnf"
|
||||
#line 652 "./asn1/kerberos/kerberos.cnf"
|
||||
kerberos_private_data_t *private_data = kerberos_get_private_data(actx);
|
||||
|
||||
switch(private_data->fast_type){
|
||||
|
|
@ -6950,7 +7023,7 @@ dissect_kerberos_KrbFastArmor(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_kerberos_T_encryptedKrbFastReq_cipher(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 604 "./asn1/kerberos/kerberos.cnf"
|
||||
#line 624 "./asn1/kerberos/kerberos.cnf"
|
||||
#ifdef HAVE_KERBEROS
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_index, dissect_krb5_decrypt_KrbFastReq);
|
||||
#else
|
||||
|
|
@ -7016,7 +7089,7 @@ dissect_kerberos_PA_FX_FAST_REQUEST(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
|
|||
|
||||
static int
|
||||
dissect_kerberos_T_encryptedKrbFastResponse_cipher(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 612 "./asn1/kerberos/kerberos.cnf"
|
||||
#line 632 "./asn1/kerberos/kerberos.cnf"
|
||||
#ifdef HAVE_KERBEROS
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_index, dissect_krb5_decrypt_KrbFastResponse);
|
||||
#else
|
||||
|
|
@ -7080,7 +7153,7 @@ dissect_kerberos_PA_FX_FAST_REPLY(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_kerberos_T_encryptedChallenge_cipher(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 620 "./asn1/kerberos/kerberos.cnf"
|
||||
#line 640 "./asn1/kerberos/kerberos.cnf"
|
||||
#ifdef HAVE_KERBEROS
|
||||
offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_index, dissect_krb5_decrypt_EncryptedChallenge);
|
||||
#else
|
||||
|
|
@ -7281,7 +7354,7 @@ static const ber_choice_t PA_SPAKE_choice[] = {
|
|||
|
||||
static int
|
||||
dissect_kerberos_PA_SPAKE(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 646 "./asn1/kerberos/kerberos.cnf"
|
||||
#line 666 "./asn1/kerberos/kerberos.cnf"
|
||||
kerberos_private_data_t* private_data = kerberos_get_private_data(actx);
|
||||
offset = dissect_ber_choice(actx, tree, tvb, offset,
|
||||
PA_SPAKE_choice, hf_index, ett_kerberos_PA_SPAKE,
|
||||
|
|
@ -7289,7 +7362,7 @@ dissect_kerberos_PA_SPAKE(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
|
|||
|
||||
|
||||
|
||||
#line 649 "./asn1/kerberos/kerberos.cnf"
|
||||
#line 669 "./asn1/kerberos/kerberos.cnf"
|
||||
if(tree){
|
||||
proto_item_append_text(tree, " %s",
|
||||
val_to_str(private_data->padata_type, kerberos_PA_SPAKE_vals,
|
||||
|
|
@ -7301,7 +7374,7 @@ dissect_kerberos_PA_SPAKE(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
|
|||
|
||||
|
||||
/*--- End of included file: packet-kerberos-fn.c ---*/
|
||||
#line 3832 "./asn1/kerberos/packet-kerberos-template.c"
|
||||
#line 3834 "./asn1/kerberos/packet-kerberos-template.c"
|
||||
|
||||
#ifdef HAVE_KERBEROS
|
||||
static const ber_sequence_t PA_ENC_TS_ENC_sequence[] = {
|
||||
|
|
@ -8631,6 +8704,14 @@ void proto_register_kerberos(void) {
|
|||
{ "restriction", "kerberos.restriction",
|
||||
FT_BYTES, BASE_NONE, NULL, 0,
|
||||
"OCTET_STRING", HFILL }},
|
||||
{ &hf_kerberos_PA_KERB_KEY_LIST_REQ_item,
|
||||
{ "ENCTYPE", "kerberos.ENCTYPE",
|
||||
FT_INT32, BASE_DEC, VALS(kerberos_ENCTYPE_vals), 0,
|
||||
NULL, HFILL }},
|
||||
{ &hf_kerberos_kerbKeyListRep_key,
|
||||
{ "key", "kerberos.kerbKeyListRep.key_element",
|
||||
FT_NONE, BASE_NONE, NULL, 0,
|
||||
"PA_KERB_KEY_LIST_REP_item", HFILL }},
|
||||
{ &hf_kerberos_newpasswd,
|
||||
{ "newpasswd", "kerberos.newpasswd",
|
||||
FT_BYTES, BASE_NONE, NULL, 0,
|
||||
|
|
@ -8981,7 +9062,7 @@ void proto_register_kerberos(void) {
|
|||
NULL, HFILL }},
|
||||
|
||||
/*--- End of included file: packet-kerberos-hfarr.c ---*/
|
||||
#line 4603 "./asn1/kerberos/packet-kerberos-template.c"
|
||||
#line 4605 "./asn1/kerberos/packet-kerberos-template.c"
|
||||
};
|
||||
|
||||
/* List of subtrees */
|
||||
|
|
@ -9075,6 +9156,8 @@ void proto_register_kerberos(void) {
|
|||
&ett_kerberos_PAC_OPTIONS_FLAGS,
|
||||
&ett_kerberos_PA_PAC_OPTIONS,
|
||||
&ett_kerberos_KERB_AD_RESTRICTION_ENTRY_U,
|
||||
&ett_kerberos_PA_KERB_KEY_LIST_REQ,
|
||||
&ett_kerberos_PA_KERB_KEY_LIST_REP,
|
||||
&ett_kerberos_ChangePasswdData,
|
||||
&ett_kerberos_PA_AUTHENTICATION_SET_ELEM,
|
||||
&ett_kerberos_KrbFastArmor,
|
||||
|
|
@ -9096,7 +9179,7 @@ void proto_register_kerberos(void) {
|
|||
&ett_kerberos_PA_SPAKE,
|
||||
|
||||
/*--- End of included file: packet-kerberos-ettarr.c ---*/
|
||||
#line 4630 "./asn1/kerberos/packet-kerberos-template.c"
|
||||
#line 4632 "./asn1/kerberos/packet-kerberos-template.c"
|
||||
};
|
||||
|
||||
static ei_register_info ei[] = {
|
||||
|
|
|
|||
Loading…
Reference in New Issue