From c47e788c94af5656ffbc83ebbe03a8539cdcde72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stig=20Bj=C3=B8rlykke?= Date: Sat, 16 May 2009 22:07:03 +0000 Subject: Regenerate all asn2wrs generated dissectors. svn path=/trunk/; revision=28379 --- epan/dissectors/packet-cmp.c | 50 ++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 25 deletions(-) (limited to 'epan/dissectors/packet-cmp.c') diff --git a/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c index cb4df8ad26..4c88ef087d 100644 --- a/epan/dissectors/packet-cmp.c +++ b/epan/dissectors/packet-cmp.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-cmp.c */ -/* ../../tools/asn2wrs.py -b -p cmp -c cmp.cnf -s packet-cmp-template CMP.asn */ +/* ../../tools/asn2wrs.py -b -p cmp -c ./cmp.cnf -s ./packet-cmp-template -D . CMP.asn */ /* Input file: packet-cmp-template.c */ @@ -1822,11 +1822,11 @@ void proto_register_cmp(void) { FT_UINT32, BASE_DEC, NULL, 0, "cmp.SEQUENCE_SIZE_1_MAX_OF_CMPCertificate", HFILL }}, { &hf_cmp_extraCerts_item, - { "extraCerts", "cmp.extraCerts_item", + { "CMPCertificate", "cmp.CMPCertificate", FT_UINT32, BASE_DEC, VALS(cmp_CMPCertificate_vals), 0, "cmp.CMPCertificate", HFILL }}, { &hf_cmp_PKIMessages_item, - { "PKIMessages", "cmp.PKIMessages_item", + { "PKIMessage", "cmp.PKIMessage", FT_NONE, BASE_NONE, NULL, 0, "cmp.PKIMessage", HFILL }}, { &hf_cmp_pvno, @@ -1878,11 +1878,11 @@ void proto_register_cmp(void) { FT_UINT32, BASE_DEC, NULL, 0, "cmp.SEQUENCE_SIZE_1_MAX_OF_InfoTypeAndValue", HFILL }}, { &hf_cmp_generalInfo_item, - { "generalInfo", "cmp.generalInfo_item", + { "InfoTypeAndValue", "cmp.InfoTypeAndValue", FT_NONE, BASE_NONE, NULL, 0, "cmp.InfoTypeAndValue", HFILL }}, { &hf_cmp_PKIFreeText_item, - { "PKIFreeText", "cmp.PKIFreeText_item", + { "PKIFreeText item", "cmp.PKIFreeText_item", FT_STRING, BASE_NONE, NULL, 0, "cmp.UTF8String", HFILL }}, { &hf_cmp_ir, @@ -2034,7 +2034,7 @@ void proto_register_cmp(void) { FT_BYTES, BASE_HEX, NULL, 0, "cmp.BIT_STRING", HFILL }}, { &hf_cmp_POPODecKeyChallContent_item, - { "POPODecKeyChallContent", "cmp.POPODecKeyChallContent_item", + { "Challenge", "cmp.Challenge", FT_NONE, BASE_NONE, NULL, 0, "cmp.Challenge", HFILL }}, { &hf_cmp_witness, @@ -2046,7 +2046,7 @@ void proto_register_cmp(void) { FT_BYTES, BASE_HEX, NULL, 0, "cmp.OCTET_STRING", HFILL }}, { &hf_cmp_POPODecKeyRespContent_item, - { "POPODecKeyRespContent", "cmp.POPODecKeyRespContent_item", + { "POPODecKeyRespContent item", "cmp.POPODecKeyRespContent_item", FT_INT32, BASE_DEC, NULL, 0, "cmp.INTEGER", HFILL }}, { &hf_cmp_caPubs, @@ -2054,7 +2054,7 @@ void proto_register_cmp(void) { FT_UINT32, BASE_DEC, NULL, 0, "cmp.SEQUENCE_SIZE_1_MAX_OF_CMPCertificate", HFILL }}, { &hf_cmp_caPubs_item, - { "caPubs", "cmp.caPubs_item", + { "CMPCertificate", "cmp.CMPCertificate", FT_UINT32, BASE_DEC, VALS(cmp_CMPCertificate_vals), 0, "cmp.CMPCertificate", HFILL }}, { &hf_cmp_response, @@ -2062,7 +2062,7 @@ void proto_register_cmp(void) { FT_UINT32, BASE_DEC, NULL, 0, "cmp.SEQUENCE_OF_CertResponse", HFILL }}, { &hf_cmp_response_item, - { "response", "cmp.response_item", + { "CertResponse", "cmp.CertResponse", FT_NONE, BASE_NONE, NULL, 0, "cmp.CertResponse", HFILL }}, { &hf_cmp_certReqId, @@ -2110,7 +2110,7 @@ void proto_register_cmp(void) { FT_UINT32, BASE_DEC, NULL, 0, "cmp.SEQUENCE_SIZE_1_MAX_OF_CMPCertificate", HFILL }}, { &hf_cmp_caCerts_item, - { "caCerts", "cmp.caCerts_item", + { "CMPCertificate", "cmp.CMPCertificate", FT_UINT32, BASE_DEC, VALS(cmp_CMPCertificate_vals), 0, "cmp.CMPCertificate", HFILL }}, { &hf_cmp_keyPairHist, @@ -2118,11 +2118,11 @@ void proto_register_cmp(void) { FT_UINT32, BASE_DEC, NULL, 0, "cmp.SEQUENCE_SIZE_1_MAX_OF_CertifiedKeyPair", HFILL }}, { &hf_cmp_keyPairHist_item, - { "keyPairHist", "cmp.keyPairHist_item", + { "CertifiedKeyPair", "cmp.CertifiedKeyPair", FT_NONE, BASE_NONE, NULL, 0, "cmp.CertifiedKeyPair", HFILL }}, { &hf_cmp_RevReqContent_item, - { "RevReqContent", "cmp.RevReqContent_item", + { "RevDetails", "cmp.RevDetails", FT_NONE, BASE_NONE, NULL, 0, "cmp.RevDetails", HFILL }}, { &hf_cmp_certDetails, @@ -2138,7 +2138,7 @@ void proto_register_cmp(void) { FT_UINT32, BASE_DEC, NULL, 0, "cmp.SEQUENCE_SIZE_1_MAX_OF_PKIStatusInfo", HFILL }}, { &hf_cmp_rvrpcnt_status_item, - { "status", "cmp.status_item", + { "PKIStatusInfo", "cmp.PKIStatusInfo", FT_NONE, BASE_NONE, NULL, 0, "cmp.PKIStatusInfo", HFILL }}, { &hf_cmp_revCerts, @@ -2146,7 +2146,7 @@ void proto_register_cmp(void) { FT_UINT32, BASE_DEC, NULL, 0, "cmp.SEQUENCE_SIZE_1_MAX_OF_CertId", HFILL }}, { &hf_cmp_revCerts_item, - { "revCerts", "cmp.revCerts_item", + { "CertId", "cmp.CertId", FT_NONE, BASE_NONE, NULL, 0, "crmf.CertId", HFILL }}, { &hf_cmp_crls, @@ -2154,7 +2154,7 @@ void proto_register_cmp(void) { FT_UINT32, BASE_DEC, NULL, 0, "cmp.SEQUENCE_SIZE_1_MAX_OF_CertificateList", HFILL }}, { &hf_cmp_crls_item, - { "crls", "cmp.crls_item", + { "CertificateList", "cmp.CertificateList", FT_NONE, BASE_NONE, NULL, 0, "pkix1explicit.CertificateList", HFILL }}, { &hf_cmp_oldWithNew, @@ -2182,11 +2182,11 @@ void proto_register_cmp(void) { FT_UINT32, BASE_DEC, NULL, 0, "pkix1explicit.Extensions", HFILL }}, { &hf_cmp_CRLAnnContent_item, - { "CRLAnnContent", "cmp.CRLAnnContent_item", + { "CertificateList", "cmp.CertificateList", FT_NONE, BASE_NONE, NULL, 0, "pkix1explicit.CertificateList", HFILL }}, { &hf_cmp_CertConfirmContent_item, - { "CertConfirmContent", "cmp.CertConfirmContent_item", + { "CertStatus", "cmp.CertStatus", FT_NONE, BASE_NONE, NULL, 0, "cmp.CertStatus", HFILL }}, { &hf_cmp_certHash, @@ -2206,27 +2206,27 @@ void proto_register_cmp(void) { FT_NONE, BASE_NONE, NULL, 0, "cmp.T_infoValue", HFILL }}, { &hf_cmp_SignKeyPairTypesValue_item, - { "SignKeyPairTypesValue", "cmp.SignKeyPairTypesValue_item", + { "AlgorithmIdentifier", "cmp.AlgorithmIdentifier", FT_NONE, BASE_NONE, NULL, 0, "pkix1explicit.AlgorithmIdentifier", HFILL }}, { &hf_cmp_EncKeyPairTypesValue_item, - { "EncKeyPairTypesValue", "cmp.EncKeyPairTypesValue_item", + { "AlgorithmIdentifier", "cmp.AlgorithmIdentifier", FT_NONE, BASE_NONE, NULL, 0, "pkix1explicit.AlgorithmIdentifier", HFILL }}, { &hf_cmp_UnsupportedOIDsValue_item, - { "UnsupportedOIDsValue", "cmp.UnsupportedOIDsValue_item", + { "UnsupportedOIDsValue item", "cmp.UnsupportedOIDsValue_item", FT_OID, BASE_NONE, NULL, 0, "cmp.OBJECT_IDENTIFIER", HFILL }}, { &hf_cmp_SuppLangTagsValue_item, - { "SuppLangTagsValue", "cmp.SuppLangTagsValue_item", + { "SuppLangTagsValue item", "cmp.SuppLangTagsValue_item", FT_STRING, BASE_NONE, NULL, 0, "cmp.UTF8String", HFILL }}, { &hf_cmp_GenMsgContent_item, - { "GenMsgContent", "cmp.GenMsgContent_item", + { "InfoTypeAndValue", "cmp.InfoTypeAndValue", FT_NONE, BASE_NONE, NULL, 0, "cmp.InfoTypeAndValue", HFILL }}, { &hf_cmp_GenRepContent_item, - { "GenRepContent", "cmp.GenRepContent_item", + { "InfoTypeAndValue", "cmp.InfoTypeAndValue", FT_NONE, BASE_NONE, NULL, 0, "cmp.InfoTypeAndValue", HFILL }}, { &hf_cmp_pKIStatusInfo, @@ -2242,11 +2242,11 @@ void proto_register_cmp(void) { FT_UINT32, BASE_DEC, NULL, 0, "cmp.PKIFreeText", HFILL }}, { &hf_cmp_PollReqContent_item, - { "PollReqContent", "cmp.PollReqContent_item", + { "PollReqContent item", "cmp.PollReqContent_item", FT_NONE, BASE_NONE, NULL, 0, "cmp.PollReqContent_item", HFILL }}, { &hf_cmp_PollRepContent_item, - { "PollRepContent", "cmp.PollRepContent_item", + { "PollRepContent item", "cmp.PollRepContent_item", FT_NONE, BASE_NONE, NULL, 0, "cmp.PollRepContent_item", HFILL }}, { &hf_cmp_checkAfter, -- cgit v1.2.3