8f3ad91905
git/epan/dissectors/packet-a21.c:478:25: error: 'item' was marked unused but was used
[-Werror,-Wused-but-marked-unused]
proto_item_append_text(item, "%s", val_to_str_const(event_id, a21_event_vals, "Unknown"));
^
Added manual change id because file-jpeg.c forced the use of commit -n
Change-Id: Iffff53d6253758c8454d9583f0a11f317c8390cb
Fix warnings/errors of type:
git/epan/dissectors/packet-ax25-kiss.c:205:52: error: 'pseudo_header' was marked unused but was
used [-Werror,-Wused-but-marked-unused]
return capture_ax25( pd, l_offset, len, cpinfo, pseudo_header );
Fix checkhf warnings:
Unused entry: epan/dissectors/packet-artnet.c, hf_artnet_address_netswitch
Unused entry: epan/dissectors/packet-artnet.c, hf_artnet_address_subswitch
Unused entry: epan/dissectors/packet-artnet.c, hf_artnet_poll_reply_trailer
Unused entry: epan/dissectors/packet-artnet.c, hf_artnet_rdm_universe
Unused entry: epan/dissectors/packet-artnet.c, hf_artnet_tod_data_universe
Change-Id: Id1fa12afb97a8e9cd4ed0ea25351c3b2639c930e
Reviewed-on: https://code.wireshark.org/review/14667
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
129 lines
3.6 KiB
C
129 lines
3.6 KiB
C
/* packet-app-pkix-cert.c
|
|
*
|
|
* Routines for application/pkix-cert media dissection
|
|
* Copyright 2004, Yaniv Kaul.
|
|
*
|
|
* Refer to the AUTHORS file or the AUTHORS section in the man page
|
|
* for contacting the author(s) of this file.
|
|
*
|
|
* Wireshark - Network traffic analyzer
|
|
* By Gerald Combs <gerald@wireshark.org>
|
|
* Copyright 1998 Gerald Combs
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
|
|
#include "config.h"
|
|
|
|
#include <epan/packet.h>
|
|
#include <epan/asn1.h>
|
|
#include "packet-x509af.h"
|
|
|
|
|
|
void proto_register_cert(void);
|
|
void proto_reg_handoff_cert(void);
|
|
|
|
/* Initialize the protocol and registered fields */
|
|
static int proto_cert = -1;
|
|
|
|
static gint hf_cert = -1;
|
|
|
|
/* Initialize the subtree pointers */
|
|
static gint ett_cert = -1;
|
|
|
|
|
|
static int
|
|
dissect_cert(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
|
|
{
|
|
proto_tree *subtree = NULL;
|
|
proto_item *ti;
|
|
asn1_ctx_t asn1_ctx;
|
|
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
|
|
|
|
col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ", "(application/pkix-cert)");
|
|
|
|
if (tree) {
|
|
ti = proto_tree_add_item(tree, proto_cert, tvb, 0, -1, ENC_NA);
|
|
subtree = proto_item_add_subtree(ti, ett_cert);
|
|
}
|
|
|
|
dissect_x509af_Certificate(FALSE, tvb, 0, &asn1_ctx, subtree, hf_cert);
|
|
return tvb_captured_length(tvb);
|
|
}
|
|
|
|
|
|
/****************** Register the protocol with Wireshark ******************/
|
|
|
|
|
|
/* This format is required because a script is used to build the C function
|
|
* that calls the protocol registration. */
|
|
|
|
void
|
|
proto_register_cert(void)
|
|
{
|
|
/*
|
|
* Setup list of header fields.
|
|
*/
|
|
static hf_register_info hf[] = {
|
|
{ &hf_cert,
|
|
{ "Certificate", "pkix-cert.cert", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL}},
|
|
};
|
|
|
|
/* Setup protocol subtree array */
|
|
static gint *ett[] = {
|
|
&ett_cert,
|
|
};
|
|
|
|
/* Register the protocol name and description */
|
|
proto_cert = proto_register_protocol(
|
|
"PKIX CERT File Format",
|
|
"PKIX Certificate",
|
|
"pkix-cert"
|
|
);
|
|
|
|
/* Required function calls to register the header fields
|
|
* and subtrees used */
|
|
proto_register_field_array(proto_cert, hf, array_length(hf));
|
|
proto_register_subtree_array(ett, array_length(ett));
|
|
|
|
register_dissector("application/pkix-cert", dissect_cert, proto_cert);
|
|
}
|
|
|
|
|
|
void
|
|
proto_reg_handoff_cert(void)
|
|
{
|
|
dissector_handle_t cert_handle;
|
|
|
|
cert_handle = create_dissector_handle(dissect_cert, proto_cert);
|
|
|
|
/* Register the PKIX-CERT media type */
|
|
dissector_add_string("media_type", "application/pkix-cert", cert_handle);
|
|
}
|
|
|
|
/*
|
|
* Editor modelines - http://www.wireshark.org/tools/modelines.html
|
|
*
|
|
* Local variables:
|
|
* c-basic-offset: 8
|
|
* tab-width: 8
|
|
* indent-tabs-mode: nil
|
|
* End:
|
|
*
|
|
* vi: set shiftwidth=8 tabstop=8 expandtab:
|
|
* :indentSize=8:tabSize=8:noTabs=true:
|
|
*/
|