summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xasn1/pkixtsp/Makefile2
-rwxr-xr-xasn1/smrse/Makefile2
-rwxr-xr-xasn1/x509af/Makefile2
-rwxr-xr-xasn1/x509ce/Makefile2
-rwxr-xr-xasn1/x509if/Makefile2
-rwxr-xr-xasn1/x509sat/Makefile2
-rw-r--r--epan/dissectors/packet-pkixtsp.c2
-rw-r--r--epan/dissectors/packet-pkixtsp.h2
-rw-r--r--epan/dissectors/packet-smrse.c2
-rw-r--r--epan/dissectors/packet-smrse.h2
-rw-r--r--epan/dissectors/packet-x509af.c6
-rw-r--r--epan/dissectors/packet-x509af.h2
-rw-r--r--epan/dissectors/packet-x509ce.c4
-rw-r--r--epan/dissectors/packet-x509ce.h2
-rw-r--r--epan/dissectors/packet-x509if.c2
-rw-r--r--epan/dissectors/packet-x509if.h2
-rw-r--r--epan/dissectors/packet-x509sat.c2
-rw-r--r--epan/dissectors/packet-x509sat.h2
18 files changed, 21 insertions, 21 deletions
diff --git a/asn1/pkixtsp/Makefile b/asn1/pkixtsp/Makefile
index 5181ff1160..e033cdaca6 100755
--- a/asn1/pkixtsp/Makefile
+++ b/asn1/pkixtsp/Makefile
@@ -1,5 +1,5 @@
../../epan/dissectors/packet-pkixtsp.c : ../../tools/asn2eth.py PKIXTSP.asn packet-pkixtsp-template.c packet-pkixtsp-template.h pkixtsp.cnf
- python ../../tools/asn2eth.py -X -b -k -e -p pkixtsp -c pkixtsp.cnf -s packet-pkixtsp-template PKIXTSP.asn
+ python ../../tools/asn2eth.py -X -b -e -p pkixtsp -c pkixtsp.cnf -s packet-pkixtsp-template PKIXTSP.asn
cp packet-pkixtsp.* ../../epan/dissectors
diff --git a/asn1/smrse/Makefile b/asn1/smrse/Makefile
index 07a684e36c..769adad0bf 100755
--- a/asn1/smrse/Makefile
+++ b/asn1/smrse/Makefile
@@ -1,5 +1,5 @@
../../epan/dissectors/packet-smrse.c : ../../tools/asn2eth.py SMRSE.asn packet-smrse-template.c packet-smrse-template.h smrse.cnf
- python ../../tools/asn2eth.py -X -b -k -e -p smrse -c smrse.cnf -s packet-smrse-template SMRSE.asn
+ python ../../tools/asn2eth.py -X -b -e -p smrse -c smrse.cnf -s packet-smrse-template SMRSE.asn
cp packet-smrse.* ../../epan/dissectors
diff --git a/asn1/x509af/Makefile b/asn1/x509af/Makefile
index e0100d4649..5bf2d2e2f2 100755
--- a/asn1/x509af/Makefile
+++ b/asn1/x509af/Makefile
@@ -1,5 +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
+ python ../../tools/asn2eth.py -X -b -e -p x509af -c x509af.cnf -s packet-x509af-template AuthenticationFramework.asn
cp packet-x509af.* ../../epan/dissectors
diff --git a/asn1/x509ce/Makefile b/asn1/x509ce/Makefile
index ca6ec71f6d..ba4103183c 100755
--- a/asn1/x509ce/Makefile
+++ b/asn1/x509ce/Makefile
@@ -1,5 +1,5 @@
../../epan/dissectors/packet-x509ce.c : ../../tools/asn2eth.py CertificateExtensions.asn packet-x509ce-template.c packet-x509ce-template.h x509ce.cnf ../x509if/x509if-exp.cnf ../x509sat/x509sat-exp.cnf
- python ../../tools/asn2eth.py -X -b -k -e -p x509ce -c x509ce.cnf -s packet-x509ce-template CertificateExtensions.asn
+ python ../../tools/asn2eth.py -X -b -e -p x509ce -c x509ce.cnf -s packet-x509ce-template CertificateExtensions.asn
cp packet-x509ce.* ../../epan/dissectors
diff --git a/asn1/x509if/Makefile b/asn1/x509if/Makefile
index 089f432888..2d354e3586 100755
--- a/asn1/x509if/Makefile
+++ b/asn1/x509if/Makefile
@@ -1,5 +1,5 @@
../../epan/dissectors/packet-x509if.c : ../../tools/asn2eth.py InformationFramework.asn packet-x509if-template.c packet-x509if-template.h x509if.cnf ../x509sat/x509sat-exp.cnf
- python ../../tools/asn2eth.py -X -b -k -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn
+ python ../../tools/asn2eth.py -X -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn
cp packet-x509if.* ../../epan/dissectors
diff --git a/asn1/x509sat/Makefile b/asn1/x509sat/Makefile
index f7d8a4c5ce..805e1535c7 100755
--- a/asn1/x509sat/Makefile
+++ b/asn1/x509sat/Makefile
@@ -1,5 +1,5 @@
../../epan/dissectors/packet-x509sat.c : ../../tools/asn2eth.py SelectedAttributeTypes.asn packet-x509sat-template.c packet-x509sat-template.h x509sat.cnf ../x509if/x509if-exp.cnf
- python ../../tools/asn2eth.py -X -b -k -e -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn
+ python ../../tools/asn2eth.py -X -b -e -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn
cp packet-x509sat.* ../../epan/dissectors
diff --git a/epan/dissectors/packet-pkixtsp.c b/epan/dissectors/packet-pkixtsp.c
index 3bae243e90..84f6338f9e 100644
--- a/epan/dissectors/packet-pkixtsp.c
+++ b/epan/dissectors/packet-pkixtsp.c
@@ -1,7 +1,7 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* ./packet-pkixtsp.c */
-/* ../../tools/asn2eth.py -X -b -k -e -p pkixtsp -c pkixtsp.cnf -s packet-pkixtsp-template PKIXTSP.asn */
+/* ../../tools/asn2eth.py -X -b -e -p pkixtsp -c pkixtsp.cnf -s packet-pkixtsp-template PKIXTSP.asn */
/* Input file: packet-pkixtsp-template.c */
diff --git a/epan/dissectors/packet-pkixtsp.h b/epan/dissectors/packet-pkixtsp.h
index 53164d80a6..31f051536d 100644
--- a/epan/dissectors/packet-pkixtsp.h
+++ b/epan/dissectors/packet-pkixtsp.h
@@ -1,7 +1,7 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* ./packet-pkixtsp.h */
-/* ../../tools/asn2eth.py -X -b -k -e -p pkixtsp -c pkixtsp.cnf -s packet-pkixtsp-template PKIXTSP.asn */
+/* ../../tools/asn2eth.py -X -b -e -p pkixtsp -c pkixtsp.cnf -s packet-pkixtsp-template PKIXTSP.asn */
/* Input file: packet-pkixtsp-template.h */
diff --git a/epan/dissectors/packet-smrse.c b/epan/dissectors/packet-smrse.c
index e73b6657b6..958bebc314 100644
--- a/epan/dissectors/packet-smrse.c
+++ b/epan/dissectors/packet-smrse.c
@@ -1,7 +1,7 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* ./packet-smrse.c */
-/* ../../tools/asn2eth.py -X -b -k -e -p smrse -c smrse.cnf -s packet-smrse-template SMRSE.asn */
+/* ../../tools/asn2eth.py -X -b -e -p smrse -c smrse.cnf -s packet-smrse-template SMRSE.asn */
/* Input file: packet-smrse-template.c */
diff --git a/epan/dissectors/packet-smrse.h b/epan/dissectors/packet-smrse.h
index 83f0aee748..ec532ee987 100644
--- a/epan/dissectors/packet-smrse.h
+++ b/epan/dissectors/packet-smrse.h
@@ -1,7 +1,7 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* ./packet-smrse.h */
-/* ../../tools/asn2eth.py -X -b -k -e -p smrse -c smrse.cnf -s packet-smrse-template SMRSE.asn */
+/* ../../tools/asn2eth.py -X -b -e -p smrse -c smrse.cnf -s packet-smrse-template SMRSE.asn */
/* Input file: packet-smrse-template.h */
diff --git a/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c
index 36e6bd6d06..a58f86c7b5 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 -k -e -p x509af -c x509af.cnf -s packet-x509af-template AuthenticationFramework.asn */
+/* ../../tools/asn2eth.py -X -b -e -p x509af -c x509af.cnf -s packet-x509af-template AuthenticationFramework.asn */
/* Input file: packet-x509af-template.c */
@@ -1211,11 +1211,11 @@ void proto_register_x509af(void) {
"", HFILL }},
{ &hf_x509af_infoSubjectName,
{ "subjectName", "x509af.subjectName",
- FT_UINT32, BASE_DEC, NULL, 0,
+ FT_NONE, BASE_NONE, NULL, 0,
"AttributeCertificateInfo/subject/subjectName", HFILL }},
{ &hf_x509af_issuerName,
{ "issuer", "x509af.issuer",
- FT_UINT32, BASE_DEC, NULL, 0,
+ FT_NONE, BASE_NONE, NULL, 0,
"", HFILL }},
{ &hf_x509af_attCertValidityPeriod,
{ "attCertValidityPeriod", "x509af.attCertValidityPeriod",
diff --git a/epan/dissectors/packet-x509af.h b/epan/dissectors/packet-x509af.h
index 75accdcb06..843e5f2910 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 -k -e -p x509af -c x509af.cnf -s packet-x509af-template AuthenticationFramework.asn */
+/* ../../tools/asn2eth.py -X -b -e -p x509af -c x509af.cnf -s packet-x509af-template AuthenticationFramework.asn */
/* Input file: packet-x509af-template.h */
diff --git a/epan/dissectors/packet-x509ce.c b/epan/dissectors/packet-x509ce.c
index 5555354906..e4ff90f446 100644
--- a/epan/dissectors/packet-x509ce.c
+++ b/epan/dissectors/packet-x509ce.c
@@ -1,7 +1,7 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* ./packet-x509ce.c */
-/* ../../tools/asn2eth.py -X -b -k -e -p x509ce -c x509ce.cnf -s packet-x509ce-template CertificateExtensions.asn */
+/* ../../tools/asn2eth.py -X -b -e -p x509ce -c x509ce.cnf -s packet-x509ce-template CertificateExtensions.asn */
/* Input file: packet-x509ce-template.c */
@@ -1937,7 +1937,7 @@ void proto_register_x509ce(void) {
"DistributionPointName/fullName", HFILL }},
{ &hf_x509ce_nameRelativeToCRLIssuer,
{ "nameRelativeToCRLIssuer", "x509ce.nameRelativeToCRLIssuer",
- FT_UINT32, BASE_DEC, NULL, 0,
+ FT_NONE, BASE_NONE, NULL, 0,
"DistributionPointName/nameRelativeToCRLIssuer", HFILL }},
{ &hf_x509ce_containsUserPublicKeyCerts,
{ "containsUserPublicKeyCerts", "x509ce.containsUserPublicKeyCerts",
diff --git a/epan/dissectors/packet-x509ce.h b/epan/dissectors/packet-x509ce.h
index 3c14590b0c..584bd6cd84 100644
--- a/epan/dissectors/packet-x509ce.h
+++ b/epan/dissectors/packet-x509ce.h
@@ -1,7 +1,7 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* ./packet-x509ce.h */
-/* ../../tools/asn2eth.py -X -b -k -e -p x509ce -c x509ce.cnf -s packet-x509ce-template CertificateExtensions.asn */
+/* ../../tools/asn2eth.py -X -b -e -p x509ce -c x509ce.cnf -s packet-x509ce-template CertificateExtensions.asn */
/* Input file: packet-x509ce-template.h */
diff --git a/epan/dissectors/packet-x509if.c b/epan/dissectors/packet-x509if.c
index 16010d2ddc..d2aba394d9 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 -k -e -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 */
diff --git a/epan/dissectors/packet-x509if.h b/epan/dissectors/packet-x509if.h
index 439997c6e6..a3804ac5bb 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 -k -e -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 */
diff --git a/epan/dissectors/packet-x509sat.c b/epan/dissectors/packet-x509sat.c
index c91dc2fb7e..543c2d49b8 100644
--- a/epan/dissectors/packet-x509sat.c
+++ b/epan/dissectors/packet-x509sat.c
@@ -1,7 +1,7 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* ./packet-x509sat.c */
-/* ../../tools/asn2eth.py -X -b -k -e -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn */
+/* ../../tools/asn2eth.py -X -b -e -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn */
/* Input file: packet-x509sat-template.c */
diff --git a/epan/dissectors/packet-x509sat.h b/epan/dissectors/packet-x509sat.h
index b323633b29..636f78cf37 100644
--- a/epan/dissectors/packet-x509sat.h
+++ b/epan/dissectors/packet-x509sat.h
@@ -1,7 +1,7 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* ./packet-x509sat.h */
-/* ../../tools/asn2eth.py -X -b -k -e -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn */
+/* ../../tools/asn2eth.py -X -b -e -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn */
/* Input file: packet-x509sat-template.h */