Regenerate dissectors with the current asn2eth.

svn path=/trunk/; revision=15664

1 files changed, 41 insertions, 24 deletions

diff --git a/epan/dissectors/packet-pkixtsp.c b/epan/dissectors/packet-pkixtsp.c
index 7cd80aab3c..0f57c4479f 100644
--- a/epan/dissectors/packet-pkixtsp.c
+++ b/epan/dissectors/packet-pkixtsp.c
@@ -131,7 +131,8 @@ static const value_string pkixtsp_T_version_vals[] = {
 
 static int
 dissect_pkixtsp_T_version(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+                                  NULL);
 
   return offset;
 }
@@ -140,10 +141,11 @@ static int dissect_version(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
 }
 
 
+
 static int
 dissect_pkixtsp_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index,
-                                    NULL);
+                                       NULL);
 
   return offset;
 }
@@ -151,6 +153,7 @@ static int dissect_hashedMessage(packet_info *pinfo, proto_tree *tree, tvbuff_t
   return dissect_pkixtsp_OCTET_STRING(FALSE, tvb, offset, pinfo, tree, hf_pkixtsp_hashedMessage);
 }
 
+
 static const ber_sequence_t MessageImprint_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_hashAlgorithm },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_hashedMessage },
@@ -160,7 +163,7 @@ static const ber_sequence_t MessageImprint_sequence[] = {
 static int
 dissect_pkixtsp_MessageImprint(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
-                                MessageImprint_sequence, hf_index, ett_pkixtsp_MessageImprint);
+                                   MessageImprint_sequence, hf_index, ett_pkixtsp_MessageImprint);
 
   return offset;
 }
@@ -169,10 +172,11 @@ static int dissect_messageImprint(packet_info *pinfo, proto_tree *tree, tvbuff_t
 }
 
 
+
 static int
 dissect_pkixtsp_TSAPolicyId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset,
-                                         hf_index, NULL);
+  offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+                                            NULL);
 
   return offset;
 }
@@ -187,7 +191,8 @@ static int dissect_policy(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
 
 static int
 dissect_pkixtsp_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+                                  NULL);
 
   return offset;
 }
@@ -202,6 +207,7 @@ static int dissect_seconds(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
 }
 
 
+
 static int
 dissect_pkixtsp_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_boolean(implicit_tag, pinfo, tree, tvb, offset, hf_index);
@@ -215,6 +221,7 @@ static int dissect_ordering(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
   return dissect_pkixtsp_BOOLEAN(FALSE, tvb, offset, pinfo, tree, hf_pkixtsp_ordering);
 }
 
+
 static const ber_sequence_t TimeStampReq_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_messageImprint },
@@ -228,7 +235,7 @@ static const ber_sequence_t TimeStampReq_sequence[] = {
 static int
 dissect_pkixtsp_TimeStampReq(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
-                                TimeStampReq_sequence, hf_index, ett_pkixtsp_TimeStampReq);
+                                   TimeStampReq_sequence, hf_index, ett_pkixtsp_TimeStampReq);
 
   return offset;
 }
@@ -247,7 +254,8 @@ static const value_string pkixtsp_PKIStatus_vals[] = {
 
 static int
 dissect_pkixtsp_PKIStatus(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+                                  NULL);
 
   return offset;
 }
@@ -255,23 +263,24 @@ static int dissect_pki_status(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
   return dissect_pkixtsp_PKIStatus(FALSE, tvb, offset, pinfo, tree, hf_pkixtsp_pki_status);
 }
 
+
 static const asn_namedbit PKIFailureInfo_bits[] = {
-  {  0, &hf_pkixtsp_PKIFailureInfo_badAlg, -1, -1, NULL, NULL },
-  {  2, &hf_pkixtsp_PKIFailureInfo_badRequest, -1, -1, NULL, NULL },
-  {  5, &hf_pkixtsp_PKIFailureInfo_badDataFormat, -1, -1, NULL, NULL },
-  { 14, &hf_pkixtsp_PKIFailureInfo_timeNotAvailable, -1, -1, NULL, NULL },
-  { 15, &hf_pkixtsp_PKIFailureInfo_unacceptedPolicy, -1, -1, NULL, NULL },
-  { 16, &hf_pkixtsp_PKIFailureInfo_unacceptedExtension, -1, -1, NULL, NULL },
-  { 17, &hf_pkixtsp_PKIFailureInfo_addInfoNotAvailable, -1, -1, NULL, NULL },
-  { 25, &hf_pkixtsp_PKIFailureInfo_systemFailure, -1, -1, NULL, NULL },
+  {  0, &hf_pkixtsp_PKIFailureInfo_badAlg, -1, -1, "badAlg", NULL },
+  {  2, &hf_pkixtsp_PKIFailureInfo_badRequest, -1, -1, "badRequest", NULL },
+  {  5, &hf_pkixtsp_PKIFailureInfo_badDataFormat, -1, -1, "badDataFormat", NULL },
+  { 14, &hf_pkixtsp_PKIFailureInfo_timeNotAvailable, -1, -1, "timeNotAvailable", NULL },
+  { 15, &hf_pkixtsp_PKIFailureInfo_unacceptedPolicy, -1, -1, "unacceptedPolicy", NULL },
+  { 16, &hf_pkixtsp_PKIFailureInfo_unacceptedExtension, -1, -1, "unacceptedExtension", NULL },
+  { 17, &hf_pkixtsp_PKIFailureInfo_addInfoNotAvailable, -1, -1, "addInfoNotAvailable", NULL },
+  { 25, &hf_pkixtsp_PKIFailureInfo_systemFailure, -1, -1, "systemFailure", NULL },
   { 0, NULL, 0, 0, NULL, NULL }
 };
 
 static int
 dissect_pkixtsp_PKIFailureInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset,
-                                 PKIFailureInfo_bits, hf_index, ett_pkixtsp_PKIFailureInfo,
-                                 NULL);
+                                    PKIFailureInfo_bits, hf_index, ett_pkixtsp_PKIFailureInfo,
+                                    NULL);
 
   return offset;
 }
@@ -279,6 +288,7 @@ static int dissect_failInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
   return dissect_pkixtsp_PKIFailureInfo(FALSE, tvb, offset, pinfo, tree, hf_pkixtsp_failInfo);
 }
 
+
 static const ber_sequence_t PKIStatusInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_pki_status },
   { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_failInfo },
@@ -288,7 +298,7 @@ static const ber_sequence_t PKIStatusInfo_sequence[] = {
 static int
 dissect_pkixtsp_PKIStatusInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
-                                PKIStatusInfo_sequence, hf_index, ett_pkixtsp_PKIStatusInfo);
+                                   PKIStatusInfo_sequence, hf_index, ett_pkixtsp_PKIStatusInfo);
 
   return offset;
 }
@@ -297,6 +307,7 @@ static int dissect_status(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
 }
 
 
+
 static int
 dissect_pkixtsp_TimeStampToken(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_cms_ContentInfo(implicit_tag, tvb, offset, pinfo, tree, hf_index);
@@ -307,6 +318,7 @@ static int dissect_timeStampToken(packet_info *pinfo, proto_tree *tree, tvbuff_t
   return dissect_pkixtsp_TimeStampToken(FALSE, tvb, offset, pinfo, tree, hf_pkixtsp_timeStampToken);
 }
 
+
 static const ber_sequence_t TimeStampResp_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_status },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_timeStampToken },
@@ -316,7 +328,7 @@ static const ber_sequence_t TimeStampResp_sequence[] = {
 static int
 dissect_pkixtsp_TimeStampResp(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
-                                TimeStampResp_sequence, hf_index, ett_pkixtsp_TimeStampResp);
+                                   TimeStampResp_sequence, hf_index, ett_pkixtsp_TimeStampResp);
 
   return offset;
 }
@@ -330,7 +342,8 @@ static const value_string pkixtsp_tst_version_vals[] = {
 
 static int
 dissect_pkixtsp_tst_version(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+                                  NULL);
 
   return offset;
 }
@@ -339,6 +352,7 @@ static int dissect_tst_version(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
 }
 
 
+
 static int
 dissect_pkixtsp_GeneralizedTime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_GeneralizedTime(implicit_tag, pinfo, tree, tvb, offset, hf_index);
@@ -353,7 +367,8 @@ static int dissect_genTime(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
 
 static int
 dissect_pkixtsp_INTEGER_1_999(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+                                  NULL);
 
   return offset;
 }
@@ -364,6 +379,7 @@ static int dissect_micros_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
   return dissect_pkixtsp_INTEGER_1_999(TRUE, tvb, offset, pinfo, tree, hf_pkixtsp_micros);
 }
 
+
 static const ber_sequence_t Accuracy_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_seconds },
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_millis_impl },
@@ -374,7 +390,7 @@ static const ber_sequence_t Accuracy_sequence[] = {
 static int
 dissect_pkixtsp_Accuracy(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
-                                Accuracy_sequence, hf_index, ett_pkixtsp_Accuracy);
+                                   Accuracy_sequence, hf_index, ett_pkixtsp_Accuracy);
 
   return offset;
 }
@@ -382,6 +398,7 @@ static int dissect_accuracy(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
   return dissect_pkixtsp_Accuracy(FALSE, tvb, offset, pinfo, tree, hf_pkixtsp_accuracy);
 }
 
+
 static const ber_sequence_t TSTInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_tst_version },
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_policy },
@@ -399,7 +416,7 @@ static const ber_sequence_t TSTInfo_sequence[] = {
 static int
 dissect_pkixtsp_TSTInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
-                                TSTInfo_sequence, hf_index, ett_pkixtsp_TSTInfo);
+                                   TSTInfo_sequence, hf_index, ett_pkixtsp_TSTInfo);
 
   return offset;
 }