From 326d8141141b92f0542098aa068deaa70891d379 Mon Sep 17 00:00:00 2001 From: morriss Date: Tue, 11 May 2010 02:13:26 +0000 Subject: Regenerate a few of the ASN.1 dissectors git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32742 f5534014-38df-0310-8fa8-9805f1628bb7 --- epan/dissectors/packet-crmf.c | 152 +++++++++++++++++++++--------------------- 1 file changed, 76 insertions(+), 76 deletions(-) (limited to 'epan/dissectors/packet-crmf.c') diff --git a/epan/dissectors/packet-crmf.c b/epan/dissectors/packet-crmf.c index 7099d19acd..18ce585795 100644 --- a/epan/dissectors/packet-crmf.c +++ b/epan/dissectors/packet-crmf.c @@ -881,307 +881,307 @@ void proto_register_crmf(void) { { &hf_crmf_CertRequest_PDU, { "CertRequest", "crmf.CertRequest", FT_NONE, BASE_NONE, NULL, 0, - "crmf.CertRequest", HFILL }}, + NULL, HFILL }}, { &hf_crmf_PBMParameter_PDU, { "PBMParameter", "crmf.PBMParameter", FT_NONE, BASE_NONE, NULL, 0, - "crmf.PBMParameter", HFILL }}, + NULL, HFILL }}, { &hf_crmf_CertId_PDU, { "CertId", "crmf.CertId", FT_NONE, BASE_NONE, NULL, 0, - "crmf.CertId", HFILL }}, + NULL, HFILL }}, { &hf_crmf_ProtocolEncrKey_PDU, { "ProtocolEncrKey", "crmf.ProtocolEncrKey", FT_NONE, BASE_NONE, NULL, 0, - "crmf.ProtocolEncrKey", HFILL }}, + NULL, HFILL }}, { &hf_crmf_UTF8Pairs_PDU, { "UTF8Pairs", "crmf.UTF8Pairs", FT_STRING, BASE_NONE, NULL, 0, - "crmf.UTF8Pairs", HFILL }}, + NULL, HFILL }}, { &hf_crmf_EncKeyWithID_PDU, { "EncKeyWithID", "crmf.EncKeyWithID", FT_NONE, BASE_NONE, NULL, 0, - "crmf.EncKeyWithID", HFILL }}, + NULL, HFILL }}, { &hf_crmf_CertReqMessages_item, { "CertReqMsg", "crmf.CertReqMsg", FT_NONE, BASE_NONE, NULL, 0, - "crmf.CertReqMsg", HFILL }}, + NULL, HFILL }}, { &hf_crmf_certReq, { "certReq", "crmf.certReq", FT_NONE, BASE_NONE, NULL, 0, - "crmf.CertRequest", HFILL }}, + "CertRequest", HFILL }}, { &hf_crmf_popo, { "popo", "crmf.popo", FT_UINT32, BASE_DEC, VALS(crmf_ProofOfPossession_vals), 0, - "crmf.ProofOfPossession", HFILL }}, + "ProofOfPossession", HFILL }}, { &hf_crmf_regInfo, { "regInfo", "crmf.regInfo", FT_UINT32, BASE_DEC, NULL, 0, - "crmf.SEQUENCE_SIZE_1_MAX_OF_AttributeTypeAndValue", HFILL }}, + "SEQUENCE_SIZE_1_MAX_OF_AttributeTypeAndValue", HFILL }}, { &hf_crmf_regInfo_item, { "AttributeTypeAndValue", "crmf.AttributeTypeAndValue", FT_NONE, BASE_NONE, NULL, 0, - "crmf.AttributeTypeAndValue", HFILL }}, + NULL, HFILL }}, { &hf_crmf_certReqId, { "certReqId", "crmf.certReqId", FT_INT32, BASE_DEC, NULL, 0, - "crmf.INTEGER", HFILL }}, + "INTEGER", HFILL }}, { &hf_crmf_certTemplate, { "certTemplate", "crmf.certTemplate", FT_NONE, BASE_NONE, NULL, 0, - "crmf.CertTemplate", HFILL }}, + NULL, HFILL }}, { &hf_crmf_controls, { "controls", "crmf.controls", FT_UINT32, BASE_DEC, NULL, 0, - "crmf.Controls", HFILL }}, + NULL, HFILL }}, { &hf_crmf_version, { "version", "crmf.version", FT_INT32, BASE_DEC, VALS(pkix1explicit_Version_vals), 0, - "pkix1explicit.Version", HFILL }}, + NULL, HFILL }}, { &hf_crmf_serialNumber, { "serialNumber", "crmf.serialNumber", FT_INT32, BASE_DEC, NULL, 0, - "crmf.INTEGER", HFILL }}, + "INTEGER", HFILL }}, { &hf_crmf_signingAlg, { "signingAlg", "crmf.signingAlg", FT_NONE, BASE_NONE, NULL, 0, - "pkix1explicit.AlgorithmIdentifier", HFILL }}, + "AlgorithmIdentifier", HFILL }}, { &hf_crmf_template_issuer, { "issuer", "crmf.issuer", FT_UINT32, BASE_DEC, NULL, 0, - "pkix1explicit.Name", HFILL }}, + "Name", HFILL }}, { &hf_crmf_validity, { "validity", "crmf.validity", FT_NONE, BASE_NONE, NULL, 0, - "crmf.OptionalValidity", HFILL }}, + "OptionalValidity", HFILL }}, { &hf_crmf_subject, { "subject", "crmf.subject", FT_UINT32, BASE_DEC, NULL, 0, - "pkix1explicit.Name", HFILL }}, + "Name", HFILL }}, { &hf_crmf_publicKey, { "publicKey", "crmf.publicKey", FT_NONE, BASE_NONE, NULL, 0, - "pkix1explicit.SubjectPublicKeyInfo", HFILL }}, + "SubjectPublicKeyInfo", HFILL }}, { &hf_crmf_issuerUID, { "issuerUID", "crmf.issuerUID", FT_BYTES, BASE_NONE, NULL, 0, - "pkix1explicit.UniqueIdentifier", HFILL }}, + "UniqueIdentifier", HFILL }}, { &hf_crmf_subjectUID, { "subjectUID", "crmf.subjectUID", FT_BYTES, BASE_NONE, NULL, 0, - "pkix1explicit.UniqueIdentifier", HFILL }}, + "UniqueIdentifier", HFILL }}, { &hf_crmf_extensions, { "extensions", "crmf.extensions", FT_UINT32, BASE_DEC, NULL, 0, - "pkix1explicit.Extensions", HFILL }}, + NULL, HFILL }}, { &hf_crmf_notBefore, { "notBefore", "crmf.notBefore", FT_UINT32, BASE_DEC, VALS(pkix1explicit_Time_vals), 0, - "pkix1explicit.Time", HFILL }}, + "Time", HFILL }}, { &hf_crmf_notAfter, { "notAfter", "crmf.notAfter", FT_UINT32, BASE_DEC, VALS(pkix1explicit_Time_vals), 0, - "pkix1explicit.Time", HFILL }}, + "Time", HFILL }}, { &hf_crmf_Controls_item, { "AttributeTypeAndValue", "crmf.AttributeTypeAndValue", FT_NONE, BASE_NONE, NULL, 0, - "crmf.AttributeTypeAndValue", HFILL }}, + NULL, HFILL }}, { &hf_crmf_type, { "type", "crmf.type", FT_OID, BASE_NONE, NULL, 0, - "crmf.T_type", HFILL }}, + "T_type", HFILL }}, { &hf_crmf_value, { "value", "crmf.value", FT_NONE, BASE_NONE, NULL, 0, - "crmf.T_value", HFILL }}, + "T_value", HFILL }}, { &hf_crmf_raVerified, { "raVerified", "crmf.raVerified", FT_NONE, BASE_NONE, NULL, 0, - "crmf.NULL", HFILL }}, + "NULL", HFILL }}, { &hf_crmf_signature, { "signature", "crmf.signature", FT_NONE, BASE_NONE, NULL, 0, - "crmf.POPOSigningKey", HFILL }}, + "POPOSigningKey", HFILL }}, { &hf_crmf_keyEncipherment, { "keyEncipherment", "crmf.keyEncipherment", FT_UINT32, BASE_DEC, VALS(crmf_POPOPrivKey_vals), 0, - "crmf.POPOPrivKey", HFILL }}, + "POPOPrivKey", HFILL }}, { &hf_crmf_keyAgreement, { "keyAgreement", "crmf.keyAgreement", FT_UINT32, BASE_DEC, VALS(crmf_POPOPrivKey_vals), 0, - "crmf.POPOPrivKey", HFILL }}, + "POPOPrivKey", HFILL }}, { &hf_crmf_poposkInput, { "poposkInput", "crmf.poposkInput", FT_NONE, BASE_NONE, NULL, 0, - "crmf.POPOSigningKeyInput", HFILL }}, + "POPOSigningKeyInput", HFILL }}, { &hf_crmf_algorithmIdentifier, { "algorithmIdentifier", "crmf.algorithmIdentifier", FT_NONE, BASE_NONE, NULL, 0, - "pkix1explicit.AlgorithmIdentifier", HFILL }}, + NULL, HFILL }}, { &hf_crmf_sk_signature, { "signature", "crmf.signature", FT_BYTES, BASE_NONE, NULL, 0, - "crmf.BIT_STRING", HFILL }}, + "BIT_STRING", HFILL }}, { &hf_crmf_authInfo, { "authInfo", "crmf.authInfo", FT_UINT32, BASE_DEC, VALS(crmf_T_authInfo_vals), 0, - "crmf.T_authInfo", HFILL }}, + "T_authInfo", HFILL }}, { &hf_crmf_sender, { "sender", "crmf.sender", FT_UINT32, BASE_DEC, NULL, 0, - "pkix1implicit.GeneralName", HFILL }}, + "GeneralName", HFILL }}, { &hf_crmf_publicKeyMAC, { "publicKeyMAC", "crmf.publicKeyMAC", FT_NONE, BASE_NONE, NULL, 0, - "crmf.PKMACValue", HFILL }}, + "PKMACValue", HFILL }}, { &hf_crmf_algId, { "algId", "crmf.algId", FT_NONE, BASE_NONE, NULL, 0, - "pkix1explicit.AlgorithmIdentifier", HFILL }}, + "AlgorithmIdentifier", HFILL }}, { &hf_crmf_pkmac_value, { "value", "crmf.value", FT_BYTES, BASE_NONE, NULL, 0, - "crmf.BIT_STRING", HFILL }}, + "BIT_STRING", HFILL }}, { &hf_crmf_salt, { "salt", "crmf.salt", FT_BYTES, BASE_NONE, NULL, 0, - "crmf.OCTET_STRING", HFILL }}, + "OCTET_STRING", HFILL }}, { &hf_crmf_owf, { "owf", "crmf.owf", FT_NONE, BASE_NONE, NULL, 0, - "pkix1explicit.AlgorithmIdentifier", HFILL }}, + "AlgorithmIdentifier", HFILL }}, { &hf_crmf_iterationCount, { "iterationCount", "crmf.iterationCount", FT_INT32, BASE_DEC, NULL, 0, - "crmf.INTEGER", HFILL }}, + "INTEGER", HFILL }}, { &hf_crmf_mac, { "mac", "crmf.mac", FT_NONE, BASE_NONE, NULL, 0, - "pkix1explicit.AlgorithmIdentifier", HFILL }}, + "AlgorithmIdentifier", HFILL }}, { &hf_crmf_thisMessage, { "thisMessage", "crmf.thisMessage", FT_BYTES, BASE_NONE, NULL, 0, - "crmf.BIT_STRING", HFILL }}, + "BIT_STRING", HFILL }}, { &hf_crmf_subsequentMessage, { "subsequentMessage", "crmf.subsequentMessage", FT_INT32, BASE_DEC, VALS(crmf_SubsequentMessage_vals), 0, - "crmf.SubsequentMessage", HFILL }}, + NULL, HFILL }}, { &hf_crmf_dhMAC, { "dhMAC", "crmf.dhMAC", FT_BYTES, BASE_NONE, NULL, 0, - "crmf.BIT_STRING", HFILL }}, + "BIT_STRING", HFILL }}, { &hf_crmf_agreeMAC, { "agreeMAC", "crmf.agreeMAC", FT_NONE, BASE_NONE, NULL, 0, - "crmf.PKMACValue", HFILL }}, + "PKMACValue", HFILL }}, { &hf_crmf_encryptedKey, { "encryptedKey", "crmf.encryptedKey", FT_NONE, BASE_NONE, NULL, 0, - "cms.EnvelopedData", HFILL }}, + "EnvelopedData", HFILL }}, { &hf_crmf_action, { "action", "crmf.action", FT_INT32, BASE_DEC, VALS(crmf_T_action_vals), 0, - "crmf.T_action", HFILL }}, + "T_action", HFILL }}, { &hf_crmf_pubInfos, { "pubInfos", "crmf.pubInfos", FT_UINT32, BASE_DEC, NULL, 0, - "crmf.SEQUENCE_SIZE_1_MAX_OF_SinglePubInfo", HFILL }}, + "SEQUENCE_SIZE_1_MAX_OF_SinglePubInfo", HFILL }}, { &hf_crmf_pubInfos_item, { "SinglePubInfo", "crmf.SinglePubInfo", FT_NONE, BASE_NONE, NULL, 0, - "crmf.SinglePubInfo", HFILL }}, + NULL, HFILL }}, { &hf_crmf_pubMethod, { "pubMethod", "crmf.pubMethod", FT_INT32, BASE_DEC, VALS(crmf_T_pubMethod_vals), 0, - "crmf.T_pubMethod", HFILL }}, + "T_pubMethod", HFILL }}, { &hf_crmf_pubLocation, { "pubLocation", "crmf.pubLocation", FT_UINT32, BASE_DEC, NULL, 0, - "pkix1implicit.GeneralName", HFILL }}, + "GeneralName", HFILL }}, { &hf_crmf_encryptedPrivKey, { "encryptedPrivKey", "crmf.encryptedPrivKey", FT_UINT32, BASE_DEC, VALS(crmf_EncryptedKey_vals), 0, - "crmf.EncryptedKey", HFILL }}, + "EncryptedKey", HFILL }}, { &hf_crmf_keyGenParameters, { "keyGenParameters", "crmf.keyGenParameters", FT_BYTES, BASE_NONE, NULL, 0, - "crmf.KeyGenParameters", HFILL }}, + NULL, HFILL }}, { &hf_crmf_archiveRemGenPrivKey, { "archiveRemGenPrivKey", "crmf.archiveRemGenPrivKey", FT_BOOLEAN, BASE_NONE, NULL, 0, - "crmf.BOOLEAN", HFILL }}, + "BOOLEAN", HFILL }}, { &hf_crmf_encryptedValue, { "encryptedValue", "crmf.encryptedValue", FT_NONE, BASE_NONE, NULL, 0, - "crmf.EncryptedValue", HFILL }}, + NULL, HFILL }}, { &hf_crmf_envelopedData, { "envelopedData", "crmf.envelopedData", FT_NONE, BASE_NONE, NULL, 0, - "cms.EnvelopedData", HFILL }}, + NULL, HFILL }}, { &hf_crmf_intendedAlg, { "intendedAlg", "crmf.intendedAlg", FT_NONE, BASE_NONE, NULL, 0, - "pkix1explicit.AlgorithmIdentifier", HFILL }}, + "AlgorithmIdentifier", HFILL }}, { &hf_crmf_symmAlg, { "symmAlg", "crmf.symmAlg", FT_NONE, BASE_NONE, NULL, 0, - "pkix1explicit.AlgorithmIdentifier", HFILL }}, + "AlgorithmIdentifier", HFILL }}, { &hf_crmf_encSymmKey, { "encSymmKey", "crmf.encSymmKey", FT_BYTES, BASE_NONE, NULL, 0, - "crmf.BIT_STRING", HFILL }}, + "BIT_STRING", HFILL }}, { &hf_crmf_keyAlg, { "keyAlg", "crmf.keyAlg", FT_NONE, BASE_NONE, NULL, 0, - "pkix1explicit.AlgorithmIdentifier", HFILL }}, + "AlgorithmIdentifier", HFILL }}, { &hf_crmf_valueHint, { "valueHint", "crmf.valueHint", FT_BYTES, BASE_NONE, NULL, 0, - "crmf.OCTET_STRING", HFILL }}, + "OCTET_STRING", HFILL }}, { &hf_crmf_encValue, { "encValue", "crmf.encValue", FT_BYTES, BASE_NONE, NULL, 0, - "crmf.BIT_STRING", HFILL }}, + "BIT_STRING", HFILL }}, { &hf_crmf_issuer, { "issuer", "crmf.issuer", FT_UINT32, BASE_DEC, NULL, 0, - "pkix1implicit.GeneralName", HFILL }}, + "GeneralName", HFILL }}, { &hf_crmf_enckeywid_privkey, { "privateKey", "crmf.privateKey", FT_NONE, BASE_NONE, NULL, 0, - "crmf.PrivateKeyInfo", HFILL }}, + "PrivateKeyInfo", HFILL }}, { &hf_crmf_identifier, { "identifier", "crmf.identifier", FT_UINT32, BASE_DEC, VALS(crmf_T_identifier_vals), 0, - "crmf.T_identifier", HFILL }}, + "T_identifier", HFILL }}, { &hf_crmf_string, { "string", "crmf.string", FT_STRING, BASE_NONE, NULL, 0, - "crmf.UTF8String", HFILL }}, + "UTF8String", HFILL }}, { &hf_crmf_generalName, { "generalName", "crmf.generalName", FT_UINT32, BASE_DEC, NULL, 0, - "pkix1implicit.GeneralName", HFILL }}, + NULL, HFILL }}, { &hf_crmf_privkey_version, { "version", "crmf.version", FT_INT32, BASE_DEC, NULL, 0, - "crmf.INTEGER", HFILL }}, + "INTEGER", HFILL }}, { &hf_crmf_privateKeyAlgorithm, { "privateKeyAlgorithm", "crmf.privateKeyAlgorithm", FT_NONE, BASE_NONE, NULL, 0, - "pkix1explicit.AlgorithmIdentifier", HFILL }}, + "AlgorithmIdentifier", HFILL }}, { &hf_crmf_privateKey, { "privateKey", "crmf.privateKey", FT_BYTES, BASE_NONE, NULL, 0, - "crmf.OCTET_STRING", HFILL }}, + "OCTET_STRING", HFILL }}, { &hf_crmf_attributes, { "attributes", "crmf.attributes", FT_UINT32, BASE_DEC, NULL, 0, - "crmf.Attributes", HFILL }}, + NULL, HFILL }}, { &hf_crmf_Attributes_item, { "Attribute", "crmf.Attribute", FT_NONE, BASE_NONE, NULL, 0, - "pkix1explicit.Attribute", HFILL }}, + NULL, HFILL }}, /*--- End of included file: packet-crmf-hfarr.c ---*/ #line 67 "packet-crmf-template.c" -- cgit v1.2.3