7 files changed, 9 insertions, 9 deletions
diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c
index 8d19d74262..0b972e8b8d 100644
--- a/epan/dissectors/packet-cms.c
+++ b/epan/dissectors/packet-cms.c
@@ -1633,7 +1633,7 @@ void proto_register_cms(void) {
         "cms.MessageDigest", HFILL }},
     { &hf_cms_SigningTime_PDU,
       { "SigningTime", "cms.SigningTime",
-        FT_UINT32, BASE_DEC, VALS(x509af_Time_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(cms_Time_vals), 0,
         "cms.SigningTime", HFILL }},
     { &hf_cms_Countersignature_PDU,
       { "Countersignature", "cms.Countersignature",
diff --git a/epan/dissectors/packet-dap.c b/epan/dissectors/packet-dap.c
index bd171acceb..b3773b8366 100644
--- a/epan/dissectors/packet-dap.c
+++ b/epan/dissectors/packet-dap.c
@@ -5298,7 +5298,7 @@ void proto_register_dap(void) {
         "x509if.DistinguishedName", HFILL }},
     { &hf_dap_time,
       { "time", "dap.time",
-        FT_UINT32, BASE_DEC, VALS(x509af_Time_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(dap_Time_vals), 0,
         "dap.Time", HFILL }},
     { &hf_dap_random,
       { "random", "dap.random",
diff --git a/epan/dissectors/packet-dop.c b/epan/dissectors/packet-dop.c
index 33086fa5c5..d988d429a6 100644
--- a/epan/dissectors/packet-dop.c
+++ b/epan/dissectors/packet-dop.c
@@ -2376,7 +2376,7 @@ void proto_register_dop(void) {
         "dop.NULL", HFILL }},
     { &hf_dop_time,
       { "time", "dop.time",
-        FT_UINT32, BASE_DEC, VALS(x509af_Time_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(dop_Time_vals), 0,
         "dop.Time", HFILL }},
     { &hf_dop_validUntil,
       { "validUntil", "dop.validUntil",
@@ -2496,7 +2496,7 @@ void proto_register_dop(void) {
         "dop.TerminateRoleBInitiates", HFILL }},
     { &hf_dop_terminateAtTime,
       { "terminateAt", "dop.terminateAt",
-        FT_UINT32, BASE_DEC, VALS(x509af_Time_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(dop_Time_vals), 0,
         "dop.Time", HFILL }},
     { &hf_dop_unsignedTerminateOperationalBindingArgument,
       { "unsignedTerminateOperationalBindingArgument", "dop.unsignedTerminateOperationalBindingArgument",
@@ -2532,7 +2532,7 @@ void proto_register_dop(void) {
         "dop.T_agreementProposal", HFILL }},
     { &hf_dop_retryAt,
       { "retryAt", "dop.retryAt",
-        FT_UINT32, BASE_DEC, VALS(x509af_Time_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(dop_Time_vals), 0,
         "dop.Time", HFILL }},
     { &hf_dop_rdn,
       { "rdn", "dop.rdn",
diff --git a/epan/dissectors/packet-dsp.c b/epan/dissectors/packet-dsp.c
index 5bc44252ce..ad74afd11e 100644
--- a/epan/dissectors/packet-dsp.c
+++ b/epan/dissectors/packet-dsp.c
@@ -2299,7 +2299,7 @@ void proto_register_dsp(void) {
         "dsp.DomainInfo", HFILL }},
     { &hf_dsp_timeLimit,
       { "timeLimit", "dsp.timeLimit",
-        FT_UINT32, BASE_DEC, VALS(x509af_Time_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(dsp_Time_vals), 0,
         "dsp.Time", HFILL }},
     { &hf_dsp_entryOnly,
       { "entryOnly", "dsp.entryOnly",
diff --git a/epan/dissectors/packet-ocsp.c b/epan/dissectors/packet-ocsp.c
index 5ac6d657d4..bfb13db312 100644
--- a/epan/dissectors/packet-ocsp.c
+++ b/epan/dissectors/packet-ocsp.c
@@ -752,7 +752,7 @@ void proto_register_ocsp(void) {
         "ocsp.Signature", HFILL }},
     { &hf_ocsp_version,
       { "version", "ocsp.version",
-        FT_INT32, BASE_DEC, VALS(x509af_Version_vals), 0,
+        FT_INT32, BASE_DEC, VALS(pkix1explicit_Version_vals), 0,
         "ocsp.Version", HFILL }},
     { &hf_ocsp_requestorName,
       { "requestorName", "ocsp.requestorName",
diff --git a/epan/dissectors/packet-pkcs1.c b/epan/dissectors/packet-pkcs1.c
index 687db8bb5f..82ed6dca48 100644
--- a/epan/dissectors/packet-pkcs1.c
+++ b/epan/dissectors/packet-pkcs1.c
@@ -198,7 +198,7 @@ void proto_register_pkcs1(void) {
         "pkcs1.INTEGER", HFILL }},
     { &hf_pkcs1_version,
       { "version", "pkcs1.version",
-        FT_INT32, BASE_DEC, VALS(x509af_Version_vals), 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "pkcs1.Version", HFILL }},
     { &hf_pkcs1_privateExponent,
       { "privateExponent", "pkcs1.privateExponent",
diff --git a/epan/dissectors/packet-pkcs12.c b/epan/dissectors/packet-pkcs12.c
index 8d537ffede..5ba511390b 100644
--- a/epan/dissectors/packet-pkcs12.c
+++ b/epan/dissectors/packet-pkcs12.c
@@ -1350,7 +1350,7 @@ void proto_register_pkcs12(void) {
         "pkcs12.T_attrValues_item", HFILL }},
     { &hf_pkcs12_privateKeyVersion,
       { "version", "pkcs12.version",
-        FT_INT32, BASE_DEC, VALS(x509af_Version_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(pkcs12_Version_vals), 0,
         "pkcs12.Version", HFILL }},
     { &hf_pkcs12_privateKeyAlgorithm,
       { "privateKeyAlgorithm", "pkcs12.privateKeyAlgorithm",