diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:53 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:53 +0000 |
| commit | a86c5f7cae7ec9a3398300555a0b644689d946a1 (patch) | |
| tree | 39fe4b107c71174fd1e8a8ceb9a4d2aa14116248 /epan/dissectors/packet-gpef.c | |
| parent | Releasing progress-linux version 4.2.6-1~progress7.99u1. (diff) | |
| download | wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.tar.xz wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.zip | |
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'epan/dissectors/packet-gpef.c')
| -rw-r--r-- | epan/dissectors/packet-gpef.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/epan/dissectors/packet-gpef.c b/epan/dissectors/packet-gpef.c index e92e73a2..7f789f90 100644 --- a/epan/dissectors/packet-gpef.c +++ b/epan/dissectors/packet-gpef.c @@ -19,18 +19,18 @@ void proto_register_gpef(void); -static int proto_gpef = -1; -static int hf_gpef_keycount = -1; -static int hf_gpef_efskey = -1; -static int hf_gpef_efskey_length1 = -1; -static int hf_gpef_efskey_length2 = -1; -static int hf_gpef_efskey_sid_offset = -1; -static int hf_gpef_efskey_cert_offset = -1; -static int hf_gpef_efskey_cert_length = -1; -static int hf_gpef_efskey_certificate = -1; +static int proto_gpef; +static int hf_gpef_keycount; +static int hf_gpef_efskey; +static int hf_gpef_efskey_length1; +static int hf_gpef_efskey_length2; +static int hf_gpef_efskey_sid_offset; +static int hf_gpef_efskey_cert_offset; +static int hf_gpef_efskey_cert_length; +static int hf_gpef_efskey_certificate; -static gint ett_gpef = -1; -static gint ett_gpef_efskey = -1; +static int ett_gpef; +static int ett_gpef_efskey; /* MS-GPEF section 2.2.1.2.2 EfsKey*/ @@ -40,11 +40,11 @@ dissect_gpef_efskey(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *p proto_item *item = NULL; proto_tree *tree = NULL; int old_offset = offset; - guint32 length1, sid_offset; - guint32 cert_length, cert_offset; + uint32_t length1, sid_offset; + uint32_t cert_length, cert_offset; tvbuff_t *next_tvb; asn1_ctx_t asn1_ctx; - asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); + asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, true, pinfo); if (parent_tree) { item = proto_tree_add_item(parent_tree, hf_gpef_efskey, tvb, -1, -1, ENC_NA); @@ -86,7 +86,7 @@ dissect_gpef_efskey(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *p /* certificate */ next_tvb = tvb_new_subset_length(tvb, old_offset+4+cert_offset, cert_length); - (void)dissect_x509af_Certificate(FALSE, next_tvb, 0, &asn1_ctx, tree, hf_gpef_efskey_certificate); + (void)dissect_x509af_Certificate(false, next_tvb, 0, &asn1_ctx, tree, hf_gpef_efskey_certificate); offset = old_offset + length1; @@ -101,7 +101,7 @@ dissect_gpef_efsblob(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int offset = 0; proto_tree *tree; proto_item *item; - guint32 count; + uint32_t count; item = proto_tree_add_item(parent_tree, proto_gpef, tvb, 0, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_gpef); @@ -159,7 +159,7 @@ proto_register_gpef(void) }; - static gint *ett[] = { + static int *ett[] = { &ett_gpef, &ett_gpef_efskey, }; |