PKCS12: Remove from ASN1 DIRTY list

Change-Id: I454c48d5342ebe5682217667e4cafd6164e58d41
Reviewed-on: https://code.wireshark.org/review/9004
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>

diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index fec0cf3a2d24e7574a4bfa7b0664dd83527e070d..07c177511ff129900c0045bb61c81758eea89a76 100644 (file)
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -257,6 +257,7 @@ set(ASN1_DISSECTOR_SRC
        dissectors/packet-p772.c
        dissectors/packet-pcap.c
        dissectors/packet-pkcs1.c
+       dissectors/packet-pkcs12.c
        dissectors/packet-pkinit.c
        dissectors/packet-pkix1explicit.c
        dissectors/packet-pkix1implicit.c
@@ -297,7 +298,6 @@ set(ASN1_DISSECTOR_SRC
 
 set(DIRTY_ASN1_DISSECTOR_SRC
        dissectors/packet-p1.c
-       dissectors/packet-pkcs12.c
        dissectors/packet-snmp.c
        dissectors/packet-tcap.c
 )

diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common
index 91bf816797434f76c292357b6d4bc9d84cff5955..1a0dec461be51c1327c4d75551ac037c6c2561d6 100644 (file)
--- a/epan/dissectors/Makefile.common
+++ b/epan/dissectors/Makefile.common
@@ -158,6 +158,7 @@ ASN1_DISSECTOR_SRC = \
        packet-p772.c   \
        packet-pcap.c   \
        packet-pkcs1.c  \
+       packet-pkcs12.c \
        packet-pkinit.c \
        packet-pkix1explicit.c  \
        packet-pkix1implicit.c  \
@@ -207,7 +208,6 @@ CORBA_IDL_DISSECTOR_SRC =
 #
 DIRTY_ASN1_DISSECTOR_SRC = \
        packet-p1.c     \
-       packet-pkcs12.c \
        packet-snmp.c   \
        packet-tcap.c   \
        $(CUSTOM_DIRTY_ASN1_DISSECTOR_SRC)