ASN.1 dissectors regenerated with new asn2wrs to get updated field blurb

svn path=/trunk/; revision=18921

1 files changed, 74 insertions, 74 deletions

diff --git a/epan/dissectors/packet-crmf.c b/epan/dissectors/packet-crmf.c
index 57100685c9..50c1b4563f 100644
--- a/epan/dissectors/packet-crmf.c
+++ b/epan/dissectors/packet-crmf.c
@@ -521,7 +521,7 @@ static const value_string crmf_T_authInfo_vals[] = {
 };
 
 static const ber_choice_t T_authInfo_choice[] = {
-  {   0, BER_CLASS_CON, 0, 0, dissect_sender_impl },
+  {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_sender_impl },
   {   1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_publicKeyMAC },
   { 0, 0, 0, 0, NULL }
 };
@@ -603,9 +603,9 @@ const value_string crmf_POPOPrivKey_vals[] = {
 };
 
 static const ber_choice_t POPOPrivKey_choice[] = {
-  {   0, BER_CLASS_CON, 0, 0, dissect_thisMessage_impl },
-  {   1, BER_CLASS_CON, 1, 0, dissect_subsequentMessage_impl },
-  {   2, BER_CLASS_CON, 2, 0, dissect_dhMAC_impl },
+  {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_thisMessage_impl },
+  {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_subsequentMessage_impl },
+  {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_dhMAC_impl },
   { 0, 0, 0, 0, NULL }
 };
 
@@ -634,10 +634,10 @@ const value_string crmf_ProofOfPossession_vals[] = {
 };
 
 static const ber_choice_t ProofOfPossession_choice[] = {
-  {   0, BER_CLASS_CON, 0, 0, dissect_raVerified_impl },
-  {   1, BER_CLASS_CON, 1, 0, dissect_signature_impl },
-  {   2, BER_CLASS_CON, 2, 0, dissect_keyEncipherment_impl },
-  {   3, BER_CLASS_CON, 3, 0, dissect_keyAgreement_impl },
+  {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_raVerified_impl },
+  {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_signature_impl },
+  {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_keyEncipherment_impl },
+  {   3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_keyAgreement_impl },
   { 0, 0, 0, 0, NULL }
 };
 
@@ -876,7 +876,7 @@ const value_string crmf_EncryptedKey_vals[] = {
 
 static const ber_choice_t EncryptedKey_choice[] = {
   {   0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_encryptedValue },
-  {   1, BER_CLASS_CON, 0, 0, dissect_envelopedData_impl },
+  {   1, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_envelopedData_impl },
   { 0, 0, 0, 0, NULL }
 };
 
@@ -926,9 +926,9 @@ const value_string crmf_PKIArchiveOptions_vals[] = {
 };
 
 static const ber_choice_t PKIArchiveOptions_choice[] = {
-  {   0, BER_CLASS_CON, 0, 0, dissect_encryptedPrivKey_impl },
-  {   1, BER_CLASS_CON, 1, 0, dissect_keyGenParameters_impl },
-  {   2, BER_CLASS_CON, 2, 0, dissect_archiveRemGenPrivKey_impl },
+  {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_encryptedPrivKey_impl },
+  {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_keyGenParameters_impl },
+  {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_archiveRemGenPrivKey_impl },
   { 0, 0, 0, 0, NULL }
 };
 
@@ -1020,251 +1020,251 @@ void proto_register_crmf(void) {
     { &hf_crmf_PBMParameter_PDU,
       { "PBMParameter", "crmf.PBMParameter",
         FT_NONE, BASE_NONE, NULL, 0,
-        "PBMParameter", HFILL }},
+        "crmf.PBMParameter", HFILL }},
     { &hf_crmf_utcTime,
       { "utcTime", "crmf.utcTime",
         FT_STRING, BASE_NONE, NULL, 0,
-        "Time/utcTime", HFILL }},
+        "crmf.UTCTime", HFILL }},
     { &hf_crmf_generalTime,
       { "generalTime", "crmf.generalTime",
         FT_STRING, BASE_NONE, NULL, 0,
-        "Time/generalTime", HFILL }},
+        "crmf.GeneralizedTime", HFILL }},
     { &hf_crmf_CertReqMessages_item,
       { "Item", "crmf.CertReqMessages_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "CertReqMessages/_item", HFILL }},
+        "crmf.CertReqMsg", HFILL }},
     { &hf_crmf_certReq,
       { "certReq", "crmf.certReq",
         FT_NONE, BASE_NONE, NULL, 0,
-        "CertReqMsg/certReq", HFILL }},
+        "crmf.CertRequest", HFILL }},
     { &hf_crmf_pop,
       { "pop", "crmf.pop",
         FT_UINT32, BASE_DEC, VALS(crmf_ProofOfPossession_vals), 0,
-        "CertReqMsg/pop", HFILL }},
+        "crmf.ProofOfPossession", HFILL }},
     { &hf_crmf_regInfo,
       { "regInfo", "crmf.regInfo",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "CertReqMsg/regInfo", HFILL }},
+        "crmf.SEQUENCE_SIZE_1_MAX_OF_AttributeTypeAndValue", HFILL }},
     { &hf_crmf_regInfo_item,
       { "Item", "crmf.regInfo_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "CertReqMsg/regInfo/_item", HFILL }},
+        "crmf.AttributeTypeAndValue", HFILL }},
     { &hf_crmf_certReqId,
       { "certReqId", "crmf.certReqId",
         FT_INT32, BASE_DEC, NULL, 0,
-        "CertRequest/certReqId", HFILL }},
+        "crmf.INTEGER", HFILL }},
     { &hf_crmf_certTemplate,
       { "certTemplate", "crmf.certTemplate",
         FT_NONE, BASE_NONE, NULL, 0,
-        "CertRequest/certTemplate", HFILL }},
+        "crmf.CertTemplate", HFILL }},
     { &hf_crmf_controls,
       { "controls", "crmf.controls",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "CertRequest/controls", HFILL }},
+        "crmf.Controls", HFILL }},
     { &hf_crmf_version,
       { "version", "crmf.version",
         FT_INT32, BASE_DEC, VALS(crmf_Version_vals), 0,
-        "CertTemplate/version", HFILL }},
+        "crmf.Version", HFILL }},
     { &hf_crmf_serialNumber,
       { "serialNumber", "crmf.serialNumber",
         FT_INT32, BASE_DEC, NULL, 0,
-        "", HFILL }},
+        "crmf.INTEGER", HFILL }},
     { &hf_crmf_signingAlg,
       { "signingAlg", "crmf.signingAlg",
         FT_NONE, BASE_NONE, NULL, 0,
-        "CertTemplate/signingAlg", HFILL }},
+        "pkix1explicit.AlgorithmIdentifier", HFILL }},
     { &hf_crmf_template_issuer,
       { "issuer", "crmf.issuer",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "CertTemplate/issuer", HFILL }},
+        "pkix1explicit.Name", HFILL }},
     { &hf_crmf_validity,
       { "validity", "crmf.validity",
         FT_NONE, BASE_NONE, NULL, 0,
-        "CertTemplate/validity", HFILL }},
+        "crmf.OptionalValidity", HFILL }},
     { &hf_crmf_subject,
       { "subject", "crmf.subject",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "CertTemplate/subject", HFILL }},
+        "pkix1explicit.Name", HFILL }},
     { &hf_crmf_publicKey,
       { "publicKey", "crmf.publicKey",
         FT_NONE, BASE_NONE, NULL, 0,
-        "", HFILL }},
+        "pkix1explicit.SubjectPublicKeyInfo", HFILL }},
     { &hf_crmf_issuerUID,
       { "issuerUID", "crmf.issuerUID",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "CertTemplate/issuerUID", HFILL }},
+        "crmf.UniqueIdentifier", HFILL }},
     { &hf_crmf_subjectUID,
       { "subjectUID", "crmf.subjectUID",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "CertTemplate/subjectUID", HFILL }},
+        "crmf.UniqueIdentifier", HFILL }},
     { &hf_crmf_extensions,
       { "extensions", "crmf.extensions",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "CertTemplate/extensions", HFILL }},
+        "pkix1explicit.Extensions", HFILL }},
     { &hf_crmf_notBefore,
       { "notBefore", "crmf.notBefore",
         FT_UINT32, BASE_DEC, VALS(crmf_Time_vals), 0,
-        "OptionalValidity/notBefore", HFILL }},
+        "crmf.Time", HFILL }},
     { &hf_crmf_notAfter,
       { "notAfter", "crmf.notAfter",
         FT_UINT32, BASE_DEC, VALS(crmf_Time_vals), 0,
-        "OptionalValidity/notAfter", HFILL }},
+        "crmf.Time", HFILL }},
     { &hf_crmf_Controls_item,
       { "Item", "crmf.Controls_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "Controls/_item", HFILL }},
+        "crmf.AttributeTypeAndValue", HFILL }},
     { &hf_crmf_type,
       { "type", "crmf.type",
         FT_OID, BASE_NONE, NULL, 0,
-        "AttributeTypeAndValue/type", HFILL }},
+        "crmf.T_type", HFILL }},
     { &hf_crmf_value,
       { "value", "crmf.value",
         FT_NONE, BASE_NONE, NULL, 0,
-        "AttributeTypeAndValue/value", HFILL }},
+        "crmf.T_value", HFILL }},
     { &hf_crmf_raVerified,
       { "raVerified", "crmf.raVerified",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ProofOfPossession/raVerified", HFILL }},
+        "crmf.NULL", HFILL }},
     { &hf_crmf_signature,
       { "signature", "crmf.signature",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ProofOfPossession/signature", HFILL }},
+        "crmf.POPOSigningKey", HFILL }},
     { &hf_crmf_keyEncipherment,
       { "keyEncipherment", "crmf.keyEncipherment",
         FT_UINT32, BASE_DEC, VALS(crmf_POPOPrivKey_vals), 0,
-        "ProofOfPossession/keyEncipherment", HFILL }},
+        "crmf.POPOPrivKey", HFILL }},
     { &hf_crmf_keyAgreement,
       { "keyAgreement", "crmf.keyAgreement",
         FT_UINT32, BASE_DEC, VALS(crmf_POPOPrivKey_vals), 0,
-        "ProofOfPossession/keyAgreement", HFILL }},
+        "crmf.POPOPrivKey", HFILL }},
     { &hf_crmf_poposkInput,
       { "poposkInput", "crmf.poposkInput",
         FT_NONE, BASE_NONE, NULL, 0,
-        "POPOSigningKey/poposkInput", HFILL }},
+        "crmf.POPOSigningKeyInput", HFILL }},
     { &hf_crmf_algorithmIdentifier,
       { "algorithmIdentifier", "crmf.algorithmIdentifier",
         FT_NONE, BASE_NONE, NULL, 0,
-        "POPOSigningKey/algorithmIdentifier", HFILL }},
+        "pkix1explicit.AlgorithmIdentifier", HFILL }},
     { &hf_crmf_sk_signature,
       { "signature", "crmf.signature",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "POPOSigningKey/signature", HFILL }},
+        "crmf.BIT_STRING", HFILL }},
     { &hf_crmf_authInfo,
       { "authInfo", "crmf.authInfo",
         FT_UINT32, BASE_DEC, VALS(crmf_T_authInfo_vals), 0,
-        "POPOSigningKeyInput/authInfo", HFILL }},
+        "crmf.T_authInfo", HFILL }},
     { &hf_crmf_sender,
       { "sender", "crmf.sender",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "POPOSigningKeyInput/authInfo/sender", HFILL }},
+        "pkix1implicit.GeneralName", HFILL }},
     { &hf_crmf_publicKeyMAC,
       { "publicKeyMAC", "crmf.publicKeyMAC",
         FT_NONE, BASE_NONE, NULL, 0,
-        "POPOSigningKeyInput/authInfo/publicKeyMAC", HFILL }},
+        "crmf.PKMACValue", HFILL }},
     { &hf_crmf_algId,
       { "algId", "crmf.algId",
         FT_NONE, BASE_NONE, NULL, 0,
-        "PKMACValue/algId", HFILL }},
+        "pkix1explicit.AlgorithmIdentifier", HFILL }},
     { &hf_crmf_pkmac_value,
       { "value", "crmf.value",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "PKMACValue/value", HFILL }},
+        "crmf.BIT_STRING", HFILL }},
     { &hf_crmf_salt,
       { "salt", "crmf.salt",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "PBMParameter/salt", HFILL }},
+        "crmf.OCTET_STRING", HFILL }},
     { &hf_crmf_owf,
       { "owf", "crmf.owf",
         FT_NONE, BASE_NONE, NULL, 0,
-        "PBMParameter/owf", HFILL }},
+        "pkix1explicit.AlgorithmIdentifier", HFILL }},
     { &hf_crmf_iterationCount,
       { "iterationCount", "crmf.iterationCount",
         FT_INT32, BASE_DEC, NULL, 0,
-        "PBMParameter/iterationCount", HFILL }},
+        "crmf.INTEGER", HFILL }},
     { &hf_crmf_mac,
       { "mac", "crmf.mac",
         FT_NONE, BASE_NONE, NULL, 0,
-        "PBMParameter/mac", HFILL }},
+        "pkix1explicit.AlgorithmIdentifier", HFILL }},
     { &hf_crmf_thisMessage,
       { "thisMessage", "crmf.thisMessage",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "POPOPrivKey/thisMessage", HFILL }},
+        "crmf.BIT_STRING", HFILL }},
     { &hf_crmf_subsequentMessage,
       { "subsequentMessage", "crmf.subsequentMessage",
         FT_INT32, BASE_DEC, VALS(crmf_SubsequentMessage_vals), 0,
-        "POPOPrivKey/subsequentMessage", HFILL }},
+        "crmf.SubsequentMessage", HFILL }},
     { &hf_crmf_dhMAC,
       { "dhMAC", "crmf.dhMAC",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "POPOPrivKey/dhMAC", HFILL }},
+        "crmf.BIT_STRING", HFILL }},
     { &hf_crmf_action,
       { "action", "crmf.action",
         FT_INT32, BASE_DEC, VALS(crmf_T_action_vals), 0,
-        "PKIPublicationInfo/action", HFILL }},
+        "crmf.T_action", HFILL }},
     { &hf_crmf_pubInfos,
       { "pubInfos", "crmf.pubInfos",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "PKIPublicationInfo/pubInfos", HFILL }},
+        "crmf.SEQUENCE_SIZE_1_MAX_OF_SinglePubInfo", HFILL }},
     { &hf_crmf_pubInfos_item,
       { "Item", "crmf.pubInfos_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "PKIPublicationInfo/pubInfos/_item", HFILL }},
+        "crmf.SinglePubInfo", HFILL }},
     { &hf_crmf_pubMethod,
       { "pubMethod", "crmf.pubMethod",
         FT_INT32, BASE_DEC, VALS(crmf_T_pubMethod_vals), 0,
-        "SinglePubInfo/pubMethod", HFILL }},
+        "crmf.T_pubMethod", HFILL }},
     { &hf_crmf_pubLocation,
       { "pubLocation", "crmf.pubLocation",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "SinglePubInfo/pubLocation", HFILL }},
+        "pkix1implicit.GeneralName", HFILL }},
     { &hf_crmf_encryptedPrivKey,
       { "encryptedPrivKey", "crmf.encryptedPrivKey",
         FT_UINT32, BASE_DEC, VALS(crmf_EncryptedKey_vals), 0,
-        "PKIArchiveOptions/encryptedPrivKey", HFILL }},
+        "crmf.EncryptedKey", HFILL }},
     { &hf_crmf_keyGenParameters,
       { "keyGenParameters", "crmf.keyGenParameters",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "PKIArchiveOptions/keyGenParameters", HFILL }},
+        "crmf.KeyGenParameters", HFILL }},
     { &hf_crmf_archiveRemGenPrivKey,
       { "archiveRemGenPrivKey", "crmf.archiveRemGenPrivKey",
         FT_BOOLEAN, 8, NULL, 0,
-        "PKIArchiveOptions/archiveRemGenPrivKey", HFILL }},
+        "crmf.BOOLEAN", HFILL }},
     { &hf_crmf_encryptedValue,
       { "encryptedValue", "crmf.encryptedValue",
         FT_NONE, BASE_NONE, NULL, 0,
-        "EncryptedKey/encryptedValue", HFILL }},
+        "crmf.EncryptedValue", HFILL }},
     { &hf_crmf_envelopedData,
       { "envelopedData", "crmf.envelopedData",
         FT_NONE, BASE_NONE, NULL, 0,
-        "EncryptedKey/envelopedData", HFILL }},
+        "cms.EnvelopedData", HFILL }},
     { &hf_crmf_intendedAlg,
       { "intendedAlg", "crmf.intendedAlg",
         FT_NONE, BASE_NONE, NULL, 0,
-        "EncryptedValue/intendedAlg", HFILL }},
+        "pkix1explicit.AlgorithmIdentifier", HFILL }},
     { &hf_crmf_symmAlg,
       { "symmAlg", "crmf.symmAlg",
         FT_NONE, BASE_NONE, NULL, 0,
-        "EncryptedValue/symmAlg", HFILL }},
+        "pkix1explicit.AlgorithmIdentifier", HFILL }},
     { &hf_crmf_encSymmKey,
       { "encSymmKey", "crmf.encSymmKey",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "EncryptedValue/encSymmKey", HFILL }},
+        "crmf.BIT_STRING", HFILL }},
     { &hf_crmf_keyAlg,
       { "keyAlg", "crmf.keyAlg",
         FT_NONE, BASE_NONE, NULL, 0,
-        "EncryptedValue/keyAlg", HFILL }},
+        "pkix1explicit.AlgorithmIdentifier", HFILL }},
     { &hf_crmf_valueHint,
       { "valueHint", "crmf.valueHint",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "EncryptedValue/valueHint", HFILL }},
+        "crmf.OCTET_STRING", HFILL }},
     { &hf_crmf_encValue,
       { "encValue", "crmf.encValue",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "EncryptedValue/encValue", HFILL }},
+        "crmf.BIT_STRING", HFILL }},
     { &hf_crmf_issuer,
       { "issuer", "crmf.issuer",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "CertId/issuer", HFILL }},
+        "pkix1implicit.GeneralName", HFILL }},
 
 /*--- End of included file: packet-crmf-hfarr.c ---*/
 #line 70 "packet-crmf-template.c"