summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asn1/x509if/x509if_exp.cnf16
-rw-r--r--epan/dissectors/packet-ber.c5
-rw-r--r--epan/dissectors/packet-x509af.c18
-rw-r--r--epan/dissectors/packet-x509if.c12
-rw-r--r--epan/dissectors/packet-x509if.h4
5 files changed, 30 insertions, 25 deletions
diff --git a/asn1/x509if/x509if_exp.cnf b/asn1/x509if/x509if_exp.cnf
index 92ba9fa437..4b075731a5 100644
--- a/asn1/x509if/x509if_exp.cnf
+++ b/asn1/x509if/x509if_exp.cnf
@@ -1,5 +1,11 @@
-
-#.IMPORT_TAG
-Name BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-Attribute BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-
+#.IMPORT_TAG
+Attribute BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+AttributeType BER_CLASS_UNI BER_UNI_TAG_OID
+Name BER_CLASS_ANY -1
+#.END
+
+#.TYPE_ATTR
+AttributeType TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
+Name TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(Name_vals) BITMASK = 0
+#.END
+
diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c
index 971f3dda10..6715af7e5b 100644
--- a/epan/dissectors/packet-ber.c
+++ b/epan/dissectors/packet-ber.c
@@ -477,7 +477,7 @@ ber_sequence_try_again:
goto ber_sequence_try_again;
}
if (!(seq->flags & BER_FLAGS_NOTCHKTAG)) {
- proto_tree_add_text(tree, tvb, offset, len, "BER Error: Wrong field");
+ proto_tree_add_text(tree, tvb, offset, len, "BER Error: Wrong field in SEQUENCE");
seq++;
offset=eoffset;
continue;
@@ -523,7 +523,6 @@ dissect_ber_choice(packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, i
int hoffset = offset;
header_field_info *hfinfo;
-
/* read header and len for choice field */
offset=get_ber_identifier(tvb, offset, &class, &pc, &tag);
offset=get_ber_length(tvb, offset, &len, NULL);
@@ -811,7 +810,7 @@ static int dissect_ber_sq_of(gboolean implicit_tag, guint32 type, packet_info *p
if ((seq->class!=class)
||(seq->tag!=tag) ){
if (!(seq->flags & BER_FLAGS_NOTCHKTAG)) {
- proto_tree_add_text(tree, tvb, offset, len, "BER Error: Wrong field");
+ proto_tree_add_text(tree, tvb, offset, len, "BER Error: Wrong field in SQ OF");
offset = eoffset;
continue;
}
diff --git a/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c
index 242a7004d0..eb6b87ae10 100644
--- a/epan/dissectors/packet-x509af.c
+++ b/epan/dissectors/packet-x509af.c
@@ -479,9 +479,9 @@ static ber_sequence T_signedCertificate_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_version },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serialNumber },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signature },
- { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuer },
+ { BER_CLASS_ANY, -1, BER_FLAGS_NOOWNTAG, dissect_issuer },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_validity },
- { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_subject },
+ { BER_CLASS_ANY, -1, BER_FLAGS_NOOWNTAG, dissect_subject },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_subjectPublicKeyInfo },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_issuerUniqueIdentifier_impl },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_subjectUniqueIdentifier_impl },
@@ -656,7 +656,7 @@ static int dissect_revokedCertificates(packet_info *pinfo, proto_tree *tree, tvb
static ber_sequence T_signedCertificateList_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_version },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signature },
- { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuer },
+ { BER_CLASS_ANY, -1, BER_FLAGS_NOOWNTAG, dissect_issuer },
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_thisUpdate },
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_nextUpdate },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_revokedCertificates },
@@ -877,7 +877,7 @@ static int dissect_assertion_subject(packet_info *pinfo, proto_tree *tree, tvbuf
}
static ber_sequence SET_OF_AttributeType_set_of[1] = {
- { -1 /*imported*/, -1 /*imported*/, BER_FLAGS_NOOWNTAG, dissect_attType_item },
+ { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attType_item },
};
static int
@@ -947,7 +947,7 @@ void proto_register_x509af(void) {
"", HFILL }},
{ &hf_x509af_issuer,
{ "issuer", "x509af.issuer",
- FT_NONE, BASE_NONE, NULL, 0,
+ FT_UINT32, BASE_DEC, VALS(Name_vals), 0,
"", HFILL }},
{ &hf_x509af_validity,
{ "validity", "x509af.validity",
@@ -955,7 +955,7 @@ void proto_register_x509af(void) {
"Certificate/signedCertificate/validity", HFILL }},
{ &hf_x509af_subject,
{ "subject", "x509af.subject",
- FT_NONE, BASE_NONE, NULL, 0,
+ FT_UINT32, BASE_DEC, VALS(Name_vals), 0,
"Certificate/signedCertificate/subject", HFILL }},
{ &hf_x509af_subjectPublicKeyInfo,
{ "subjectPublicKeyInfo", "x509af.subjectPublicKeyInfo",
@@ -1159,11 +1159,11 @@ void proto_register_x509af(void) {
"AttributeCertificateAssertion/subject", HFILL }},
{ &hf_x509af_assertionSubjectName,
{ "subjectName", "x509af.subjectName",
- FT_NONE, BASE_NONE, NULL, 0,
+ FT_UINT32, BASE_DEC, VALS(Name_vals), 0,
"AttributeCertificateAssertion/subject/subjectName", HFILL }},
{ &hf_x509af_assertionIssuer,
{ "issuer", "x509af.issuer",
- FT_NONE, BASE_NONE, NULL, 0,
+ FT_UINT32, BASE_DEC, VALS(Name_vals), 0,
"AttributeCertificateAssertion/issuer", HFILL }},
{ &hf_x509af_attCertValidity,
{ "attCertValidity", "x509af.attCertValidity",
@@ -1175,7 +1175,7 @@ void proto_register_x509af(void) {
"AttributeCertificateAssertion/attType", HFILL }},
{ &hf_x509af_attType_item,
{ "Item(##)", "x509af.attType_item",
- FT_NONE, BASE_NONE, NULL, 0,
+ FT_STRING, BASE_NONE, NULL, 0,
"AttributeCertificateAssertion/attType/_item", HFILL }},
/*--- End of included file: packet-x509af-hfarr.c ---*/
diff --git a/epan/dissectors/packet-x509if.c b/epan/dissectors/packet-x509if.c
index 219a93ba1c..b967b9e2bc 100644
--- a/epan/dissectors/packet-x509if.c
+++ b/epan/dissectors/packet-x509if.c
@@ -1,7 +1,7 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* packet-x509if.c */
-/* ../../tools/asn2eth.py -X -b -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */
+/* ../../tools/asn2eth.py -X -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */
/* Input file: packet-x509if-template.c */
/* Include files: packet-x509if-hf.c, packet-x509if-ett.c, packet-x509if-fn.c, packet-x509if-hfarr.c, packet-x509if-ettarr.c, packet-x509if-val.h */
@@ -56,7 +56,7 @@ int proto_x509if = -1;
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* packet-x509if-hf.c */
-/* ../../tools/asn2eth.py -X -b -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */
+/* ../../tools/asn2eth.py -X -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */
static int hf_x509if_rdnSequence = -1; /* RDNSequence */
static int hf_x509if_RDNSequence_item = -1; /* RelativeDistinguishedName */
@@ -77,7 +77,7 @@ static gint ett_x509if_Attribute = -1;
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* packet-x509if-ett.c */
-/* ../../tools/asn2eth.py -X -b -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */
+/* ../../tools/asn2eth.py -X -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */
static gint ett_x509if_Name = -1;
static gint ett_x509if_RDNSequence = -1;
@@ -109,7 +109,7 @@ dissect_x509if_Attribute(gboolean implicit_tag, tvbuff_t *tvb, int offset, packe
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* packet-x509if-fn.c */
-/* ../../tools/asn2eth.py -X -b -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */
+/* ../../tools/asn2eth.py -X -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */
static int
@@ -264,7 +264,7 @@ void proto_register_x509if(void) {
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* packet-x509if-hfarr.c */
-/* ../../tools/asn2eth.py -X -b -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */
+/* ../../tools/asn2eth.py -X -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */
{ &hf_x509if_rdnSequence,
{ "rdnSequence", "x509if.rdnSequence",
@@ -304,7 +304,7 @@ void proto_register_x509if(void) {
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* packet-x509if-ettarr.c */
-/* ../../tools/asn2eth.py -X -b -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */
+/* ../../tools/asn2eth.py -X -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */
&ett_x509if_Name,
&ett_x509if_RDNSequence,
diff --git a/epan/dissectors/packet-x509if.h b/epan/dissectors/packet-x509if.h
index 8231327ee2..a1253cd91a 100644
--- a/epan/dissectors/packet-x509if.h
+++ b/epan/dissectors/packet-x509if.h
@@ -1,7 +1,7 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* packet-x509if.h */
-/* ../../tools/asn2eth.py -X -b -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */
+/* ../../tools/asn2eth.py -X -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */
/* Input file: packet-x509if-template.h */
/* Include files: packet-x509if-exp.h, packet-x509if-valexp.h */
@@ -39,7 +39,7 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* packet-x509if-exp.h */
-/* ../../tools/asn2eth.py -X -b -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */
+/* ../../tools/asn2eth.py -X -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */
extern const value_string Name_vals[];
int dissect_x509if_AttributeType(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-07 04:59:29 +0000