Move /asn1 to /epan/dissectors

Change-Id: I1208fe3c2ba428995526f561e8f792b8d871e9a9
Reviewed-on: https://code.wireshark.org/review/14388
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: João Valverde <j@v6e.pt>

9 files changed, 0 insertions, 1180 deletions

diff --git a/asn1/acp133/CMakeLists.txt b/asn1/acp133/CMakeLists.txt
deleted file mode 100644
index 8d5a5fe48b..0000000000
--- a/asn1/acp133/CMakeLists.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-# CMakeLists.txt
-#
-# Wireshark - Network traffic analyzer
-# By Gerald Combs <gerald@wireshark.org>
-# Copyright 1998 Gerald Combs
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-set( PROTOCOL_NAME acp133 )
-
-set( PROTO_OPT )
-
-set( EXT_ASN_FILE_LIST
-)
-
-set( ASN_FILE_LIST
-	${PROTOCOL_NAME}.asn
-	MHSDirectoryObjectsAndAttributes.asn
-)
-
-set( EXTRA_DIST
-	${ASN_FILE_LIST}
-	packet-${PROTOCOL_NAME}-template.c
-	packet-${PROTOCOL_NAME}-template.h
-	${PROTOCOL_NAME}.cnf
-)
-
-set( SRC_FILES
-	${EXTRA_DIST}
-	${EXT_ASN_FILE_LIST}
-)
-
-set( A2W_FLAGS -b )
-
-set( EXTRA_CNF
-	"${CMAKE_CURRENT_BINARY_DIR}/../p1/p1-exp.cnf"
-	"${CMAKE_CURRENT_BINARY_DIR}/../x509af/x509af-exp.cnf"
-	"${CMAKE_CURRENT_BINARY_DIR}/../x509ce/x509ce-exp.cnf"
-	"${CMAKE_CURRENT_BINARY_DIR}/../x509if/x509if-exp.cnf"
-	"${CMAKE_CURRENT_BINARY_DIR}/../x509sat/x509sat-exp.cnf"
-)
-
-ASN2WRS()
-
diff --git a/asn1/acp133/MHSDirectoryObjectsAndAttributes.asn b/asn1/acp133/MHSDirectoryObjectsAndAttributes.asn
deleted file mode 100644
index 4bf0e5ebbb..0000000000
--- a/asn1/acp133/MHSDirectoryObjectsAndAttributes.asn
+++ /dev/null
@@ -1,433 +0,0 @@
--- http://www.itu.int/ITU-T/asn1/database/itu-t/x/x402/1999/index.html
--- Module MHSDirectoryObjectsAndAttributes (X.402:06/1999)
-MHSDirectoryObjectsAndAttributes {joint-iso-itu-t mhs(6) arch(5) modules(0)
-  directory(1) version-1999(1)} DEFINITIONS IMPLICIT TAGS ::=
-BEGIN
-
--- Prologue
--- Exports everything.
-IMPORTS
-  -- MHS Object Identifiers
-  id-at-mhs-acceptable-eits, id-at-mhs-deliverable-classes,
-    id-at-mhs-deliverable-content-types, id-at-mhs-dl-archive-service,
-    id-at-mhs-dl-members, id-at-mhs-dl-policy, id-at-mhs-dl-related-lists,
-    id-at-mhs-dl-submit-permissions, id-at-mhs-dl-subscription-service,
-    id-at-mhs-exclusively-acceptable-eits, id-at-mhs-maximum-content-length,
-    id-at-mhs-message-store-dn, id-at-mhs-or-addresses,
-    id-at-mhs-or-addresses-with-capabilities, id-at-mhs-supported-attributes,
-    id-at-mhs-supported-automatic-actions, id-at-mhs-supported-content-types,
-    id-at-mhs-supported-matching-rules, id-at-mhs-unacceptable-eits,
-    id-con-dl-administrator-annotation, id-con-dl-nested-dl,
-    id-con-dl-reset-originator, id-mr-address-capabilities-match,
-    id-mr-capability-match, id-mr-orname-exact-match,
-    id-oc-mhs-distribution-list, id-oc-mhs-message-store,
-    id-oc-mhs-message-transfer-agent, id-oc-mhs-user, id-oc-mhs-user-agent,
-    id-san-mta-name
-    --==
-    FROM MHSObjectIdentifiers {joint-iso-itu-t mhs(6) arch(5) modules(0)
-      object-identifiers(0) version-1999(1)}
-  -- MTS Abstract Service
-  ContentLength, EncodedInformationTypesConstraints, ExtendedContentType,
-    ExtendedEncodedInformationType, GlobalDomainIdentifier, MTAName, 
-    ORAddress, ORName, RequestedDeliveryMethod, SecurityContext
-    --==
-    FROM MTSAbstractService {joint-iso-itu-t mhs(6) mts(3) modules(0)
-      mts-abstract-service(1) version-1999(1)}
-  -- MS Abstract Service
-  AUTO-ACTION
-    --==
-    FROM MSAbstractService {joint-iso-itu-t mhs(6) ms(4) modules(0)
-      abstract-service(1) version-1999(1)}
-  -- MS General Attribute Types
-  X413ATTRIBUTE, AttributeTable
-    --==
-    FROM MSGeneralAttributeTypes {joint-iso-itu-t mhs(6) ms(4) modules(0)
-      general-attribute-types(2) version-1999(1)}
-  -- MS General Auto Action Types
-  AutoActionTable
-    --==
-    FROM MSGeneralAutoActionTypes {joint-iso-itu-t mhs(6) ms(4) modules(0)
-      general-auto-action-types(3) version-1994(0)}
-  -- MS Matching Rules
-  MatchingRuleTable, oRAddressMatch, oRAddressElementsMatch,
-    oRAddressSubstringElementsMatch, oRNameMatch, oRNameElementsMatch,
-    oRNameSingleElementMatch, oRNameSubstringElementsMatch
-    --==
-    FROM MSMatchingRules {joint-iso-itu-t mhs(6) ms(4) modules(0)
-      general-matching-rules(5) version-1999(1)}
-  -- Information Framework
-  ATTRIBUTE, CONTEXT, distinguishedNameMatch, DIT-CONTEXT-USE-RULE,
-    objectIdentifierMatch, MATCHING-RULE, Name, OBJECT-CLASS, top
-    --==
-    FROM InformationFramework {joint-iso-itu-t ds(5) module(1)
-      informationFramework(1) 3}
-  -- Selected Object Classes
-  applicationEntity
-    --==
-    FROM SelectedObjectClasses {joint-iso-itu-t ds(5) module(1)
-      selectedObjectClasses(6) 3}
-  -- Selected Attribute Types
-  commonName, description, distinguishedName, integerMatch, organizationName,
-    organizationalUnitName, owner, protocolInformation, seeAlso
-    --==
-    FROM SelectedAttributeTypes {joint-iso-itu-t ds(5) module(1)
-      selectedAttributeTypes(5) 3}
-  -- Authentication Framework
-  AlgorithmIdentifier
-    --==
-    FROM AuthenticationFramework {joint-iso-itu-t ds(5) module(1)
-      authenticationFramework(7) 3}
-  -- Certificate Extensions
-  CertificateAssertion, OTHER-NAME
-    --==
-    FROM CertificateExtensions {joint-iso-itu-t ds(5) module(1)
-      certificateExtensions(26) 0};
-
--- OBJECT CLASSES
--- MHS Distribution List
-mhs-distribution-list OBJECT-CLASS ::= {
-  SUBCLASS OF   {top}
-  MUST CONTAIN  {commonName | mhs-dl-submit-permissions | mhs-or-addresses}
-  MAY CONTAIN
-    {description | organizationName | organizationalUnitName | owner | seeAlso
-      | mhs-maximum-content-length | mhs-deliverable-content-types |
-      mhs-acceptable-eits | mhs-exclusively-acceptable-eits |
-      mhs-unacceptable-eits | mhs-dl-policy | mhs-dl-subscription-service |
-      mhs-dl-archive-service | mhs-dl-related-lists | mhs-dl-members}
-  ID            id-oc-mhs-distribution-list
-}
-
--- MHS Message Store
-mhs-message-store OBJECT-CLASS ::= {
-  SUBCLASS OF  {applicationEntity}
-  MAY CONTAIN
-    {owner | mhs-supported-attributes | mhs-supported-automatic-actions |
-      mhs-supported-matching-rules | mhs-supported-content-types |
-      protocolInformation}
-  ID           id-oc-mhs-message-store
-}
-
--- MHS Message Transfer Agent
-mhs-message-transfer-agent OBJECT-CLASS ::= {
-  SUBCLASS OF  {applicationEntity}
-  MAY CONTAIN  {owner | mhs-maximum-content-length | protocolInformation}
-  ID           id-oc-mhs-message-transfer-agent
-}
-
--- MHS User
-mhs-user OBJECT-CLASS ::= {
-  SUBCLASS OF   {top}
-  KIND          auxiliary
-  MUST CONTAIN  {mhs-or-addresses}
-  MAY CONTAIN
-    {mhs-maximum-content-length | mhs-deliverable-content-types |
-      mhs-acceptable-eits | mhs-exclusively-acceptable-eits |
-      mhs-unacceptable-eits | mhs-or-addresses-with-capabilities |
-      mhs-message-store-dn}
-  ID            id-oc-mhs-user
-}
-
--- MHS User Agent
-mhs-user-agent OBJECT-CLASS ::= {
-  SUBCLASS OF  {applicationEntity}
-  MAY CONTAIN
-    {owner | mhs-maximum-content-length | mhs-deliverable-content-types |
-      mhs-acceptable-eits | mhs-exclusively-acceptable-eits |
-      mhs-unacceptable-eits | mhs-deliverable-classes | mhs-or-addresses |
-      protocolInformation}
-  ID           id-oc-mhs-user-agent
-}
-
--- ATTRIBUTES
--- MHS Acceptable EITs
-mhs-acceptable-eits ATTRIBUTE ::= {
-  WITH SYNTAX             ExtendedEncodedInformationType
-  EQUALITY MATCHING RULE  objectIdentifierMatch
-  ID                      id-at-mhs-acceptable-eits
-}
-
--- MHS Deliverable Classes
-mhs-deliverable-classes ATTRIBUTE ::= {
-  WITH SYNTAX             Capability
-  EQUALITY MATCHING RULE  capabilityMatch
-  ID                      id-at-mhs-deliverable-classes
-}
-
--- MHS Deliverable Content Types
-mhs-deliverable-content-types ATTRIBUTE ::= {
-  WITH SYNTAX             ExtendedContentType
-  EQUALITY MATCHING RULE  objectIdentifierMatch
-  ID                      id-at-mhs-deliverable-content-types
-}
-
--- MHS DL Archive Service
-mhs-dl-archive-service ATTRIBUTE ::= {
-  WITH SYNTAX             ORName
-  EQUALITY MATCHING RULE  oRNameExactMatch
-  -- EXTENSIBLE MATCHING RULE	{ oRNameMatch | oRNameElementsMatch |
-  --				oRNameSubstringElementsMatch | oRNameSingleElementMatch }
-  ID                      id-at-mhs-dl-archive-service
-}
-
--- MHS DL Members
-mhs-dl-members ATTRIBUTE ::= {
-  WITH SYNTAX             ORName
-  EQUALITY MATCHING RULE  oRNameExactMatch
-  -- EXTENSIBLE MATCHING RULE	{ oRNameMatch | oRNameElementsMatch |
-  --				oRNameSubstringElementsMatch | oRNameSingleElementMatch }
-  ID                      id-at-mhs-dl-members
-}
-
--- MHS DL Policy
-mhs-dl-policy ATTRIBUTE ::= {
-  WITH SYNTAX   DLPolicy
-  SINGLE VALUE  TRUE
-  ID            id-at-mhs-dl-policy
-}
-
--- MHS DL Related Lists
-mhs-dl-related-lists ATTRIBUTE ::= {
-  SUBTYPE OF              distinguishedName
-  EQUALITY MATCHING RULE  distinguishedNameMatch
-  ID                      id-at-mhs-dl-related-lists
-}
-
--- MHS DL Submit Permissions
-mhs-dl-submit-permissions ATTRIBUTE ::= {
-  WITH SYNTAX  DLSubmitPermission
-  ID           id-at-mhs-dl-submit-permissions
-}
-
--- MHS DL Subscription Service
-mhs-dl-subscription-service ATTRIBUTE ::= {
-  WITH SYNTAX             ORName
-  EQUALITY MATCHING RULE  oRNameExactMatch
-  -- EXTENSIBLE MATCHING RULE	{ oRNameMatch | oRNameElementsMatch |
-  --				oRNameSubstringElementsMatch | oRNameSingleElementMatch }
-  ID                      id-at-mhs-dl-subscription-service
-}
-
--- MHS Exclusively Acceptable EITs
-mhs-exclusively-acceptable-eits ATTRIBUTE ::= {
-  WITH SYNTAX             ExtendedEncodedInformationType
-  EQUALITY MATCHING RULE  objectIdentifierMatch
-  ID                      id-at-mhs-exclusively-acceptable-eits
-}
-
--- MHS Maximum Content Length
-mhs-maximum-content-length ATTRIBUTE ::= {
-  WITH SYNTAX             ContentLength
-  EQUALITY MATCHING RULE  integerMatch
-  SINGLE VALUE            TRUE
-  ID                      id-at-mhs-maximum-content-length
-}
-
--- MHS Message Store Directory Name
-mhs-message-store-dn ATTRIBUTE ::= {
-  SUBTYPE OF              distinguishedName
-  EQUALITY MATCHING RULE  distinguishedNameMatch
-  SINGLE VALUE            TRUE
-  ID                      id-at-mhs-message-store-dn
-}
-
--- MHS OR-Addresses
-mhs-or-addresses ATTRIBUTE ::= {
-  WITH SYNTAX             ORAddress
-  EQUALITY MATCHING RULE  oRAddressMatch
-  -- EXTENSIBLE MATCHING RULE	{ oRAddressElementsMatch | oRNameSingleElementMatch |
-  --				oRAddressSubstringElementsMatch } 
-  ID                      id-at-mhs-or-addresses
-}
-
--- MHS OR-Addresses with Capabilities
-mhs-or-addresses-with-capabilities ATTRIBUTE ::= {
-  WITH SYNTAX             AddressCapabilities
-  EQUALITY MATCHING RULE  addressCapabilitiesMatch
-  ID                      id-at-mhs-or-addresses-with-capabilities
-}
-
--- MHS Supported Attributes
-mhs-supported-attributes ATTRIBUTE ::= {
-  WITH SYNTAX             X413ATTRIBUTE.&id({AttributeTable})
-  EQUALITY MATCHING RULE  objectIdentifierMatch
-  ID                      id-at-mhs-supported-attributes
-}
-
--- MHS Supported Automatic Actions
-mhs-supported-automatic-actions ATTRIBUTE ::= {
-  WITH SYNTAX             AUTO-ACTION.&id({AutoActionTable})
-  EQUALITY MATCHING RULE  objectIdentifierMatch
-  ID                      id-at-mhs-supported-automatic-actions
-}
-
--- MHS Supported Content Types
-mhs-supported-content-types ATTRIBUTE ::= {
-  WITH SYNTAX             ExtendedContentType
-  EQUALITY MATCHING RULE  objectIdentifierMatch
-  ID                      id-at-mhs-supported-content-types
-}
-
--- MHS Supported Matching Rules
-mhs-supported-matching-rules ATTRIBUTE ::= {
-  WITH SYNTAX             MATCHING-RULE.&id({MatchingRuleTable})
-  EQUALITY MATCHING RULE  objectIdentifierMatch
-  ID                      id-at-mhs-supported-matching-rules
-}
-
--- MHS Unacceptable EITs
-mhs-unacceptable-eits ATTRIBUTE ::= {
-  WITH SYNTAX             ExtendedEncodedInformationType
-  EQUALITY MATCHING RULE  objectIdentifierMatch
-  ID                      id-at-mhs-unacceptable-eits
-}
-
--- ATTRIBUTE SYNTAXES
--- DL Submit Permission
-DLSubmitPermission ::= CHOICE {
-  individual       [0]  ORName,
-  member-of-dl     [1]  ORName,
-  pattern-match    [2]  ORNamePattern,
-  member-of-group  [3]  Name
-}
-
-ORNamePattern ::= ORName
-
---any-user-may-submit DLSubmitPermission ::=
---  pattern-match:{built-in-standard-attributes {}}
-
--- DL Policy
-DLPolicy ::= SET {
-  report-propagation
-    [0]  INTEGER {previous-dl-or-originator(0), dl-owner(1),
-                  both-previous-and-owner(2)} DEFAULT previous-dl-or-originator,
-  report-from-dl
-    [1]  INTEGER {whenever-requested(0), when-no-propagation(1)}
-      DEFAULT whenever-requested,
-  originating-MTA-report
-    [2]  INTEGER {unchanged(0), report(2), non-delivery-report(3),
-                  audited-report(4)} DEFAULT unchanged,
-  originator-report
-    [3]  INTEGER {unchanged(0), no-report(1), report(2), non-delivery-report(3)}
-      DEFAULT unchanged,
-  return-of-content
-    [4]  ENUMERATED {unchanged(0), content-return-not-requested(1),
-                     content-return-requested(2)} DEFAULT unchanged,
-  priority
-    [5]  INTEGER {unchanged(0), normal(1), non-urgent(2), urgent(3)}
-      DEFAULT unchanged,
-  disclosure-of-other-recipients
-    [6]  ENUMERATED {unchanged(0),
-                     disclosure-of-other-recipients-prohibited(1),
-                     disclosure-of-other-recipients-allowed(2)}
-      DEFAULT unchanged,
-  implicit-conversion-prohibited
-    [7]  ENUMERATED {unchanged(0), implicit-conversion-allowed(1),
-                     implicit-conversion-prohibited(2)} DEFAULT unchanged,
-  conversion-with-loss-prohibited
-    [8]  ENUMERATED {unchanged(0), conversion-with-loss-allowed(1),
-                     conversion-with-loss-prohibited(2)} DEFAULT unchanged,
-  further-dl-expansion-allowed                      [9]  BOOLEAN DEFAULT TRUE,
-  originator-requested-alternate-recipient-removed  [10]  BOOLEAN DEFAULT TRUE,
-  proof-of-delivery
-    [11]  INTEGER {dl-expansion-point(0), dl-members(1), both(2), neither(3)}
-      DEFAULT dl-members,
-  requested-delivery-method
-    [12]  CHOICE {unchanged  [0]  NULL,
-                  removed    [1]  NULL,
-                  replaced   RequestedDeliveryMethod} DEFAULT unchanged:NULL,
-  token-encryption-algorithm-preference
-    [13]  SEQUENCE OF AlgorithmInformation OPTIONAL,
-  token-signature-algorithm-preference
-    [14]  SEQUENCE OF AlgorithmInformation OPTIONAL,
-  ...
-}
-
-AlgorithmInformation ::= SEQUENCE {
-  algorithm-identifier             [0]  AlgorithmIdentifier,
-  originator-certificate-selector  [1]  CertificateAssertion OPTIONAL,
-  recipient-certificate-selector   [2]  CertificateAssertion OPTIONAL
-}
-
--- OR-Address with Capabilities
-AddressCapabilities ::= SEQUENCE {
-  description   GeneralString OPTIONAL,
-  address       ORAddress,
-  capabilities  SET OF Capability
-}
-
-Capability ::= SET {
-  content-types
-    [0]  SET OF ExtendedContentType OPTIONAL,
-  maximum-content-length                 [1]  ContentLength OPTIONAL,
-  encoded-information-types-constraints
-    [2]  EncodedInformationTypesConstraints OPTIONAL,
-  security-labels                        [3]  SecurityContext OPTIONAL,
-  ...
-}
-
--- MATCHING RULES
--- OR-Address with Capabilities Match
-addressCapabilitiesMatch MATCHING-RULE ::= {
-  SYNTAX  AddressCapabilities
-  ID      id-mr-address-capabilities-match
-}
-
--- Capability Match
-capabilityMatch MATCHING-RULE ::= {
-  SYNTAX  Capability
-  ID      id-mr-capability-match
-}
-
--- OR-Name Exact Match
-oRNameExactMatch MATCHING-RULE ::= {
-  SYNTAX  ORName
-  ID      id-mr-orname-exact-match
-}
-
--- CONTEXTS
--- DL Administrator Annotation
-dl-administrator-annotation CONTEXT ::= {
-  WITH SYNTAX
-    CHOICE {bmpstring        BMPString,
-            universalstring  UniversalString}
-  ID           id-con-dl-administrator-annotation
-}
-
-dl-administrator-annotation-use-rule DIT-CONTEXT-USE-RULE ::= {
-  ATTRIBUTE TYPE     mhs-dl-members.&id
-  OPTIONAL CONTEXTS  {dl-administrator-annotation}
-}
-
--- DL Nested DL
-dl-nested-dl CONTEXT ::= {WITH SYNTAX  NULL
-                          ID           id-con-dl-nested-dl
-}
-
-dl-nested-dl-use-rule DIT-CONTEXT-USE-RULE ::= {
-  ATTRIBUTE TYPE     mhs-dl-members.&id
-  OPTIONAL CONTEXTS  {dl-nested-dl}
-}
-
--- DL Reset Originator
-dl-reset-originator CONTEXT ::= {
-  WITH SYNTAX  NULL
-  ID           id-con-dl-reset-originator
-}
-
-dl-reset-originator-use-rule DIT-CONTEXT-USE-RULE ::= {
-  ATTRIBUTE TYPE     mhs-dl-members.&id
-  OPTIONAL CONTEXTS  {dl-reset-originator}
-}
-
--- CERTIFICATE SUBJECT ALTERNATIVE NAMES
--- MTA Name
-mta-name OTHER-NAME ::= {
-  SEQUENCE {domain    GlobalDomainIdentifier,
-            mta-name  MTAName}
-  IDENTIFIED BY  id-san-mta-name
-}
-
-END -- of MHSDirectory
-
--- Generated by Asnp, the ASN.1 pretty-printer of France Telecom R&D
-
diff --git a/asn1/acp133/Makefile.am b/asn1/acp133/Makefile.am
deleted file mode 100644
index 72d28e600b..0000000000
--- a/asn1/acp133/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-# Wireshark - Network traffic analyzer
-# By Gerald Combs <gerald@wireshark.org>
-# Copyright 1998 Gerald Combs
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-
-include ../Makefile.preinc
-include Makefile.common
-include ../Makefile.inc
-
diff --git a/asn1/acp133/Makefile.common b/asn1/acp133/Makefile.common
deleted file mode 100644
index b715a65cfe..0000000000
--- a/asn1/acp133/Makefile.common
+++ /dev/null
@@ -1,64 +0,0 @@
-# Wireshark - Network traffic analyzer
-# By Gerald Combs <gerald@wireshark.org>
-# Copyright 1998 Gerald Combs
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-
-PROTOCOL_NAME=acp133
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
-	$(PROTOCOL_NAME).asn \
-	MHSDirectoryObjectsAndAttributes.asn
-
-# The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn
-# files do not exist for all protocols: Please add/remove as required.
-EXTRA_DIST = \
-	$(EXTRA_DIST_COMMON) \
-	$(ASN_FILE_LIST) \
-	packet-$(PROTOCOL_NAME)-template.c \
-	packet-$(PROTOCOL_NAME)-template.h \
-	$(PROTOCOL_NAME).cnf
-
-SRC_FILES = \
-	$(EXTRA_DIST) \
-	$(EXT_ASN_FILE_LIST)
-
-A2W_FLAGS= -b
-
-EXTRA_CNF= \
-	$(builddir)/../p1/p1-exp.cnf \
-	$(builddir)/../x509af/x509af-exp.cnf \
-	$(builddir)/../x509ce/x509ce-exp.cnf \
-	$(builddir)/../x509if/x509if-exp.cnf \
-	$(builddir)/../x509sat/x509sat-exp.cnf
-
-$(builddir)/../p1/p1-exp.cnf:
-	(cd $(builddir)/../p1 && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../x509af/x509af-exp.cnf:
-	(cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../x509ce/x509ce-exp.cnf:
-	(cd $(builddir)/../x509ce && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../x509if/x509if-exp.cnf:
-	(cd $(builddir)/../x509if && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../x509sat/x509sat-exp.cnf:
-	(cd $(builddir)/../x509sat && $(MAKE_CNF_EXPORT))
-
diff --git a/asn1/acp133/Makefile.nmake b/asn1/acp133/Makefile.nmake
deleted file mode 100644
index fc70f2382f..0000000000
--- a/asn1/acp133/Makefile.nmake
+++ /dev/null
@@ -1,26 +0,0 @@
-## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
-#
-# Wireshark - Network traffic analyzer
-# By Gerald Combs <gerald@wireshark.org>
-# Copyright 1998 Gerald Combs
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-
-include ../../config.nmake
-include ../Makefile.preinc.nmake
-include Makefile.common
-include ../Makefile.inc.nmake
-
diff --git a/asn1/acp133/acp133.asn b/asn1/acp133/acp133.asn
deleted file mode 100644
index 8c752357e9..0000000000
--- a/asn1/acp133/acp133.asn
+++ /dev/null
@@ -1,135 +0,0 @@
-ACP133CommonContent { joint-iso-ccitt(2) country(16) us(840) organization(1) gov(101) dod(2) ds(2) module(0) commonContent(2) editionB (3) }
-DEFINITIONS ::=
-BEGIN
-IMPORTS
-  GeneralNames, CertificateAssertion
-    FROM CertificateExtensions {joint-iso-ccitt ds(5)
-               module(1) certificateExtensions(26) 0}
-  AlgorithmIdentifier
-    --==
-    FROM AuthenticationFramework {joint-iso-itu-t ds(5) module(1)
-      authenticationFramework(7) 3}
-  ContentLength, EncodedInformationTypesConstraints, ExtendedContentType,
-    ORAddress, ORName, RequestedDeliveryMethod, SecurityContext
-    --==
-    FROM MTSAbstractService {joint-iso-itu-t mhs(6) mts(3) modules(0)
-      mts-abstract-service(1) version-1999(1)}
-    DirectoryString
-    --==
-    FROM SelectedAttributeTypes {joint-iso-itu-t ds(5) module(1)
-      selectedAttributeTypes(5) 4}
-    Name
-    --==
-    FROM InformationFramework {joint-iso-itu-t ds(5) module(1)
-      informationFramework(1) 3};
-
-
-
-ACPPreferredDelivery ::= ENUMERATED { smtp(0), acp127(1), mhs(2) }
-
-ALType ::= INTEGER { aig(0), type(1), cad(2), taskforce(3), dag(4) }
-
-Community ::= ENUMERATED { genser(0), si(1), both(2) }
-
-OnSupported ::= BIT STRING { acp127-nn(0), acp127-pn(1), acp127-tn(2) }
-
-ACPLegacyFormat ::= INTEGER {
-	janap128(0),
-	acp127(1), -- changed from acp126 for consistency purposes
-	doi103(2),
-	doi103-special(3),
-	acp127(4),
-	acp127-converted(5),
-	reserved-1(6), -- hold for ACP127Standard if needed
-	acp127-state(7),
-	acp127-modified(8),
-	socomm-special(9),
-	socomm-narrative(10),
-	reserved-2(11), -- hold for SOCOMMNarrativeTTY if needed
-	socomm-narrative-special(12),
-	socomm-data(13),
-	socomm-internal(14),
-	socomm-external(15),
-	mfi-default(16),
-	acp-legacy-format-smtp(17),
-	p22(18),
-	-- 19 - 31 for national or bilateral use
-	acp145-united-states(32),
-	acp145-australia(33),
-	acp145-canada(34),
-	acp145-united-kingdom(35),
-	acp145-new-zealand(36) }
-
-ACPNoAttachments ::= BOOLEAN
-
-Active ::= BOOLEAN
-
-Addressees ::= SEQUENCE OF PrintableString (SIZE (1..55))
-
-Classification ::= ENUMERATED { unmarked(0), unclassified(1), restricted(2),
-confidential(3), secret(4), top-secret(5) }
-
-DistributionCode ::= PrintableString
-
-EmConCapability ::= BOOLEAN
-
-EmConState ::= ENUMERATED { enabled(0), receive-only(1), electronic-silence(2), disabled(3) }
-
-JPEG ::= OCTET STRING -- a JPEG image
-
-MaxMessageSize ::= INTEGER
-
-MonthlyUKMs ::= --SIGNED { SEQUENCE OF UKMEntry }-- SEQUENCE {
-  ukm-entries			SEQUENCE OF UKMEntry,
-  algorithm-identifier		AlgorithmIdentifier,
-  encrypted			BIT STRING
-}
-
-MsgProtocolInfoCapability ::= ENUMERATED { acp-127(0), acp-123(1) }
-
-Remarks ::= SEQUENCE OF PrintableString
-
--- RIParameters used to be defined as a ASN.1 SET specification, but
--- this has been deprecated in edition D in favour of a DirectoryString
--- containing a sequence of dollar separated PrintableStrings.
---
--- Implemented in Wireshark as a CHOICE to be able to decode both without
--- using a preference.
-RIParameters ::= CHOICE {
-	ri-parameters             DirectoryString,
-	ri-parameters-deprecated  RIParametersDeprecated
-}
-
-RIParametersDeprecated ::= SET {
-	rI 		[0] PrintableString,
-	rIType 		[1] ENUMERATED 
-	{ normal(0), off-line(1), partTimeTerminal(2) },
-	minimize 	[2] BOOLEAN, -- not used any more --
-	sHD 		[3] PrintableString,
-	classification 	[4] Classification
-}
-
-UKMEntry ::= SEQUENCE {
-	tag PairwiseTag,
-	ukm OCTET STRING
-}
-
-WebAccessCapability ::= BOOLEAN
-
--- these are imported directly from SDN.701
-
-PairwiseTag  			::= SEQUENCE  {
-	kmid		Kmid,
-	edition		INTEGER --(1..ub-edition-size)--,
-	date		UTCTime OPTIONAL }
-
-Kmid 			::=  OCTET STRING
-
-MLReceiptPolicy		::=  CHOICE  {
-     none		[0] NULL,
-     insteadOf		[1] SEQUENCE -- (SIZE (1..ub-insteadOf))
-						OF GeneralNames,
-     inAdditionTo	[2] SEQUENCE --(SIZE (1..ub-inAdditionTo))
-						OF GeneralNames }
-
-END
diff --git a/asn1/acp133/acp133.cnf b/asn1/acp133/acp133.cnf
deleted file mode 100644
index 194a10df4d..0000000000
--- a/asn1/acp133/acp133.cnf
+++ /dev/null
@@ -1,236 +0,0 @@
-# acp133.cnf
-# ACP133 conformation file
-
-#.IMPORT ../p1/p1-exp.cnf
-#.IMPORT ../x509af/x509af-exp.cnf
-#.IMPORT ../x509ce/x509ce-exp.cnf
-#.IMPORT ../x509if/x509if-exp.cnf
-#.IMPORT ../x509sat/x509sat-exp.cnf
-
-#.PDU
-ACPPreferredDelivery
-ALType
-Community
-OnSupported
-ACPLegacyFormat
-Addressees
-DistributionCode
-JPEG
-MonthlyUKMs
-RIParameters
-Kmid
-
-##.CLASS OBJECT-CLASS
-#&Superclasses         ClassReference OBJECT-CLASS
-#&kind
-#&MandatoryAttributes  ClassReference ATTRIBUTE
-#&OptionalAttributes   ClassReference ATTRIBUTE
-#&id                   ObjectIdentifierType
-##.END
-
-##.CLASS ATTRIBUTE
-#&derivation            ClassReference ATTRIBUTE
-#&Type
-#&equality-match        ClassReference MATCHING-RULE
-#&ordering-match        ClassReference MATCHING-RULE
-#&substrings-match      ClassReference MATCHING-RULE
-#&single-valued         BooleanType
-#&collective            BooleanType
-#&no-user-modification  BooleanType
-#&usage
-#&id                    ObjectIdentifierType
-##.END
-
-#.CLASS MATCHING-RULE
-&ParentMatchingRules   ClassReference MATCHING-RULE
-&AssertionType
-&uniqueMatchIndicator  ClassReference ATTRIBUTE
-&id                    ObjectIdentifierType
-#.END
-
-#.CLASS CONTEXT
-&Type
-&Assertion
-&id         ObjectIdentifierType
-#.END
-
-#.CLASS DIT-CONTEXT-USE-RULE
-&attributeType  ObjectIdentifierType
-&Mandatory      ClassReference CONTEXT
-&Optional       ClassReference CONTEXT
-#.END
-
-#.CLASS OTHER-NAME
-&Type		OpenType
-&id		ObjectIdentifierType
-#.END
-
-#.REGISTER
-
-# X.402
-
-# ContentLength B "2.6.5.2.0" "id-at-mhs-maximum-content-length" - see p1.cnf
-# ExtendedContentType B "2.6.5.2.1" "id-at-mhs-deliverable-content-types" - see p1.cnf
-# ExtendedEncodedInformationType B "2.6.5.2.2" "id-at-mhs-exclusively-acceptable-eits" - see p1.cnf
-# ORName B "2.6.5.2.3" "id-at-mhs-dl-members" - see p1.cnf
-DLSubmitPermission B "2.6.5.2.4" "id-at-mhs-dl-submit-permissions"
-# DistinguishedName B "2.6.5.2.5" "id-at-mhs-message-store-dn" - see x509if.cnf
-# ORAddress B "2.6.5.2.6" "id-at-mhs-or-addresses" - see p1.cnf
-# ObjectIdentifier B "2.6.5.2.8" "id-at-mhs-supported-automatic-actions" - see x509sat.cnf
-# ExtendedContentType B "2.6.5.2.9" "id-at-mhs-supported-content-types" - see p1.cnf
-# ObjectIdentifier B "2.6.5.2.10" "id-at-mhs-supported-attributes" - see x509sat.cnf
-# ObjectIdentifier B "2.6.5.2.11" "id-at-mhs-supported-matching-rules" - see x509sat.cnf
-# ORName B "2.6.5.2.12" "id-at-mhs-dl-archive-service" - see p1.cnf
-DLPolicy  B "2.6.5.2.13" "id-at-mhs-dl-policy"
-# DistinguishedName B "2.6.5.2.14" "id-at-mhs-dl-related-lists" - see x509if.cnf
-# ORName B "2.6.5.2.15" "id-at-mhs-dl-subscription-service" - see p1.cnf
-AddressCapabilities B "2.6.5.2.16" "id-at-mhs-or-addresses-with-capabilities"
-# ExtendedEncodedInformationType B "2.6.5.2.17" "id-at-mhs-acceptable-eits" see p1.cnf
-# ExtendedEncodedInformationType B "2.6.5.2.18" "id-at-mhs-unacceptable-eits" - see p1.cnf
-Capability B "2.6.5.2.19" "id-at-mhs-deliverable-classes"
-
-
-# SDN.701
-Kmid B "2.16.840.1.101.2.1.5.14" "id-at-alid"
-MonthlyUKMs B "2.16.840.1.101.2.1.5.20" "id-at-janUKMs"
-MonthlyUKMs B "2.16.840.1.101.2.1.5.21" "id-at-febUKMs"
-MonthlyUKMs B "2.16.840.1.101.2.1.5.22" "id-at-marUKMs"
-MonthlyUKMs B "2.16.840.1.101.2.1.5.23" "id-at-aprUKMs"
-MonthlyUKMs B "2.16.840.1.101.2.1.5.24" "id-at-mayUKMs"
-MonthlyUKMs B "2.16.840.1.101.2.1.5.25" "id-at-junUKMs"
-MonthlyUKMs B "2.16.840.1.101.2.1.5.26" "id-at-julUKMs"
-MonthlyUKMs B "2.16.840.1.101.2.1.5.27" "id-at-augUKMs"
-MonthlyUKMs B "2.16.840.1.101.2.1.5.28" "id-at-sepUKMs"
-MonthlyUKMs B "2.16.840.1.101.2.1.5.29" "id-at-octUKMs"
-MonthlyUKMs B "2.16.840.1.101.2.1.5.30" "id-at-novUKMs"
-MonthlyUKMs B "2.16.840.1.101.2.1.5.31" "id-at-decUKMs"
-# ORName B "2.16.840.1.101.2.1.5.47" "id-at-aLExemptedAddressProcessor - see p1.cnf
-
-# ACP133
-# DistinguishedName B "2.16.840.1.101.2.2.1.3" "id-at-alternateRecipient" - see x509if.cnf
-# DistinguishedName B "2.16.840.1.101.2.2.1.4" "id-at-associatedOrganization" - see x509if.cnf
-# DistinguishedName B "2.16.840.1.101.2.2.1.6" "id-at-associatedPLA" - see x509if.cnf
-# DirectoryString B "2.16.840.1.101.2.2.1.45" "id-at-releaseAuthorityName" - see x509sat.cnf
-Addressees B "2.16.840.1.101.2.2.1.46" "id-at-actionAddressees"
-Addressees B "2.16.840.1.101.2.2.1.47" "id-at-additionalAddressees"
-Addressees B "2.16.840.1.101.2.2.1.48" "id-at-additionalSecondPartyAddressees"
-# DistinguishedName B "2.16.840.1.101.2.2.1.49" "id-at-aliasPointer" - see x509if.cnf
-Addressees B "2.16.840.1.101.2.2.1.50" "id-at-allowableOriginators"
-#PrintableString B "2.16.840.1.101.2.2.1.51" "id-at-cognizantAuthority" - see x509sat.cnf
-Community B "2.16.840.1.101.2.2.1.52" "id-at-community"
-# PrintableString B "2.16.840.1.101.2.2.1.53" "id-at-accountingCode" - see x509sat.cnf
-# Boolean B "2.16.840.1.101.2.2.1.54" "id-at-dualRoute" - see x509sat.cnf
-# GeneralizedTime B "2.16.840.1.101.2.2.1.55" "id-at-effectiveDate" - see x509sat.cnf
-Classification B "2.16.840.1.101.2.2.1.56" "id-at-entryClassification"
-# GeneralizedTime B "2.16.840.1.101.2.2.1.57" "id-at-expirationDate" - see x509sat.cnf
-# PrintableString B "2.16.840.1.101.2.2.1.58" "id-at-hostOrgACP127" - see x509sat.cnf
-Addressees B "2.16.840.1.101.2.2.1.59" "id-at-infoAddressees"
-# GeneralizedTime B "2.16.840.1.101.2.2.1.60" "id-at-lastRecapDate" - see x509sat.cnf
-# DistinguishedName B "2.16.840.1.101.2.2.1.61" "id-at-listPointer" - see x509if.cnf
-# PrintableString B "2.16.840.1.101.2.2.1.62" "id-at-lmf" - see x509sat.cnf
-# PrintableString B "2.16.840.1.101.2.2.1.63" "id-at-longTitle" - see x509sat.cnf
-# Boolean B "2.16.840.1.101.2.2.1.64" "id-at-minimize" - see x509sat.cnf
-# Boolean B "2.16.840.1.101.2.2.1.65" "id-at-minimizeOverride" - see x509sat.cnf
-Classification B "2.16.840.1.101.2.2.1.67" "id-at-nameClassification"
-# PrintableString B "2.16.840.1.101.2.2.1.68" "id-at-nationality" - see x509sat.cnf
-# PrintableString B "2.16.840.1.101.2.2.1.68.1" "id-at-collectiveNationality" - see x509sat.cnf
-# Boolean B "2.16.840.1.101.2.2.1.69" "id-at-transferStation" - see x509sat.cnf
-# PrintableString B "2.16.840.1.101.2.2.1.70" "id-at-plaNameACP127" - see x509sat.cnf
-Addressees B "2.16.840.1.101.2.2.1.71" "id-at-plaAddressees"
-# Boolean B "2.16.840.1.101.2.2.1.72" "id-at-plaReplace" - see x509sat.cnf
-# PrintableString B "2.16.840.1.101.2.2.1.73" "id-at-primarySpellingACP127" - see x509sat.cnf
-# Boolean B "2.16.840.1.101.2.2.1.74" "id-at-publish" - see x509sat.cnf
-# GeneralizedTime B "2.16.840.1.101.2.2.1.75" "id-at-recapDueDate" - see x509sat.cnf
-Remarks B "2.16.840.1.101.2.2.1.76" "id-at-remarks"
-# PrintableString B "2.16.840.1.101.2.2.1.77" "id-at-rI" - see x509sat.cnf
-Classification B "2.16.840.1.101.2.2.1.78" "id-at-rIClassification"
-RIParameters B "2.16.840.1.101.2.2.1.79" "id-at-rIInfo"
-Addressees B "2.16.840.1.101.2.2.1.80" "id-at-secondPartyAddressees"
-# Boolean B "2.16.840.1.101.2.2.1.81" "id-at-section" - see x509sat.cnf
-# PrintableString B "2.16.840.1.101.2.2.1.82" "id-at-serviceOrAgency" - see x509sat.cnf
-# PrintableString B "2.16.840.1.101.2.2.1.83" "id-at-sHD" - see x509sat.cnf
-# PrintableString B "2.16.840.1.101.2.2.1.84" "id-at-shortTitle" - see x509sat.cnf
-# PrintableString B "2.16.840.1.101.2.2.1.85" "id-at-sigad" - see x509sat.cnf
-# PrintableString B "2.16.840.1.101.2.2.1.86" "id-at-spot" - see x509sat.cnf
-# Boolean B "2.16.840.1.101.2.2.1.87" "id-at-tARE" - see x509sat.cnf
-# TelephoneNumber B "2.16.840.1.101.2.2.1.94" "id-at-aCPMobileTelephoneNumber" - see x509sat.cnf
-# TelephoneNumber B "2.16.840.1.101.2.2.1.95" "id-at-aCPPagerTelephoneNumber" - see x509sat.cnf
-# PrintableString B "2.16.840.1.101.2.2.1.96" "id-at-tCC" - see x509sat.cnf
-# PrintableString B "2.16.840.1.101.2.2.1.97" "id-at-tRC" - see x509sat.cnf
-DistributionCode B "2.16.840.1.101.2.2.1.104" "id-at-distributionCodeAction"
-DistributionCode B "2.16.840.1.101.2.2.1.105" "id-at-distributionCodeInfo"
-# PrintableString B "2.16.840.1.101.2.2.1.106" "id-at-accessCodes" - see x509sat.cnf
-# GraphicString B "2.16.840.1.101.2.2.1.107" "id-at-accessSchema" - see x509sat.cnf
-ACPPreferredDelivery B "2.16.840.1.101.2.2.1.108" "id-at-aCPPreferredDelivery"
-# TelephoneNumber B "2.16.840.1.101.2.2.1.109" "id-at-aCPTelephoneFaxNumber" - see x509sat.cnf
-# DistinguishedName B "2.16.840.1.101.2.2.1.110" "id-at-administrator" - see x509if.cnf
-# DistinguishedName B "2.16.840.1.101.2.2.1.111" "id-at-aigsExpanded" - see x509if.cnf
-ALType B "2.16.840.1.101.2.2.1.112" "id-at-aLType"
-# DistinguishedName B "2.16.840.1.101.2.2.1.113" "id-at-associatedAL" - see x509if.cnf
-# DistinguishedName B "2.16.840.1.101.2.2.1.114" "id-at-copyMember" - see x509if.cnf
-# ObjectIdentifier B "2.16.840.1.101.2.2.1.115" "id-at-gatewayType" - see x509sat.cnf
-# ObjectIdentifier B "2.16.840.1.101.2.2.1.116" "id-at-ghpType" - see x509sat.cnf
-# DistinguishedName B "2.16.840.1.101.2.2.1.117" "id-at-guard" - see x509if.cnf
-# DirectoryString B "2.16.840.1.101.2.2.1.118" "id-at-mailDomains" - see x509sat.cnf
-# TelephoneNumber B "2.16.840.1.101.2.2.1.119" "id-at-militaryFacsimileNumber" - see x509sat.cnf
-# TelephoneNumber B "2.16.840.1.101.2.2.1.119.1" "id-at-collectiveMilitaryFacsimileNumber" - see x509sat.cnf
-# TelephoneNumber B "2.16.840.1.101.2.2.1.120" "id-at-militaryTelephoneNumber" - see x509sat.cnf
-# TelephoneNumber B "2.16.840.1.101.2.2.1.120.1" "id-at-collectiveMilitaryTelephoneNumber" - see x509sat.cnf
-# DistingishedName B "2.16.840.1.101.2.2.1.121" "id-at-networkDN" - see x509if.cnf
-# GraphicString B "2.16.840.1.101.2.2.1.122" "id-at-networkSchema" - see x509sat.cnf
-OnSupported B "2.16.840.1.101.2.2.1.123" "id-at-onSupported"
-# DirectoryString B "2.16.840.1.101.2.2.1.124" "id-at-operationName" - see x509sat.cnf
-# DirectoryString B "2.16.840.1.101.2.2.1.125" "id-at-positionNumber" - see x509sat.cnf
-# DirectoryString B "2.16.840.1.101.2.2.1.126" "id-at-proprietaryMailboxes" - see x509sat.cnf
-# TelephoneNumber B "2.16.840.1.101.2.2.1.127" "id-at-secureFacsimileNumber" - see x509sat.cnf
-# TelephoneNumber B "2.16.840.1.101.2.2.1.127.1" "id-at-collectiveSecureFacsimileNumber" - see x509sat.cnf
-# TelephoneNumber B "2.16.840.1.101.2.2.1.128" "id-at-secureTelephoneNumber" - see x509sat.cnf
-# TelephoneNumber B "2.16.840.1.101.2.2.1.128.1" "id-at-collectiveSecureTelephoneNumber" - see x509sat.cnf
-# DirectoryString B "2.16.840.1.101.2.2.1.129" "id-at-serviceNumber" - see x509sat.cnf
-# DirectoryString B "2.16.840.1.101.2.2.1.133" "id-at-rank" - see x509sat.cnf
-# B "2.16.840.1.101.2.2.1.134" "id-at-misc-collectives"
-# ORAddress B "2.16.840.1.101.2.2.1.134.1" "id-at-collective-mhs-or-addresses" - see p1.cnf
-MLReceiptPolicy B "2.16.840.1.101.2.2.1.135" "id-at-aLReceiptPolicy"
-# DistinguishedName B "2.16.840.1.101.2.2.1.138" "id-at-plasServed" - see x509if.cnf
-#DistinguishedName B "2.16.840.1.101.2.2.1.139" "id-at-deployed"  - see x509if.cnf
-# DistinguishedName B "2.16.840.1.101.2.2.1.140" "id-at-garrison"  - see x509if.cnf
-ACPLegacyFormat B "2.16.840.1.101.2.2.1.142" "id-at-aCPLegacyFormat"
-# DirectoryString B "2.16.840.1.101.2.2.1.143" "id-at-adminConversion" - see x509sat.cnf
-# PrintableString B "2.16.840.1.101.2.2.1.144" "id-at-tCCG" - see x509sat.cnf
-# DirectoryString B "2.16.840.1.101.2.2.1.145" "id-at-usdConversion" - see x509sat.cnf
-JPEG B "2.16.840.1.101.2.2.1.146" "id-at-aCPNetwAccessSchemaEdB"
-JPEG B "2.16.840.1.101.2.2.1.147" "id-at-aCPNetworkSchemaEdB"
-
-# DirectoryString B "2.16.840.1.101.2.2.1.158" "id-at-aCPRoleInformation" - see x509sat.cnf
-# DirectoryString B "2.16.840.1.101.2.2.1.159" "id-at-coalitionGrade" - see x509sat.cnf
-# TelephoneNumber B "2.16.840.1.101.2.2.1.160" "id-at-militaryIPPhoneNumber" - see x509sat.cnf
-# ObjectIdentifier B "2.16.840.1.101.2.2.1.161" "id-at-fileTypeInfoCapability" - see x509sat.cnf
-MaxMessageSize B "2.16.840.1.101.2.2.1.162" "id-at-maxMessageSize"
-MsgProtocolInfoCapability B "2.16.840.1.101.2.2.1.163" "id-at-msgProtocolInfoCapability"
-Active B "2.16.840.1.101.2.2.1.164" "id-at-active"
-EmConCapability B "2.16.840.1.101.2.2.1.165" "id-at-emConCapability"
-EmConState B "2.16.840.1.101.2.2.1.166" "id-at-emConState"
-WebAccessCapability B "2.16.840.1.101.2.2.1.167" "id-at-webAccessCapability"
-DistributionCode B "2.16.840.1.101.2.2.1.168" "id-at-distributionExemptAction"
-DistributionCode B "2.16.840.1.101.2.2.1.169" "id-at-distributionExemptInfo"
-DistributionCode B "2.16.840.1.101.2.2.1.170" "id-at-distributionKeywordAction"
-DistributionCode B "2.16.840.1.101.2.2.1.171" "id-at-distributionKeywordInfo"
-# PrintableString B "2.16.840.1.101.2.2.1.172" "id-at-aCPFunctionalDescription" - see x509sat.cnf
-# PrintableString B "2.16.840.1.101.2.2.1.173" "id-at-alternatePLAName" - see x509sat.cnf
-# GeneralizedTime B "2.16.840.1.101.2.2.1.174" "id-at-aCPEntryCreationDate" - see x509sat.cnf
-# GeneralizedTime B "2.16.840.1.101.2.2.1.175" "id-at-aCPEntryModificationDate" - see x509sat.cnf
-# ObjectIdentifier B "2.16.840.1.101.2.2.1.176" "id-at-aCPEntryType" - see x509sat.cnf
-# PrintableString B "2.16.840.1.101.2.2.1.177" "id-at-aCPEntryUniqueId" - see x509sat.cnf
-# PrintableString B "2.16.840.1.101.2.2.1.178" "id-at-aCPCitizenship" - see x509sat.cnf
-# PrintableString B "2.16.840.1.101.2.2.1.179" "id-at-aCPEID" - see x509sat.cnf
-# PrintableString B "2.16.840.1.101.2.2.1.180" "id-at-aCPCOI" - see x509sat.cnf
-# PrintableString B "2.16.840.1.101.2.2.1.181" "id-at-aCPPublishTo" - see x509sat.cnf
-# PrintableString B "2.16.840.1.101.2.2.1.182" "id-at-aCPSvcApps" - see x509sat.cnf
-# PrintableString B "2.16.840.1.101.2.2.1.183" "id-at-aCPDirectionsTo" - see x509sat.cnf
-# DistinguishedName B "2.16.840.1.101.2.2.1.184" "id-at-aCPDutyOfficer" - see x509if.cnf
-# PrintableString B "2.16.840.1.101.2.2.1.185" "id-at-aCPLatitude" - see x509sat.cnf
-# PrintableString B "2.16.840.1.101.2.2.1.186" "id-at-aCPLocationMap" - see x509sat.cnf
-# PrintableString B "2.16.840.1.101.2.2.1.187" "id-at-aCPLongitude" - see x509sat.cnf
-# DistinguishedName B "2.16.840.1.101.2.2.1.188" "id-at-primaryMember" - see x509sat.cnf
-ACPNoAttachments B "2.16.840.1.101.2.2.1.189" "id-at-aCPNoAttachments"
-
diff --git a/asn1/acp133/packet-acp133-template.c b/asn1/acp133/packet-acp133-template.c
deleted file mode 100644
index dbcd25c674..0000000000
--- a/asn1/acp133/packet-acp133-template.c
+++ /dev/null
@@ -1,177 +0,0 @@
-/* packet-acp133.c
- * Routines for ACP133 specific syntaxes in X.500 packet dissection
- * Graeme Lunt 2005
- *
- * Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald@wireshark.org>
- * Copyright 1998 Gerald Combs
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "config.h"
-
-#include <epan/packet.h>
-#include <epan/asn1.h>
-#include <epan/oids.h>
-
-#include "packet-ber.h"
-
-#include "packet-p1.h"
-#include "packet-x509af.h"
-#include "packet-x509ce.h"
-#include "packet-x509if.h"
-#include "packet-x509sat.h"
-
-#include "packet-acp133.h"
-
-#define PNAME  "ACP133 Attribute Syntaxes"
-#define PSNAME "ACP133"
-#define PFNAME "acp133"
-
-void proto_register_acp133(void);
-void proto_reg_handoff_acp133(void);
-
-/* Initialize the protocol and registered fields */
-static int proto_acp133 = -1;
-
-
-#include "packet-acp133-hf.c"
-
-/* Initialize the subtree pointers */
-static gint ett_acp133 = -1;
-#include "packet-acp133-ett.c"
-
-#include "packet-acp133-fn.c"
-
-
-/*--- proto_register_acp133 -------------------------------------------*/
-void proto_register_acp133(void) {
-
-  /* List of fields */
-  static hf_register_info hf[] =
-  {
-#include "packet-acp133-hfarr.c"
-  };
-
-  /* List of subtrees */
-  static gint *ett[] = {
-    &ett_acp133,
-#include "packet-acp133-ettarr.c"
-  };
-
-  /* Register protocol */
-  proto_acp133 = proto_register_protocol(PNAME, PSNAME, PFNAME);
-
-  /* Register fields and subtrees */
-  proto_register_field_array(proto_acp133, hf, array_length(hf));
-  proto_register_subtree_array(ett, array_length(ett));
-
-}
-
-
-/*--- proto_reg_handoff_acp133 --- */
-void proto_reg_handoff_acp133(void) {
-
-#include "packet-acp133-dis-tab.c"
-
-  /* X.402 Object Classes */
-  oid_add_from_string("id-oc-mhs-distribution-list","2.6.5.1.0");
-  oid_add_from_string("id-oc-mhs-message-store","2.6.5.1.1");
-  oid_add_from_string("id-oc-mhs-message-transfer-agent","2.6.5.1.2");
-  oid_add_from_string("id-oc-mhs-user","2.6.5.1.3");
-
-  /* SDN.701 Object Classes */
-  oid_add_from_string("id-oc-secure-user","2.16.840.1.101.2.1.4.13");
-  oid_add_from_string("id-oc-ukms","2.16.840.1.101.2.1.4.16");
-
-  /* ACP133 Object Classes */
-  oid_add_from_string("id-oc-plaData","2.16.840.1.101.2.2.3.26");
-  oid_add_from_string("id-oc-cadACP127","2.16.840.1.101.2.2.3.28");
-  oid_add_from_string("id-oc-mLA","2.16.840.1.101.2.2.3.31");
-  oid_add_from_string("id-oc-orgACP127","2.16.840.1.101.2.2.3.34");
-  oid_add_from_string("id-oc-plaCollectiveACP127","2.16.840.1.101.2.2.3.35");
-  oid_add_from_string("id-oc-routingIndicator","2.16.840.1.101.2.2.3.37");
-  oid_add_from_string("id-oc-sigintPLA","2.16.840.1.101.2.2.3.38");
-  oid_add_from_string("id-oc-sIPLA","2.16.840.1.101.2.2.3.39");
-  oid_add_from_string("id-oc-spotPLA","2.16.840.1.101.2.2.3.40");
-  oid_add_from_string("id-oc-taskForceACP127","2.16.840.1.101.2.2.3.41");
-  oid_add_from_string("id-oc-tenantACP127","2.16.840.1.101.2.2.3.42");
-  oid_add_from_string("id-oc-plaACP127","2.16.840.1.101.2.2.3.47");
-  oid_add_from_string("id-oc-aliasCommonName","2.16.840.1.101.2.2.3.52");
-  oid_add_from_string("id-oc-aliasOrganizationalUnit","2.16.840.1.101.2.2.3.53");
-  oid_add_from_string("id-oc-distributionCodesHandled","2.16.840.1.101.2.2.3.54");
-  oid_add_from_string("id-oc-distributionCodeDescription","2.16.840.1.101.2.2.3.55");
-  oid_add_from_string("id-oc-plaUser","2.16.840.1.101.2.2.3.56");
-  oid_add_from_string("id-oc-addressList","2.16.840.1.101.2.2.3.57");
-  oid_add_from_string("id-oc-altSpellingACP127","2.16.840.1.101.2.2.3.58");
-  oid_add_from_string("id-oc-messagingGateway","2.16.840.1.101.2.2.3.59");
-  oid_add_from_string("id-oc-network","2.16.840.1.101.2.2.3.60");
-  oid_add_from_string("id-oc-networkInstructions","2.16.840.1.101.2.2.3.61");
-  oid_add_from_string("id-oc-otherContactInformation","2.16.840.1.101.2.2.3.62");
-  oid_add_from_string("id-oc-releaseAuthorityPerson","2.16.840.1.101.2.2.3.63");
-  oid_add_from_string("id-oc-mLAgent","2.16.840.1.101.2.2.3.64");
-  oid_add_from_string("id-oc-releaseAuthorityPersonA","2.16.840.1.101.2.2.3.65");
-  oid_add_from_string("id-oc-securePkiUser","2.16.840.1.101.2.2.3.66");
-  oid_add_from_string("id-oc-dSSCSPLA","2.16.840.1.101.2.2.3.67");
-  oid_add_from_string("id-oc-aCPNetworkEdB","2.16.840.1.101.2.2.3.68");
-  oid_add_from_string("id-oc-aCPNetworkInstructionsEdB","2.16.840.1.101.2.2.3.69");
-  oid_add_from_string("id-oc-aCPAddressList","2.16.840.1.101.2.2.3.70");
-  oid_add_from_string("id-oc-aCPAliasCommonName","2.16.840.1.101.2.2.3.71");
-  oid_add_from_string("id-oc-aCPAliasOrganizationalUnit","2.16.840.1.101.2.2.3.72");
-  oid_add_from_string("id-oc-aCPDevice","2.16.840.1.101.2.2.3.73");
-  oid_add_from_string("id-oc-aCPDistributionCodeDescription","2.16.840.1.101.2.2.3.74");
-  oid_add_from_string("id-oc-aCPGroupOfNames","2.16.840.1.101.2.2.3.75");
-  oid_add_from_string("id-oc-aCPLocality","2.16.840.1.101.2.2.3.76");
-  oid_add_from_string("id-oc-aCPOrganization","2.16.840.1.101.2.2.3.77");
-  oid_add_from_string("id-oc-aCPOrganizationalPerson","2.16.840.1.101.2.2.3.78");
-  oid_add_from_string("id-oc-aCPOrganizationalRole","2.16.840.1.101.2.2.3.79");
-  oid_add_from_string("id-oc-aCPOrganizationalUnit","2.16.840.1.101.2.2.3.80");
-  oid_add_from_string("id-oc-aCPDistributionCodesHandled","2.16.840.1.101.2.2.3.81");
-  oid_add_from_string("id-oc-aCPMhsCapabilitiesInformation","2.16.840.1.101.2.2.3.82");
-  oid_add_from_string("id-oc-aCPOtherContactInformation","2.16.840.1.101.2.2.3.83");
-  oid_add_from_string("id-oc-aCPPlaUser","2.16.840.1.101.2.2.3.84");
-  oid_add_from_string("id-oc-aCPCRLDistributionPoint","2.16.840.1.101.2.2.3.85");
-  oid_add_from_string("id-oc-aCPSecurePKIUser","2.16.840.1.101.2.2.3.86");
-  oid_add_from_string("id-oc-aCPAltSpellingACP127","2.16.840.1.101.2.2.3.87");
-  oid_add_from_string("id-oc-aCPCadACP127","2.16.840.1.101.2.2.3.88");
-  oid_add_from_string("id-oc-aCPDSSCSPLA","2.16.840.1.101.2.2.3.89");
-  oid_add_from_string("id-oc-aCPOrgACP127","2.16.840.1.101.2.2.3.90");
-  oid_add_from_string("id-oc-aCPPLACollectiveACP127","2.16.840.1.101.2.2.3.91");
-  oid_add_from_string("id-oc-aCPRoutingIndicator","2.16.840.1.101.2.2.3.92");
-  oid_add_from_string("id-oc-aCPSigIntPLA","2.16.840.1.101.2.2.3.93");
-  oid_add_from_string("id-oc-aCPSIPLA","2.16.840.1.101.2.2.3.94");
-  oid_add_from_string("id-oc-aCPSpotPLA","2.16.840.1.101.2.2.3.95");
-  oid_add_from_string("id-oc-aCPTaskForceACP127","2.16.840.1.101.2.2.3.96");
-  oid_add_from_string("id-oc-aCPTenantACP127","2.16.840.1.101.2.2.3.97");
-  oid_add_from_string("id-oc-aCPPlaACP127","2.16.840.1.101.2.2.3.98");
-  oid_add_from_string("id-oc-aCPPlaData","2.16.840.1.101.2.2.3.99");
-  oid_add_from_string("id-oc-aCPEntryAdmin","2.16.840.1.101.2.2.3.102");
-  oid_add_from_string("id-oc-aCPOrganizationalLocation","2.16.840.1.101.2.2.3.103");
-  oid_add_from_string("id-oc-aCPEntryCharacteristics","2.16.840.1.101.2.2.3.104");
-  oid_add_from_string("id-oc-aCPPrivilege","2.16.840.1.101.2.2.3.105");
-
-  /* gateway types */
-  oid_add_from_string("acp120-acp127","2.16.840.1.101.2.2.5.0");
-  oid_add_from_string("acp120-janap128","2.16.840.1.101.2.2.5.1");
-  oid_add_from_string("acp120-mhs","2.16.840.1.101.2.2.5.2");
-  oid_add_from_string("acp120-mmhs","2.16.840.1.101.2.2.5.3");
-  oid_add_from_string("acp120-rfc822","2.16.840.1.101.2.2.5.4");
-  oid_add_from_string("boundaryMTA","2.16.840.1.101.2.2.5.5");
-  oid_add_from_string("mmhs-mhs","2.16.840.1.101.2.2.5.6");
-  oid_add_from_string("mmhs-rfc822","2.16.840.1.101.2.2.5.7");
-  oid_add_from_string("mta-acp127","2.16.840.1.101.2.2.5.8");
-
-}
diff --git a/asn1/acp133/packet-acp133-template.h b/asn1/acp133/packet-acp133-template.h
deleted file mode 100644
index 4cac3a639c..0000000000
--- a/asn1/acp133/packet-acp133-template.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* packet-acp133.h
- * Routines for ACP133 specific syntaxes in X.500 packet dissection
- * Graeme Lunt 2005
- *
- * Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald@wireshark.org>
- * Copyright 1998 Gerald Combs
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef PACKET_ACP133_H
-#define PACKET_ACP133_H
-
-/* #include "packet-acp133-exp.h" */
-
-#endif  /* PACKET_ACP133_H */