aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asn1/cms/cms.cnf2
-rw-r--r--asn1/pkcs1/pkcs1.cnf2
-rw-r--r--asn1/pkixqualified/pkixqualified.cnf2
-rwxr-xr-xasn1/x509af/Makefile5
-rw-r--r--asn1/x509af/x509af-exp.cnf50
-rw-r--r--asn1/x509af/x509af.cnf12
-rw-r--r--asn1/x509af/x509af_exp.cnf25
-rw-r--r--asn1/x509ce/x509ce.cnf2
-rw-r--r--epan/dissectors/packet-cms.c2
-rw-r--r--epan/dissectors/packet-pkcs1.c16
-rw-r--r--epan/dissectors/packet-x509af.c30
-rw-r--r--epan/dissectors/packet-x509af.h16
-rw-r--r--epan/dissectors/packet-x509ce.c2
13 files changed, 111 insertions, 55 deletions
diff --git a/asn1/cms/cms.cnf b/asn1/cms/cms.cnf
index cacf1b30a8..aeead66849 100644
--- a/asn1/cms/cms.cnf
+++ b/asn1/cms/cms.cnf
@@ -7,7 +7,7 @@
AuthenticationFramework x509af
InformationFramework x509if
-#.INCLUDE ../x509af/x509af_exp.cnf
+#.INCLUDE ../x509af/x509af-exp.cnf
#.INCLUDE ../x509if/x509if-exp.cnf
#.EXPORTS
diff --git a/asn1/pkcs1/pkcs1.cnf b/asn1/pkcs1/pkcs1.cnf
index a94b0e603d..5355fd96c0 100644
--- a/asn1/pkcs1/pkcs1.cnf
+++ b/asn1/pkcs1/pkcs1.cnf
@@ -6,7 +6,7 @@
#.MODULE_IMPORT
AuthenticationFramework x509af
-#.INCLUDE ../x509af/x509af_exp.cnf
+#.INCLUDE ../x509af/x509af-exp.cnf
#.EXPORTS
diff --git a/asn1/pkixqualified/pkixqualified.cnf b/asn1/pkixqualified/pkixqualified.cnf
index 5393462e2e..6cd993286b 100644
--- a/asn1/pkixqualified/pkixqualified.cnf
+++ b/asn1/pkixqualified/pkixqualified.cnf
@@ -9,7 +9,7 @@ AuthenticationFramework x509af
SelectedAttributeTypes x509sat
#.INCLUDE ../x509ce/x509ce-exp.cnf
-#.INCLUDE ../x509af/x509af_exp.cnf
+#.INCLUDE ../x509af/x509af-exp.cnf
#.INCLUDE ../x509sat/x509sat-exp.cnf
#.EXPORTS
diff --git a/asn1/x509af/Makefile b/asn1/x509af/Makefile
new file mode 100755
index 0000000000..e0100d4649
--- /dev/null
+++ b/asn1/x509af/Makefile
@@ -0,0 +1,5 @@
+
+../../epan/dissectors/packet-x509af.c : ../../tools/asn2eth.py AuthenticationFramework.asn packet-x509af-template.c packet-x509af-template.h x509af.cnf ../x509if/x509if-exp.cnf ../x509sat/x509sat-exp.cnf ../x509ce/x509ce-exp.cnf
+ python ../../tools/asn2eth.py -X -b -k -e -p x509af -c x509af.cnf -s packet-x509af-template AuthenticationFramework.asn
+ cp packet-x509af.* ../../epan/dissectors
+
diff --git a/asn1/x509af/x509af-exp.cnf b/asn1/x509af/x509af-exp.cnf
new file mode 100644
index 0000000000..20f16dd83b
--- /dev/null
+++ b/asn1/x509af/x509af-exp.cnf
@@ -0,0 +1,50 @@
+#.IMPORT_TAG
+Certificate BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+Version BER_CLASS_UNI BER_UNI_TAG_INTEGER
+CertificateSerialNumber BER_CLASS_UNI BER_UNI_TAG_INTEGER
+AlgorithmIdentifier BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+Validity BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+SubjectPublicKeyInfo BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+Time BER_CLASS_UNI -1/*choice*/
+Extensions BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+Extension BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+Certificates BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+ForwardCertificationPath BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+CrossCertificates BER_CLASS_UNI BER_UNI_TAG_SET
+CertificationPath BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+CertificatePair BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+CertificateList BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+AttributeCertificationPath BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+ACPathData BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+AttributeCertificate BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+AttributeCertificateInfo BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+IssuerSerial BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+AttCertValidityPeriod BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+AttributeCertificateAssertion BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+#.END
+
+#.TYPE_ATTR
+Certificate TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
+Version TYPE = FT_INT32 DISPLAY = BASE_DEC STRINGS = VALS(Version_vals) BITMASK = 0
+CertificateSerialNumber TYPE = FT_INT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0
+AlgorithmIdentifier TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
+Validity TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
+SubjectPublicKeyInfo TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
+Time TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(Time_vals) BITMASK = 0
+Extensions TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0
+Extension TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
+Certificates TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
+ForwardCertificationPath TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0
+CrossCertificates TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0
+CertificationPath TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
+CertificatePair TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
+CertificateList TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
+AttributeCertificationPath TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
+ACPathData TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
+AttributeCertificate TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
+AttributeCertificateInfo TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
+IssuerSerial TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
+AttCertValidityPeriod TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
+AttributeCertificateAssertion TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
+#.END
+
diff --git a/asn1/x509af/x509af.cnf b/asn1/x509af/x509af.cnf
index 3cadc80a5d..b2f8557c30 100644
--- a/asn1/x509af/x509af.cnf
+++ b/asn1/x509af/x509af.cnf
@@ -13,16 +13,28 @@ SelectedAttributeTypes x509sat
#.INCLUDE ../x509sat/x509sat-exp.cnf
#.EXPORTS
+ACPathData
AlgorithmIdentifier
+AttCertValidityPeriod
AttributeCertificate
AttributeCertificateAssertion
+AttributeCertificateInfo
AttributeCertificationPath
Certificate
Certificates
CertificateList
+CertificatePair
CertificateSerialNumber
CertificationPath
+CrossCertificates
+Extension
+Extensions
+ForwardCertificationPath
+IssuerSerial
SubjectPublicKeyInfo
+Time
+Validity
+Version
#.PDU
diff --git a/asn1/x509af/x509af_exp.cnf b/asn1/x509af/x509af_exp.cnf
deleted file mode 100644
index 690fb20117..0000000000
--- a/asn1/x509af/x509af_exp.cnf
+++ /dev/null
@@ -1,25 +0,0 @@
-
-#.IMPORT_TAG
-AlgorithmIdentifier BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-AttributeCertificate BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-AttributeCertificateAssertion BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-AttributeCertificationPath BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-Certificate BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-CertificateSerialNumber BER_CLASS_UNI BER_UNI_TAG_INTEGER
-Certificates BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-CertificationPath BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-CertificateList BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-SubjectPublicKeyInfo BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-#.END
-
-#.TYPE_ATTR
-Certificate TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
-CertificateSerialNumber TYPE = FT_INT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0
-Certificates TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
-CertificationPath TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
-CertificateList TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
-AttributeCertificationPath TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
-AttributeCertificate TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
-AttributeCertificateAssertion TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
-SubjectPublicKeyInfo TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
-#.END
diff --git a/asn1/x509ce/x509ce.cnf b/asn1/x509ce/x509ce.cnf
index 443378eb47..968b0b9b91 100644
--- a/asn1/x509ce/x509ce.cnf
+++ b/asn1/x509ce/x509ce.cnf
@@ -9,7 +9,7 @@ AuthenticationFramework x509af
SelectedAttributeTypes x509sat
#.INCLUDE ../x509if/x509if-exp.cnf
-#.INCLUDE ../x509af/x509af_exp.cnf
+#.INCLUDE ../x509af/x509af-exp.cnf
#.INCLUDE ../x509sat/x509sat-exp.cnf
#.EXPORTS
diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c
index d3da715c8d..c9ac17158e 100644
--- a/epan/dissectors/packet-cms.c
+++ b/epan/dissectors/packet-cms.c
@@ -543,7 +543,7 @@ static int dissect_crls_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
}
static const ber_sequence IssuerAndSerialNumber_sequence[] = {
- { BER_CLASS_ANY, -1, BER_FLAGS_NOOWNTAG, dissect_issuer },
+ { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_issuer },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serialNumber },
{ 0, 0, 0, NULL }
};
diff --git a/epan/dissectors/packet-pkcs1.c b/epan/dissectors/packet-pkcs1.c
index 97fb2d7f80..bafc0b2c15 100644
--- a/epan/dissectors/packet-pkcs1.c
+++ b/epan/dissectors/packet-pkcs1.c
@@ -87,7 +87,7 @@ static gint ett_pkcs1_DigestInfo = -1;
static int
-dissect_pkcs1_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+dissect_pkcs1_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_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
return offset;
@@ -124,7 +124,7 @@ static const ber_sequence RSAPublicKey_sequence[] = {
};
int
-dissect_pkcs1_RSAPublicKey(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+dissect_pkcs1_RSAPublicKey(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,
RSAPublicKey_sequence, hf_index, ett_pkcs1_RSAPublicKey);
@@ -134,7 +134,7 @@ dissect_pkcs1_RSAPublicKey(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
static int
-dissect_pkcs1_Version(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+dissect_pkcs1_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_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
return offset;
@@ -157,7 +157,7 @@ static const ber_sequence RSAPrivateKey_sequence[] = {
};
int
-dissect_pkcs1_RSAPrivateKey(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+dissect_pkcs1_RSAPrivateKey(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,
RSAPrivateKey_sequence, hf_index, ett_pkcs1_RSAPrivateKey);
@@ -166,7 +166,7 @@ dissect_pkcs1_RSAPrivateKey(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset
static int
-dissect_pkcs1_DigestAlgorithmIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+dissect_pkcs1_DigestAlgorithmIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_x509af_AlgorithmIdentifier(implicit_tag, tvb, offset, pinfo, tree, hf_index);
return offset;
@@ -177,7 +177,7 @@ static int dissect_digestAlgorithm(packet_info *pinfo, proto_tree *tree, tvbuff_
static int
-dissect_pkcs1_Digest(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+dissect_pkcs1_Digest(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);
@@ -194,7 +194,7 @@ static const ber_sequence DigestInfo_sequence[] = {
};
int
-dissect_pkcs1_DigestInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+dissect_pkcs1_DigestInfo(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,
DigestInfo_sequence, hf_index, ett_pkcs1_DigestInfo);
@@ -223,7 +223,7 @@ void proto_register_pkcs1(void) {
"", HFILL }},
{ &hf_pkcs1_version,
{ "version", "pkcs1.version",
- FT_INT32, BASE_DEC, NULL, 0,
+ FT_INT32, BASE_DEC, VALS(Version_vals), 0,
"RSAPrivateKey/version", HFILL }},
{ &hf_pkcs1_privateExponent,
{ "privateExponent", "pkcs1.privateExponent",
diff --git a/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c
index c508119803..0ed5710109 100644
--- a/epan/dissectors/packet-x509af.c
+++ b/epan/dissectors/packet-x509af.c
@@ -1,7 +1,7 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* ./packet-x509af.c */
-/* ../../tools/asn2eth.py -X -b -e -p x509af -c x509af.cnf -s packet-x509af-template AuthenticationFramework.asn */
+/* ../../tools/asn2eth.py -X -b -k -e -p x509af -c x509af.cnf -s packet-x509af-template AuthenticationFramework.asn */
/* Input file: packet-x509af-template.c */
@@ -217,7 +217,7 @@ static int dissect_attType_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *
}
-static const value_string Version_vals[] = {
+const value_string Version_vals[] = {
{ 0, "v1" },
{ 1, "v2" },
{ 2, "v3" },
@@ -225,7 +225,7 @@ static const value_string Version_vals[] = {
};
-static int
+int
dissect_x509af_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_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
@@ -336,7 +336,7 @@ static int dissect_attCertValidity(packet_info *pinfo, proto_tree *tree, tvbuff_
}
-static const value_string Time_vals[] = {
+const value_string Time_vals[] = {
{ 0, "utcTime" },
{ 1, "generalizedTime" },
{ 0, NULL }
@@ -348,7 +348,7 @@ static const ber_choice Time_choice[] = {
{ 0, 0, 0, 0, NULL }
};
-static int
+int
dissect_x509af_Time(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
Time_choice, hf_index, ett_x509af_Time);
@@ -377,7 +377,7 @@ static const ber_sequence Validity_sequence[] = {
{ 0, 0, 0, NULL }
};
-static int
+int
dissect_x509af_Validity(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,
Validity_sequence, hf_index, ett_x509af_Validity);
@@ -471,7 +471,7 @@ static const ber_sequence Extension_sequence[] = {
{ 0, 0, 0, NULL }
};
-static int
+int
dissect_x509af_Extension(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,
Extension_sequence, hf_index, ett_x509af_Extension);
@@ -486,7 +486,7 @@ static const ber_sequence Extensions_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Extensions_item },
};
-static int
+int
dissect_x509af_Extensions(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
Extensions_sequence_of, hf_index, ett_x509af_Extensions);
@@ -562,7 +562,7 @@ static const ber_sequence CrossCertificates_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CrossCertificates_item },
};
-static int
+int
dissect_x509af_CrossCertificates(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset,
CrossCertificates_set_of, hf_index, ett_x509af_CrossCertificates);
@@ -577,7 +577,7 @@ static const ber_sequence ForwardCertificationPath_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_ForwardCertificationPath_item },
};
-static int
+int
dissect_x509af_ForwardCertificationPath(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
ForwardCertificationPath_sequence_of, hf_index, ett_x509af_ForwardCertificationPath);
@@ -608,7 +608,7 @@ static const ber_sequence CertificatePair_sequence[] = {
{ 0, 0, 0, NULL }
};
-static int
+int
dissect_x509af_CertificatePair(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,
CertificatePair_sequence, hf_index, ett_x509af_CertificatePair);
@@ -725,7 +725,7 @@ static const ber_sequence IssuerSerial_sequence[] = {
{ 0, 0, 0, NULL }
};
-static int
+int
dissect_x509af_IssuerSerial(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,
IssuerSerial_sequence, hf_index, ett_x509af_IssuerSerial);
@@ -766,7 +766,7 @@ static const ber_sequence AttCertValidityPeriod_sequence[] = {
{ 0, 0, 0, NULL }
};
-static int
+int
dissect_x509af_AttCertValidityPeriod(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,
AttCertValidityPeriod_sequence, hf_index, ett_x509af_AttCertValidityPeriod);
@@ -805,7 +805,7 @@ static const ber_sequence AttributeCertificateInfo_sequence[] = {
{ 0, 0, 0, NULL }
};
-static int
+int
dissect_x509af_AttributeCertificateInfo(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,
AttributeCertificateInfo_sequence, hf_index, ett_x509af_AttributeCertificateInfo);
@@ -840,7 +840,7 @@ static const ber_sequence ACPathData_sequence[] = {
{ 0, 0, 0, NULL }
};
-static int
+int
dissect_x509af_ACPathData(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,
ACPathData_sequence, hf_index, ett_x509af_ACPathData);
diff --git a/epan/dissectors/packet-x509af.h b/epan/dissectors/packet-x509af.h
index 14f6b27750..2f2475c924 100644
--- a/epan/dissectors/packet-x509af.h
+++ b/epan/dissectors/packet-x509af.h
@@ -1,7 +1,7 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* ./packet-x509af.h */
-/* ../../tools/asn2eth.py -X -b -e -p x509af -c x509af.cnf -s packet-x509af-template AuthenticationFramework.asn */
+/* ../../tools/asn2eth.py -X -b -k -e -p x509af -c x509af.cnf -s packet-x509af-template AuthenticationFramework.asn */
/* Input file: packet-x509af-template.h */
@@ -35,15 +35,29 @@
/*--- Included file: packet-x509af-exp.h ---*/
+extern const value_string Version_vals[];
+extern const value_string Time_vals[];
int dissect_x509af_Certificate(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
+int dissect_x509af_Version(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
int dissect_x509af_CertificateSerialNumber(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
int dissect_x509af_AlgorithmIdentifier(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
+int dissect_x509af_Validity(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
int dissect_x509af_SubjectPublicKeyInfo(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
+int dissect_x509af_Time(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
+int dissect_x509af_Extensions(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
+int dissect_x509af_Extension(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
int dissect_x509af_Certificates(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
+int dissect_x509af_ForwardCertificationPath(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
+int dissect_x509af_CrossCertificates(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
int dissect_x509af_CertificationPath(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
+int dissect_x509af_CertificatePair(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
int dissect_x509af_CertificateList(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
int dissect_x509af_AttributeCertificationPath(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
+int dissect_x509af_ACPathData(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
int dissect_x509af_AttributeCertificate(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
+int dissect_x509af_AttributeCertificateInfo(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
+int dissect_x509af_IssuerSerial(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
+int dissect_x509af_AttCertValidityPeriod(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
int dissect_x509af_AttributeCertificateAssertion(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
/*--- End of included file: packet-x509af-exp.h ---*/
diff --git a/epan/dissectors/packet-x509ce.c b/epan/dissectors/packet-x509ce.c
index 2d9c2ec039..db0d9a5bfb 100644
--- a/epan/dissectors/packet-x509ce.c
+++ b/epan/dissectors/packet-x509ce.c
@@ -8,7 +8,7 @@
/* packet-x509ce.c
* Routines for X.509 Certificate Extensions packet dissection
*
- * $Id: packet-x509ce-template.c 12203 2004-10-05 09:18:55Z guy $
+ * $Id: packet-x509ce-template.c 12557 2004-11-21 10:00:40Z sahlberg $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 00:06:18 +0000