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

svn path=/trunk/; revision=18921

1 files changed, 45 insertions, 45 deletions

diff --git a/epan/dissectors/packet-logotypecertextn.c b/epan/dissectors/packet-logotypecertextn.c
index 2bfda8ba76..4e9b2d1664 100644
--- a/epan/dissectors/packet-logotypecertextn.c
+++ b/epan/dissectors/packet-logotypecertextn.c
@@ -311,8 +311,8 @@ static const value_string logotypecertextn_LogotypeImageResolution_vals[] = {
 };
 
 static const ber_choice_t LogotypeImageResolution_choice[] = {
-  {   1, BER_CLASS_CON, 1, 0, dissect_numBits_impl },
-  {   2, BER_CLASS_CON, 2, 0, dissect_tableSize_impl },
+  {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_numBits_impl },
+  {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_tableSize_impl },
   { 0, 0, 0, 0, NULL }
 };
 
@@ -499,8 +499,8 @@ static const value_string logotypecertextn_LogotypeInfo_vals[] = {
 };
 
 static const ber_choice_t LogotypeInfo_choice[] = {
-  {   0, BER_CLASS_CON, 0, 0, dissect_direct_impl },
-  {   1, BER_CLASS_CON, 1, 0, dissect_indirect_impl },
+  {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_direct_impl },
+  {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_indirect_impl },
   { 0, 0, 0, 0, NULL }
 };
 
@@ -626,167 +626,167 @@ void proto_register_logotypecertextn(void) {
     { &hf_logotypecertextn_LogotypeExtn_PDU,
       { "LogotypeExtn", "logotypecertextn.LogotypeExtn",
         FT_NONE, BASE_NONE, NULL, 0,
-        "LogotypeExtn", HFILL }},
+        "logotypecertextn.LogotypeExtn", HFILL }},
     { &hf_logotypecertextn_communityLogos,
       { "communityLogos", "logotypecertextn.communityLogos",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "LogotypeExtn/communityLogos", HFILL }},
+        "logotypecertextn.SEQUENCE_OF_LogotypeInfo", HFILL }},
     { &hf_logotypecertextn_communityLogos_item,
       { "Item", "logotypecertextn.communityLogos_item",
         FT_UINT32, BASE_DEC, VALS(logotypecertextn_LogotypeInfo_vals), 0,
-        "LogotypeExtn/communityLogos/_item", HFILL }},
+        "logotypecertextn.LogotypeInfo", HFILL }},
     { &hf_logotypecertextn_issuerLogo,
       { "issuerLogo", "logotypecertextn.issuerLogo",
         FT_UINT32, BASE_DEC, VALS(logotypecertextn_LogotypeInfo_vals), 0,
-        "LogotypeExtn/issuerLogo", HFILL }},
+        "logotypecertextn.LogotypeInfo", HFILL }},
     { &hf_logotypecertextn_subjectLogo,
       { "subjectLogo", "logotypecertextn.subjectLogo",
         FT_UINT32, BASE_DEC, VALS(logotypecertextn_LogotypeInfo_vals), 0,
-        "LogotypeExtn/subjectLogo", HFILL }},
+        "logotypecertextn.LogotypeInfo", HFILL }},
     { &hf_logotypecertextn_otherLogos,
       { "otherLogos", "logotypecertextn.otherLogos",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "LogotypeExtn/otherLogos", HFILL }},
+        "logotypecertextn.SEQUENCE_OF_OtherLogotypeInfo", HFILL }},
     { &hf_logotypecertextn_otherLogos_item,
       { "Item", "logotypecertextn.otherLogos_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "LogotypeExtn/otherLogos/_item", HFILL }},
+        "logotypecertextn.OtherLogotypeInfo", HFILL }},
     { &hf_logotypecertextn_direct,
       { "direct", "logotypecertextn.direct",
         FT_NONE, BASE_NONE, NULL, 0,
-        "LogotypeInfo/direct", HFILL }},
+        "logotypecertextn.LogotypeData", HFILL }},
     { &hf_logotypecertextn_indirect,
       { "indirect", "logotypecertextn.indirect",
         FT_NONE, BASE_NONE, NULL, 0,
-        "LogotypeInfo/indirect", HFILL }},
+        "logotypecertextn.LogotypeReference", HFILL }},
     { &hf_logotypecertextn_image,
       { "image", "logotypecertextn.image",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "LogotypeData/image", HFILL }},
+        "logotypecertextn.SEQUENCE_OF_LogotypeImage", HFILL }},
     { &hf_logotypecertextn_image_item,
       { "Item", "logotypecertextn.image_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "LogotypeData/image/_item", HFILL }},
+        "logotypecertextn.LogotypeImage", HFILL }},
     { &hf_logotypecertextn_audio,
       { "audio", "logotypecertextn.audio",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "LogotypeData/audio", HFILL }},
+        "logotypecertextn.SEQUENCE_OF_LogotypeAudio", HFILL }},
     { &hf_logotypecertextn_audio_item,
       { "Item", "logotypecertextn.audio_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "LogotypeData/audio/_item", HFILL }},
+        "logotypecertextn.LogotypeAudio", HFILL }},
     { &hf_logotypecertextn_imageDetails,
       { "imageDetails", "logotypecertextn.imageDetails",
         FT_NONE, BASE_NONE, NULL, 0,
-        "LogotypeImage/imageDetails", HFILL }},
+        "logotypecertextn.LogotypeDetails", HFILL }},
     { &hf_logotypecertextn_imageInfo,
       { "imageInfo", "logotypecertextn.imageInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "LogotypeImage/imageInfo", HFILL }},
+        "logotypecertextn.LogotypeImageInfo", HFILL }},
     { &hf_logotypecertextn_audioDetails,
       { "audioDetails", "logotypecertextn.audioDetails",
         FT_NONE, BASE_NONE, NULL, 0,
-        "LogotypeAudio/audioDetails", HFILL }},
+        "logotypecertextn.LogotypeDetails", HFILL }},
     { &hf_logotypecertextn_audioInfo,
       { "audioInfo", "logotypecertextn.audioInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "LogotypeAudio/audioInfo", HFILL }},
+        "logotypecertextn.LogotypeAudioInfo", HFILL }},
     { &hf_logotypecertextn_mediaType,
       { "mediaType", "logotypecertextn.mediaType",
         FT_STRING, BASE_NONE, NULL, 0,
-        "LogotypeDetails/mediaType", HFILL }},
+        "logotypecertextn.IA5String", HFILL }},
     { &hf_logotypecertextn_logotypeHash,
       { "logotypeHash", "logotypecertextn.logotypeHash",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "LogotypeDetails/logotypeHash", HFILL }},
+        "logotypecertextn.SEQUENCE_SIZE_1_MAX_OF_HashAlgAndValue", HFILL }},
     { &hf_logotypecertextn_logotypeHash_item,
       { "Item", "logotypecertextn.logotypeHash_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "LogotypeDetails/logotypeHash/_item", HFILL }},
+        "logotypecertextn.HashAlgAndValue", HFILL }},
     { &hf_logotypecertextn_logotypeURI,
       { "logotypeURI", "logotypecertextn.logotypeURI",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "LogotypeDetails/logotypeURI", HFILL }},
+        "logotypecertextn.T_logotypeURI", HFILL }},
     { &hf_logotypecertextn_logotypeURI_item,
       { "Item", "logotypecertextn.logotypeURI_item",
         FT_STRING, BASE_NONE, NULL, 0,
-        "LogotypeDetails/logotypeURI/_item", HFILL }},
+        "logotypecertextn.IA5String", HFILL }},
     { &hf_logotypecertextn_type,
       { "type", "logotypecertextn.type",
         FT_INT32, BASE_DEC, VALS(logotypecertextn_LogotypeImageType_vals), 0,
-        "LogotypeImageInfo/type", HFILL }},
+        "logotypecertextn.LogotypeImageType", HFILL }},
     { &hf_logotypecertextn_fileSize,
       { "fileSize", "logotypecertextn.fileSize",
         FT_INT32, BASE_DEC, NULL, 0,
-        "", HFILL }},
+        "logotypecertextn.INTEGER", HFILL }},
     { &hf_logotypecertextn_xSize,
       { "xSize", "logotypecertextn.xSize",
         FT_INT32, BASE_DEC, NULL, 0,
-        "LogotypeImageInfo/xSize", HFILL }},
+        "logotypecertextn.INTEGER", HFILL }},
     { &hf_logotypecertextn_ySize,
       { "ySize", "logotypecertextn.ySize",
         FT_INT32, BASE_DEC, NULL, 0,
-        "LogotypeImageInfo/ySize", HFILL }},
+        "logotypecertextn.INTEGER", HFILL }},
     { &hf_logotypecertextn_resolution,
       { "resolution", "logotypecertextn.resolution",
         FT_UINT32, BASE_DEC, VALS(logotypecertextn_LogotypeImageResolution_vals), 0,
-        "LogotypeImageInfo/resolution", HFILL }},
+        "logotypecertextn.LogotypeImageResolution", HFILL }},
     { &hf_logotypecertextn_language,
       { "language", "logotypecertextn.language",
         FT_STRING, BASE_NONE, NULL, 0,
-        "", HFILL }},
+        "logotypecertextn.IA5String", HFILL }},
     { &hf_logotypecertextn_numBits,
       { "numBits", "logotypecertextn.numBits",
         FT_INT32, BASE_DEC, NULL, 0,
-        "LogotypeImageResolution/numBits", HFILL }},
+        "logotypecertextn.INTEGER", HFILL }},
     { &hf_logotypecertextn_tableSize,
       { "tableSize", "logotypecertextn.tableSize",
         FT_INT32, BASE_DEC, NULL, 0,
-        "LogotypeImageResolution/tableSize", HFILL }},
+        "logotypecertextn.INTEGER", HFILL }},
     { &hf_logotypecertextn_playTime,
       { "playTime", "logotypecertextn.playTime",
         FT_INT32, BASE_DEC, NULL, 0,
-        "LogotypeAudioInfo/playTime", HFILL }},
+        "logotypecertextn.INTEGER", HFILL }},
     { &hf_logotypecertextn_channels,
       { "channels", "logotypecertextn.channels",
         FT_INT32, BASE_DEC, NULL, 0,
-        "LogotypeAudioInfo/channels", HFILL }},
+        "logotypecertextn.INTEGER", HFILL }},
     { &hf_logotypecertextn_sampleRate,
       { "sampleRate", "logotypecertextn.sampleRate",
         FT_INT32, BASE_DEC, NULL, 0,
-        "LogotypeAudioInfo/sampleRate", HFILL }},
+        "logotypecertextn.INTEGER", HFILL }},
     { &hf_logotypecertextn_logotypeType,
       { "logotypeType", "logotypecertextn.logotypeType",
         FT_OID, BASE_NONE, NULL, 0,
-        "OtherLogotypeInfo/logotypeType", HFILL }},
+        "logotypecertextn.OBJECT_IDENTIFIER", HFILL }},
     { &hf_logotypecertextn_info,
       { "info", "logotypecertextn.info",
         FT_UINT32, BASE_DEC, VALS(logotypecertextn_LogotypeInfo_vals), 0,
-        "OtherLogotypeInfo/info", HFILL }},
+        "logotypecertextn.LogotypeInfo", HFILL }},
     { &hf_logotypecertextn_refStructHash,
       { "refStructHash", "logotypecertextn.refStructHash",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "LogotypeReference/refStructHash", HFILL }},
+        "logotypecertextn.SEQUENCE_SIZE_1_MAX_OF_HashAlgAndValue", HFILL }},
     { &hf_logotypecertextn_refStructHash_item,
       { "Item", "logotypecertextn.refStructHash_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "LogotypeReference/refStructHash/_item", HFILL }},
+        "logotypecertextn.HashAlgAndValue", HFILL }},
     { &hf_logotypecertextn_refStructURI,
       { "refStructURI", "logotypecertextn.refStructURI",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "LogotypeReference/refStructURI", HFILL }},
+        "logotypecertextn.T_refStructURI", HFILL }},
     { &hf_logotypecertextn_refStructURI_item,
       { "Item", "logotypecertextn.refStructURI_item",
         FT_STRING, BASE_NONE, NULL, 0,
-        "LogotypeReference/refStructURI/_item", HFILL }},
+        "logotypecertextn.IA5String", HFILL }},
     { &hf_logotypecertextn_hashAlg,
       { "hashAlg", "logotypecertextn.hashAlg",
         FT_NONE, BASE_NONE, NULL, 0,
-        "HashAlgAndValue/hashAlg", HFILL }},
+        "x509af.AlgorithmIdentifier", HFILL }},
     { &hf_logotypecertextn_hashValue,
       { "hashValue", "logotypecertextn.hashValue",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "HashAlgAndValue/hashValue", HFILL }},
+        "logotypecertextn.OCTET_STRING", HFILL }},
 
 /*--- End of included file: packet-logotypecertextn-hfarr.c ---*/
 #line 61 "packet-logotype-cert-extn-template.c"