Update ACP133 to edition D.

svn path=/trunk/; revision=46008

9 files changed, 433 insertions, 50 deletions

diff --git a/asn1/acp133/Makefile.common b/asn1/acp133/Makefile.common
index 5643ddaa10..f8c0fe8c52 100644
--- a/asn1/acp133/Makefile.common
+++ b/asn1/acp133/Makefile.common
@@ -45,7 +45,8 @@ EXTRA_CNF= \
 	$(builddir)/../p1/p1-exp.cnf \
 	$(builddir)/../x509af/x509af-exp.cnf \
 	$(builddir)/../x509ce/x509ce-exp.cnf \
-	$(builddir)/../x509if/x509if-exp.cnf
+	$(builddir)/../x509if/x509if-exp.cnf \
+	$(builddir)/../x509sat/x509sat-exp.cnf
 
 $(builddir)/../p1/p1-exp.cnf:
 	(cd $(builddir)/../p1 && $(MAKE_CNF_EXPORT))
@@ -59,3 +60,6 @@ $(builddir)/../x509ce/x509ce-exp.cnf:
 $(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/acp133.asn b/asn1/acp133/acp133.asn
index 2a00400a07..8c752357e9 100644
--- a/asn1/acp133/acp133.asn
+++ b/asn1/acp133/acp133.asn
@@ -14,6 +14,10 @@ IMPORTS
     --==
     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)
@@ -31,7 +35,7 @@ OnSupported ::= BIT STRING { acp127-nn(0), acp127-pn(1), acp127-tn(2) }
 
 ACPLegacyFormat ::= INTEGER {
 	janap128(0),
-	acp126(1),
+	acp127(1), -- changed from acp126 for consistency purposes
 	doi103(2),
 	doi103-special(3),
 	acp127(4),
@@ -45,11 +49,20 @@ ACPLegacyFormat ::= INTEGER {
 	socomm-narrative-special(12),
 	socomm-data(13),
 	socomm-internal(14),
-	socomm-external(15) }
-	-- Note: Values 32 through 48 are not defined
-	-- by this ACP and may be used nationally or
-	-- bilaterally.
+	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))
 
@@ -58,17 +71,36 @@ 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 ::= SET {
+-- 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) },
@@ -82,6 +114,8 @@ UKMEntry ::= SEQUENCE {
 	ukm OCTET STRING
 }
 
+WebAccessCapability ::= BOOLEAN
+
 -- these are imported directly from SDN.701
 
 PairwiseTag  			::= SEQUENCE  {
diff --git a/asn1/acp133/acp133.cnf b/asn1/acp133/acp133.cnf
index c3cc08c5a9..484560f0d5 100644
--- a/asn1/acp133/acp133.cnf
+++ b/asn1/acp133/acp133.cnf
@@ -1,13 +1,11 @@
 # 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 ../x509af/x509af-exp.cnf
-#.IMPORT ../p1/p1-exp.cnf
-
-#.MODULE_IMPORT
-MTSAbstractService 	p1
+#.IMPORT ../x509sat/x509sat-exp.cnf
 
 #.PDU
 ACPPreferredDelivery
@@ -203,4 +201,36 @@ ACPLegacyFormat B "2.16.840.1.101.2.2.1.142" "id-at-aCPLegacyFormat"
 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-aCPEntryEniqueId" - 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-aCPDirectoinsTo" - 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
index 7306943631..18ca3e5a12 100644
--- a/asn1/acp133/packet-acp133-template.c
+++ b/asn1/acp133/packet-acp133-template.c
@@ -32,10 +32,11 @@
 
 #include "packet-ber.h"
 
+#include "packet-p1.h"
 #include "packet-x509af.h"
-#include "packet-x509if.h"
 #include "packet-x509ce.h"
-#include "packet-p1.h"
+#include "packet-x509if.h"
+#include "packet-x509sat.h"
 
 #include "packet-acp133.h"
 
@@ -127,6 +128,40 @@ void proto_reg_handoff_acp133(void) {
   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");
diff --git a/asn1/x509if/x509if.cnf b/asn1/x509if/x509if.cnf
index 6122c17f58..7a2cf78e46 100644
--- a/asn1/x509if/x509if.cnf
+++ b/asn1/x509if/x509if.cnf
@@ -174,6 +174,8 @@ DistinguishedName B "2.16.840.1.101.2.2.1.121" "id-at-networkDN"
 DistinguishedName B "2.16.840.1.101.2.2.1.138" "id-at-plasServed"
 DistinguishedName B "2.16.840.1.101.2.2.1.139" "id-at-deployed"
 DistinguishedName B "2.16.840.1.101.2.2.1.140" "id-at-garrison"
+DistinguishedName B "2.16.840.1.101.2.2.1.184" "id-at-aCPDutyOfficer"
+DistinguishedName B "2.16.840.1.101.2.2.1.188" "id-at-primaryMember"
 
 
 
diff --git a/asn1/x509sat/x509sat.cnf b/asn1/x509sat/x509sat.cnf
index bbde11ae02..ead3667658 100644
--- a/asn1/x509sat/x509sat.cnf
+++ b/asn1/x509sat/x509sat.cnf
@@ -271,6 +271,25 @@ DirectoryString B "2.16.840.1.101.2.2.1.133" "id-at-rank"
 DirectoryString B "2.16.840.1.101.2.2.1.143" "id-at-adminConversion"
 SyntaxPrintableString B "2.16.840.1.101.2.2.1.144" "id-at-tCCG"
 DirectoryString B "2.16.840.1.101.2.2.1.145" "id-at-usdConversion"
+DirectoryString B "2.16.840.1.101.2.2.1.158" "id-at-aCPRoleInformation"
+DirectoryString B "2.16.840.1.101.2.2.1.159" "id-at-coalitionGrade"
+TelephoneNumber B "2.16.840.1.101.2.2.1.160" "id-at-militaryIPPhoneNumber"
+ObjectIdentifier B "2.16.840.1.101.2.2.1.161" "id-at-fileTypeInfoCapability"
+SyntaxPrintableString B "2.16.840.1.101.2.2.1.172" "id-at-aCPFunctionalDescription"
+SyntaxPrintableString B "2.16.840.1.101.2.2.1.173" "id-at-alternatePLAName"
+SyntaxGeneralizedTime B "2.16.840.1.101.2.2.1.174" "id-at-aCPEntryCreationDate"
+SyntaxGeneralizedTime B "2.16.840.1.101.2.2.1.175" "id-at-aCPEntryModificationDate"
+ObjectIdentifier B "2.16.840.1.101.2.2.1.176" "id-at-aCPEntryType"
+SyntaxPrintableString B "2.16.840.1.101.2.2.1.177" "id-at-aCPEntryEniqueId"
+SyntaxPrintableString B "2.16.840.1.101.2.2.1.178" "id-at-aCPCitizenship"
+SyntaxPrintableString B "2.16.840.1.101.2.2.1.179" "id-at-aCPEID"
+SyntaxPrintableString B "2.16.840.1.101.2.2.1.180" "id-at-aCPCOI"
+SyntaxPrintableString B "2.16.840.1.101.2.2.1.181" "id-at-aCPPublishTo"
+SyntaxPrintableString B "2.16.840.1.101.2.2.1.182" "id-at-aCPSvcApps"
+SyntaxPrintableString B "2.16.840.1.101.2.2.1.183" "id-at-aCPDirectoinsTo"
+SyntaxPrintableString B "2.16.840.1.101.2.2.1.185" "id-at-aCPLatitude"
+SyntaxPrintableString B "2.16.840.1.101.2.2.1.186" "id-at-aCPLocationMap"
+SyntaxPrintableString B "2.16.840.1.101.2.2.1.187" "id-at-aCPLongitude"
 
 # PKCS#9
 
diff --git a/epan/dissectors/packet-acp133.c b/epan/dissectors/packet-acp133.c
index 5c592c121f..22afac3e42 100644
--- a/epan/dissectors/packet-acp133.c
+++ b/epan/dissectors/packet-acp133.c
@@ -40,10 +40,11 @@
 
 #include "packet-ber.h"
 
+#include "packet-p1.h"
 #include "packet-x509af.h"
-#include "packet-x509if.h"
 #include "packet-x509ce.h"
-#include "packet-p1.h"
+#include "packet-x509if.h"
+#include "packet-x509sat.h"
 
 #include "packet-acp133.h"
 
@@ -63,13 +64,20 @@ static int hf_acp133_ALType_PDU = -1;             /* ALType */
 static int hf_acp133_Community_PDU = -1;          /* Community */
 static int hf_acp133_OnSupported_PDU = -1;        /* OnSupported */
 static int hf_acp133_ACPLegacyFormat_PDU = -1;    /* ACPLegacyFormat */
+static int hf_acp133_ACPNoAttachments_PDU = -1;   /* ACPNoAttachments */
+static int hf_acp133_Active_PDU = -1;             /* Active */
 static int hf_acp133_Addressees_PDU = -1;         /* Addressees */
 static int hf_acp133_Classification_PDU = -1;     /* Classification */
 static int hf_acp133_DistributionCode_PDU = -1;   /* DistributionCode */
+static int hf_acp133_EmConCapability_PDU = -1;    /* EmConCapability */
+static int hf_acp133_EmConState_PDU = -1;         /* EmConState */
 static int hf_acp133_JPEG_PDU = -1;               /* JPEG */
+static int hf_acp133_MaxMessageSize_PDU = -1;     /* MaxMessageSize */
 static int hf_acp133_MonthlyUKMs_PDU = -1;        /* MonthlyUKMs */
+static int hf_acp133_MsgProtocolInfoCapability_PDU = -1;  /* MsgProtocolInfoCapability */
 static int hf_acp133_Remarks_PDU = -1;            /* Remarks */
 static int hf_acp133_RIParameters_PDU = -1;       /* RIParameters */
+static int hf_acp133_WebAccessCapability_PDU = -1;  /* WebAccessCapability */
 static int hf_acp133_Kmid_PDU = -1;               /* Kmid */
 static int hf_acp133_MLReceiptPolicy_PDU = -1;    /* MLReceiptPolicy */
 static int hf_acp133_DLSubmitPermission_PDU = -1;  /* DLSubmitPermission */
@@ -82,6 +90,8 @@ static int hf_acp133_ukm_entries_item = -1;       /* UKMEntry */
 static int hf_acp133_algorithm_identifier = -1;   /* AlgorithmIdentifier */
 static int hf_acp133_encrypted = -1;              /* BIT_STRING */
 static int hf_acp133_Remarks_item = -1;           /* PrintableString */
+static int hf_acp133_ri_parameters = -1;          /* DirectoryString */
+static int hf_acp133_ri_parameters_deprecated = -1;  /* RIParametersDeprecated */
 static int hf_acp133_rI = -1;                     /* PrintableString */
 static int hf_acp133_rIType = -1;                 /* T_rIType */
 static int hf_acp133_minimize = -1;               /* BOOLEAN */
@@ -138,7 +148,7 @@ static int hf_acp133_OnSupported_acp127_pn = -1;
 static int hf_acp133_OnSupported_acp127_tn = -1;
 
 /*--- End of included file: packet-acp133-hf.c ---*/
-#line 51 "../../asn1/acp133/packet-acp133-template.c"
+#line 52 "../../asn1/acp133/packet-acp133-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_acp133 = -1;
@@ -151,6 +161,7 @@ static gint ett_acp133_MonthlyUKMs = -1;
 static gint ett_acp133_SEQUENCE_OF_UKMEntry = -1;
 static gint ett_acp133_Remarks = -1;
 static gint ett_acp133_RIParameters = -1;
+static gint ett_acp133_RIParametersDeprecated = -1;
 static gint ett_acp133_UKMEntry = -1;
 static gint ett_acp133_PairwiseTag = -1;
 static gint ett_acp133_MLReceiptPolicy = -1;
@@ -166,7 +177,7 @@ static gint ett_acp133_Capability = -1;
 static gint ett_acp133_SET_OF_ExtendedContentType = -1;
 
 /*--- End of included file: packet-acp133-ett.c ---*/
-#line 55 "../../asn1/acp133/packet-acp133-template.c"
+#line 56 "../../asn1/acp133/packet-acp133-template.c"
 
 
 /*--- Included file: packet-acp133-fn.c ---*/
@@ -244,7 +255,7 @@ dissect_acp133_OnSupported(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
 
 static const value_string acp133_ACPLegacyFormat_vals[] = {
   {   0, "janap128" },
-  {   1, "acp126" },
+  {   1, "acp127" },
   {   2, "doi103" },
   {   3, "doi103-special" },
   {   4, "acp127" },
@@ -259,6 +270,14 @@ static const value_string acp133_ACPLegacyFormat_vals[] = {
   {  13, "socomm-data" },
   {  14, "socomm-internal" },
   {  15, "socomm-external" },
+  {  16, "mfi-default" },
+  {  17, "acp-legacy-format-smtp" },
+  {  18, "p22" },
+  {  32, "acp145-united-states" },
+  {  33, "acp145-australia" },
+  {  34, "acp145-canada" },
+  {  35, "acp145-united-kingdom" },
+  {  36, "acp145-new-zealand" },
   { 0, NULL }
 };
 
@@ -274,6 +293,24 @@ dissect_acp133_ACPLegacyFormat(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
 
 
 static int
+dissect_acp133_ACPNoAttachments(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
+
+  return offset;
+}
+
+
+
+static int
+dissect_acp133_Active(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
+
+  return offset;
+}
+
+
+
+static int
 dissect_acp133_PrintableString_SIZE_1_55(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
                                             actx, tree, tvb, offset, hf_index,
@@ -329,6 +366,33 @@ dissect_acp133_DistributionCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
 
 
 static int
+dissect_acp133_EmConCapability(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
+
+  return offset;
+}
+
+
+static const value_string acp133_EmConState_vals[] = {
+  {   0, "enabled" },
+  {   1, "receive-only" },
+  {   2, "electronic-silence" },
+  {   3, "disabled" },
+  { 0, NULL }
+};
+
+
+static int
+dissect_acp133_EmConState(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
+                                  NULL);
+
+  return offset;
+}
+
+
+
+static int
 dissect_acp133_JPEG(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        NULL);
@@ -339,6 +403,16 @@ dissect_acp133_JPEG(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_
 
 
 static int
+dissect_acp133_MaxMessageSize(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
+                                                NULL);
+
+  return offset;
+}
+
+
+
+static int
 dissect_acp133_Kmid(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        NULL);
@@ -447,6 +521,22 @@ dissect_acp133_MonthlyUKMs(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
 }
 
 
+static const value_string acp133_MsgProtocolInfoCapability_vals[] = {
+  {   0, "acp-127" },
+  {   1, "acp-123" },
+  { 0, NULL }
+};
+
+
+static int
+dissect_acp133_MsgProtocolInfoCapability(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
+                                  NULL);
+
+  return offset;
+}
+
+
 
 static int
 dissect_acp133_PrintableString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -497,7 +587,7 @@ dissect_acp133_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const ber_sequence_t RIParameters_set[] = {
+static const ber_sequence_t RIParametersDeprecated_set[] = {
   { &hf_acp133_rI           , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_acp133_PrintableString },
   { &hf_acp133_rIType       , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_acp133_T_rIType },
   { &hf_acp133_minimize     , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_acp133_BOOLEAN },
@@ -507,9 +597,40 @@ static const ber_sequence_t RIParameters_set[] = {
 };
 
 static int
-dissect_acp133_RIParameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_acp133_RIParametersDeprecated(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
-                              RIParameters_set, hf_index, ett_acp133_RIParameters);
+                              RIParametersDeprecated_set, hf_index, ett_acp133_RIParametersDeprecated);
+
+  return offset;
+}
+
+
+static const value_string acp133_RIParameters_vals[] = {
+  {   0, "ri-parameters" },
+  {   1, "ri-parameters-deprecated" },
+  { 0, NULL }
+};
+
+static const ber_choice_t RIParameters_choice[] = {
+  {   0, &hf_acp133_ri_parameters, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_x509sat_DirectoryString },
+  {   1, &hf_acp133_ri_parameters_deprecated, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_acp133_RIParametersDeprecated },
+  { 0, NULL, 0, 0, 0, NULL }
+};
+
+static int
+dissect_acp133_RIParameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_ber_choice(actx, tree, tvb, offset,
+                                 RIParameters_choice, hf_index, ett_acp133_RIParameters,
+                                 NULL);
+
+  return offset;
+}
+
+
+
+static int
+dissect_acp133_WebAccessCapability(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -946,6 +1067,16 @@ static void dissect_ACPLegacyFormat_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U
   asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
   dissect_acp133_ACPLegacyFormat(FALSE, tvb, 0, &asn1_ctx, tree, hf_acp133_ACPLegacyFormat_PDU);
 }
+static void dissect_ACPNoAttachments_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+  asn1_ctx_t asn1_ctx;
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
+  dissect_acp133_ACPNoAttachments(FALSE, tvb, 0, &asn1_ctx, tree, hf_acp133_ACPNoAttachments_PDU);
+}
+static void dissect_Active_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+  asn1_ctx_t asn1_ctx;
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
+  dissect_acp133_Active(FALSE, tvb, 0, &asn1_ctx, tree, hf_acp133_Active_PDU);
+}
 static void dissect_Addressees_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
   asn1_ctx_t asn1_ctx;
   asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
@@ -961,16 +1092,36 @@ static void dissect_DistributionCode_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _
   asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
   dissect_acp133_DistributionCode(FALSE, tvb, 0, &asn1_ctx, tree, hf_acp133_DistributionCode_PDU);
 }
+static void dissect_EmConCapability_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+  asn1_ctx_t asn1_ctx;
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
+  dissect_acp133_EmConCapability(FALSE, tvb, 0, &asn1_ctx, tree, hf_acp133_EmConCapability_PDU);
+}
+static void dissect_EmConState_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+  asn1_ctx_t asn1_ctx;
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
+  dissect_acp133_EmConState(FALSE, tvb, 0, &asn1_ctx, tree, hf_acp133_EmConState_PDU);
+}
 static void dissect_JPEG_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
   asn1_ctx_t asn1_ctx;
   asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
   dissect_acp133_JPEG(FALSE, tvb, 0, &asn1_ctx, tree, hf_acp133_JPEG_PDU);
 }
+static void dissect_MaxMessageSize_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+  asn1_ctx_t asn1_ctx;
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
+  dissect_acp133_MaxMessageSize(FALSE, tvb, 0, &asn1_ctx, tree, hf_acp133_MaxMessageSize_PDU);
+}
 static void dissect_MonthlyUKMs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
   asn1_ctx_t asn1_ctx;
   asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
   dissect_acp133_MonthlyUKMs(FALSE, tvb, 0, &asn1_ctx, tree, hf_acp133_MonthlyUKMs_PDU);
 }
+static void dissect_MsgProtocolInfoCapability_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+  asn1_ctx_t asn1_ctx;
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
+  dissect_acp133_MsgProtocolInfoCapability(FALSE, tvb, 0, &asn1_ctx, tree, hf_acp133_MsgProtocolInfoCapability_PDU);
+}
 static void dissect_Remarks_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
   asn1_ctx_t asn1_ctx;
   asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
@@ -981,6 +1132,11 @@ static void dissect_RIParameters_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_,
   asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
   dissect_acp133_RIParameters(FALSE, tvb, 0, &asn1_ctx, tree, hf_acp133_RIParameters_PDU);
 }
+static void dissect_WebAccessCapability_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+  asn1_ctx_t asn1_ctx;
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
+  dissect_acp133_WebAccessCapability(FALSE, tvb, 0, &asn1_ctx, tree, hf_acp133_WebAccessCapability_PDU);
+}
 static void dissect_Kmid_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
   asn1_ctx_t asn1_ctx;
   asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
@@ -1014,7 +1170,7 @@ static void dissect_Capability_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr
 
 
 /*--- End of included file: packet-acp133-fn.c ---*/
-#line 57 "../../asn1/acp133/packet-acp133-template.c"
+#line 58 "../../asn1/acp133/packet-acp133-template.c"
 
 
 /*--- proto_register_acp133 -------------------------------------------*/
@@ -1046,6 +1202,14 @@ void proto_register_acp133(void) {
       { "ACPLegacyFormat", "acp133.ACPLegacyFormat",
         FT_INT32, BASE_DEC, VALS(acp133_ACPLegacyFormat_vals), 0,
         NULL, HFILL }},
+    { &hf_acp133_ACPNoAttachments_PDU,
+      { "ACPNoAttachments", "acp133.ACPNoAttachments",
+        FT_BOOLEAN, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
+    { &hf_acp133_Active_PDU,
+      { "Active", "acp133.Active",
+        FT_BOOLEAN, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
     { &hf_acp133_Addressees_PDU,
       { "Addressees", "acp133.Addressees",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -1058,21 +1222,41 @@ void proto_register_acp133(void) {
       { "DistributionCode", "acp133.DistributionCode",
         FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
+    { &hf_acp133_EmConCapability_PDU,
+      { "EmConCapability", "acp133.EmConCapability",
+        FT_BOOLEAN, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
+    { &hf_acp133_EmConState_PDU,
+      { "EmConState", "acp133.EmConState",
+        FT_UINT32, BASE_DEC, VALS(acp133_EmConState_vals), 0,
+        NULL, HFILL }},
     { &hf_acp133_JPEG_PDU,
       { "JPEG", "acp133.JPEG",
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
+    { &hf_acp133_MaxMessageSize_PDU,
+      { "MaxMessageSize", "acp133.MaxMessageSize",
+        FT_INT32, BASE_DEC, NULL, 0,
+        NULL, HFILL }},
     { &hf_acp133_MonthlyUKMs_PDU,
       { "MonthlyUKMs", "acp133.MonthlyUKMs",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
+    { &hf_acp133_MsgProtocolInfoCapability_PDU,
+      { "MsgProtocolInfoCapability", "acp133.MsgProtocolInfoCapability",
+        FT_UINT32, BASE_DEC, VALS(acp133_MsgProtocolInfoCapability_vals), 0,
+        NULL, HFILL }},
     { &hf_acp133_Remarks_PDU,
       { "Remarks", "acp133.Remarks",
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_acp133_RIParameters_PDU,
       { "RIParameters", "acp133.RIParameters",
-        FT_NONE, BASE_NONE, NULL, 0,
+        FT_UINT32, BASE_DEC, VALS(acp133_RIParameters_vals), 0,
+        NULL, HFILL }},
+    { &hf_acp133_WebAccessCapability_PDU,
+      { "WebAccessCapability", "acp133.WebAccessCapability",
+        FT_BOOLEAN, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_acp133_Kmid_PDU,
       { "Kmid", "acp133.Kmid",
@@ -1122,6 +1306,14 @@ void proto_register_acp133(void) {
       { "Remarks item", "acp133.Remarks_item",
         FT_STRING, BASE_NONE, NULL, 0,
         "PrintableString", HFILL }},
+    { &hf_acp133_ri_parameters,
+      { "ri-parameters", "acp133.ri_parameters",
+        FT_UINT32, BASE_DEC, VALS(x509sat_DirectoryString_vals), 0,
+        "DirectoryString", HFILL }},
+    { &hf_acp133_ri_parameters_deprecated,
+      { "ri-parameters-deprecated", "acp133.ri_parameters_deprecated",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "RIParametersDeprecated", HFILL }},
     { &hf_acp133_rI,
       { "rI", "acp133.rI",
         FT_STRING, BASE_NONE, NULL, 0,
@@ -1336,7 +1528,7 @@ void proto_register_acp133(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-acp133-hfarr.c ---*/
-#line 66 "../../asn1/acp133/packet-acp133-template.c"
+#line 67 "../../asn1/acp133/packet-acp133-template.c"
   };
 
   /* List of subtrees */
@@ -1351,6 +1543,7 @@ void proto_register_acp133(void) {
     &ett_acp133_SEQUENCE_OF_UKMEntry,
     &ett_acp133_Remarks,
     &ett_acp133_RIParameters,
+    &ett_acp133_RIParametersDeprecated,
     &ett_acp133_UKMEntry,
     &ett_acp133_PairwiseTag,
     &ett_acp133_MLReceiptPolicy,
@@ -1366,7 +1559,7 @@ void proto_register_acp133(void) {
     &ett_acp133_SET_OF_ExtendedContentType,
 
 /*--- End of included file: packet-acp133-ettarr.c ---*/
-#line 72 "../../asn1/acp133/packet-acp133-template.c"
+#line 73 "../../asn1/acp133/packet-acp133-template.c"
   };
 
   /* Register protocol */
@@ -1424,10 +1617,21 @@ void proto_reg_handoff_acp133(void) {
   register_ber_oid_dissector("2.16.840.1.101.2.2.1.142", dissect_ACPLegacyFormat_PDU, proto_acp133, "id-at-aCPLegacyFormat");
   register_ber_oid_dissector("2.16.840.1.101.2.2.1.146", dissect_JPEG_PDU, proto_acp133, "id-at-aCPNetwAccessSchemaEdB");
   register_ber_oid_dissector("2.16.840.1.101.2.2.1.147", dissect_JPEG_PDU, proto_acp133, "id-at-aCPNetworkSchemaEdB");
+  register_ber_oid_dissector("2.16.840.1.101.2.2.1.162", dissect_MaxMessageSize_PDU, proto_acp133, "id-at-maxMessageSize");
+  register_ber_oid_dissector("2.16.840.1.101.2.2.1.163", dissect_MsgProtocolInfoCapability_PDU, proto_acp133, "id-at-msgProtocolInfoCapability");
+  register_ber_oid_dissector("2.16.840.1.101.2.2.1.164", dissect_Active_PDU, proto_acp133, "id-at-active");
+  register_ber_oid_dissector("2.16.840.1.101.2.2.1.165", dissect_EmConCapability_PDU, proto_acp133, "id-at-emConCapability");
+  register_ber_oid_dissector("2.16.840.1.101.2.2.1.166", dissect_EmConState_PDU, proto_acp133, "id-at-emConState");
+  register_ber_oid_dissector("2.16.840.1.101.2.2.1.167", dissect_WebAccessCapability_PDU, proto_acp133, "id-at-webAccessCapability");
+  register_ber_oid_dissector("2.16.840.1.101.2.2.1.168", dissect_DistributionCode_PDU, proto_acp133, "id-at-distributionExemptAction");
+  register_ber_oid_dissector("2.16.840.1.101.2.2.1.169", dissect_DistributionCode_PDU, proto_acp133, "id-at-distributionExemptInfo");
+  register_ber_oid_dissector("2.16.840.1.101.2.2.1.170", dissect_DistributionCode_PDU, proto_acp133, "id-at-distributionKeywordAction");
+  register_ber_oid_dissector("2.16.840.1.101.2.2.1.171", dissect_DistributionCode_PDU, proto_acp133, "id-at-distributionKeywordInfo");
+  register_ber_oid_dissector("2.16.840.1.101.2.2.1.189", dissect_ACPNoAttachments_PDU, proto_acp133, "id-at-aCPNoAttachments");
 
 
 /*--- End of included file: packet-acp133-dis-tab.c ---*/
-#line 88 "../../asn1/acp133/packet-acp133-template.c"
+#line 89 "../../asn1/acp133/packet-acp133-template.c"
 
   /* X.402 Object Classes */
   oid_add_from_string("id-oc-mhs-distribution-list","2.6.5.1.0");
@@ -1470,6 +1674,40 @@ void proto_reg_handoff_acp133(void) {
   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");
diff --git a/epan/dissectors/packet-x509if.c b/epan/dissectors/packet-x509if.c
index 27ec08d3f4..216c3b3cff 100644
--- a/epan/dissectors/packet-x509if.c
+++ b/epan/dissectors/packet-x509if.c
@@ -363,7 +363,7 @@ dissect_x509if_T_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _
 
 static int
 dissect_x509if_T_values_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 313 "../../asn1/x509if/x509if.cnf"
+#line 315 "../../asn1/x509if/x509if.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
 
 
@@ -388,7 +388,7 @@ dissect_x509if_T_values(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
 
 static int
 dissect_x509if_T_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 283 "../../asn1/x509if/x509if.cnf"
+#line 285 "../../asn1/x509if/x509if.cnf"
   offset=call_ber_oid_callback("unknown", tvb, offset, actx->pinfo, tree);
 
 
@@ -409,7 +409,7 @@ dissect_x509if_T_contextType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
 
 static int
 dissect_x509if_T_contextValues_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 295 "../../asn1/x509if/x509if.cnf"
+#line 297 "../../asn1/x509if/x509if.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
 
 
@@ -506,7 +506,7 @@ static const ber_sequence_t Attribute_sequence[] = {
 
 int
 dissect_x509if_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 416 "../../asn1/x509if/x509if.cnf"
+#line 418 "../../asn1/x509if/x509if.cnf"
 	doing_attr = TRUE;
 	register_frame_end_routine (actx->pinfo, x509if_frame_end);
 
@@ -531,7 +531,7 @@ dissect_x509if_AttributeType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
 
 int
 dissect_x509if_AttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 301 "../../asn1/x509if/x509if.cnf"
+#line 303 "../../asn1/x509if/x509if.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
 
 
@@ -552,7 +552,7 @@ dissect_x509if_T_type_01(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
 
 static int
 dissect_x509if_T_assertion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 307 "../../asn1/x509if/x509if.cnf"
+#line 309 "../../asn1/x509if/x509if.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
 
 
@@ -582,7 +582,7 @@ dissect_x509if_T_ca_contextType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
 
 static int
 dissect_x509if_T_ca_contextValues_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 184 "../../asn1/x509if/x509if.cnf"
+#line 186 "../../asn1/x509if/x509if.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
 
 
@@ -663,7 +663,7 @@ static const ber_sequence_t AttributeValueAssertion_sequence[] = {
 
 int
 dissect_x509if_AttributeValueAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 406 "../../asn1/x509if/x509if.cnf"
+#line 408 "../../asn1/x509if/x509if.cnf"
 
 	ava_hf_index = hf_index;
 	last_ava = ep_alloc(MAX_AVA_STR_LEN); *last_ava = '\0';
@@ -721,7 +721,7 @@ dissect_x509if_AttributeTypeAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb _
 
 static int
 dissect_x509if_T_type_02(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 190 "../../asn1/x509if/x509if.cnf"
+#line 192 "../../asn1/x509if/x509if.cnf"
   const char *fmt; 
   const char *name;
 
@@ -765,7 +765,7 @@ dissect_x509if_T_type_02(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
 
 static int
 dissect_x509if_T_atadv_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 224 "../../asn1/x509if/x509if.cnf"
+#line 226 "../../asn1/x509if/x509if.cnf"
   int old_offset = offset;
   tvbuff_t	*out_tvb;
   char  	*value = NULL;
@@ -821,7 +821,7 @@ dissect_x509if_T_atadv_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
 
 static int
 dissect_x509if_T_distingAttrValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 328 "../../asn1/x509if/x509if.cnf"
+#line 330 "../../asn1/x509if/x509if.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
 
 
@@ -878,7 +878,7 @@ dissect_x509if_AttributeTypeAndDistinguishedValue(gboolean implicit_tag _U_, tvb
 
 static int
 dissect_x509if_RelativeDistinguishedName_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 358 "../../asn1/x509if/x509if.cnf"
+#line 360 "../../asn1/x509if/x509if.cnf"
 
   if(!rdn_one_value) {
     top_of_rdn = tree;
@@ -906,7 +906,7 @@ static const ber_sequence_t RelativeDistinguishedName_set_of[1] = {
 
 int
 dissect_x509if_RelativeDistinguishedName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 331 "../../asn1/x509if/x509if.cnf"
+#line 333 "../../asn1/x509if/x509if.cnf"
   char *temp_dn;
 
   rdn_one_value = FALSE;
@@ -944,7 +944,7 @@ dissect_x509if_RelativeDistinguishedName(gboolean implicit_tag _U_, tvbuff_t *tv
 
 static int
 dissect_x509if_RDNSequence_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 395 "../../asn1/x509if/x509if.cnf"
+#line 397 "../../asn1/x509if/x509if.cnf"
 
   if(!dn_one_rdn)  {
     /* this is the first element - record the top */
@@ -968,7 +968,7 @@ static const ber_sequence_t RDNSequence_sequence_of[1] = {
 
 int
 dissect_x509if_RDNSequence(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 373 "../../asn1/x509if/x509if.cnf"
+#line 375 "../../asn1/x509if/x509if.cnf"
   const char *fmt; 
 
   dn_one_rdn = FALSE; /* reset */
@@ -1380,7 +1380,7 @@ dissect_x509if_T_attributeType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
 
 static int
 dissect_x509if_T_ra_selectedValues_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 274 "../../asn1/x509if/x509if.cnf"
+#line 276 "../../asn1/x509if/x509if.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
 
 
@@ -1414,7 +1414,7 @@ dissect_x509if_T_entryType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
 
 static int
 dissect_x509if_T_ra_values_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 280 "../../asn1/x509if/x509if.cnf"
+#line 282 "../../asn1/x509if/x509if.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
 
 
@@ -1476,7 +1476,7 @@ dissect_x509if_T_contextType_01(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
 
 static int
 dissect_x509if_T_contextValue_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 319 "../../asn1/x509if/x509if.cnf"
+#line 321 "../../asn1/x509if/x509if.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
 
 
@@ -1577,7 +1577,7 @@ dissect_x509if_T_restrictionType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
 
 static int
 dissect_x509if_T_restrictionValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 325 "../../asn1/x509if/x509if.cnf"
+#line 327 "../../asn1/x509if/x509if.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
 
 
@@ -1698,7 +1698,7 @@ dissect_x509if_T_attributeType_01(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
 
 static int
 dissect_x509if_T_selectedValues_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 289 "../../asn1/x509if/x509if.cnf"
+#line 291 "../../asn1/x509if/x509if.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
 
 
@@ -2900,6 +2900,8 @@ void proto_reg_handoff_x509if(void) {
   register_ber_oid_dissector("2.16.840.1.101.2.2.1.138", dissect_DistinguishedName_PDU, proto_x509if, "id-at-plasServed");
   register_ber_oid_dissector("2.16.840.1.101.2.2.1.139", dissect_DistinguishedName_PDU, proto_x509if, "id-at-deployed");
   register_ber_oid_dissector("2.16.840.1.101.2.2.1.140", dissect_DistinguishedName_PDU, proto_x509if, "id-at-garrison");
+  register_ber_oid_dissector("2.16.840.1.101.2.2.1.184", dissect_DistinguishedName_PDU, proto_x509if, "id-at-aCPDutyOfficer");
+  register_ber_oid_dissector("2.16.840.1.101.2.2.1.188", dissect_DistinguishedName_PDU, proto_x509if, "id-at-primaryMember");
 
 
 /*--- End of included file: packet-x509if-dis-tab.c ---*/
diff --git a/epan/dissectors/packet-x509sat.c b/epan/dissectors/packet-x509sat.c
index 3f9455f4b7..72595d6002 100644
--- a/epan/dissectors/packet-x509sat.c
+++ b/epan/dissectors/packet-x509sat.c
@@ -1504,7 +1504,7 @@ dissect_x509sat_SyntaxIA5String(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
 
 static int
 dissect_x509sat_SyntaxBMPString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 351 "../../asn1/x509sat/x509sat.cnf"
+#line 370 "../../asn1/x509sat/x509sat.cnf"
 	tvbuff_t	*wide_tvb = NULL;
 	char		*string;
 
@@ -1512,7 +1512,7 @@ dissect_x509sat_SyntaxBMPString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
                                             actx, tree, tvb, offset, hf_index,
                                             &wide_tvb);
 
-#line 356 "../../asn1/x509sat/x509sat.cnf"
+#line 375 "../../asn1/x509sat/x509sat.cnf"
 	if (! wide_tvb) {
 		return offset;
 	}
@@ -1626,7 +1626,7 @@ dissect_x509sat_SyntaxGeneralString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
 
 static int
 dissect_x509sat_GUID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 365 "../../asn1/x509sat/x509sat.cnf"
+#line 384 "../../asn1/x509sat/x509sat.cnf"
   gint8 class;
   gboolean pc;
   gint32 tag;
@@ -2758,6 +2758,25 @@ void proto_reg_handoff_x509sat(void) {
   register_ber_oid_dissector("2.16.840.1.101.2.2.1.143", dissect_DirectoryString_PDU, proto_x509sat, "id-at-adminConversion");
   register_ber_oid_dissector("2.16.840.1.101.2.2.1.144", dissect_SyntaxPrintableString_PDU, proto_x509sat, "id-at-tCCG");
   register_ber_oid_dissector("2.16.840.1.101.2.2.1.145", dissect_DirectoryString_PDU, proto_x509sat, "id-at-usdConversion");
+  register_ber_oid_dissector("2.16.840.1.101.2.2.1.158", dissect_DirectoryString_PDU, proto_x509sat, "id-at-aCPRoleInformation");
+  register_ber_oid_dissector("2.16.840.1.101.2.2.1.159", dissect_DirectoryString_PDU, proto_x509sat, "id-at-coalitionGrade");
+  register_ber_oid_dissector("2.16.840.1.101.2.2.1.160", dissect_TelephoneNumber_PDU, proto_x509sat, "id-at-militaryIPPhoneNumber");
+  register_ber_oid_dissector("2.16.840.1.101.2.2.1.161", dissect_ObjectIdentifier_PDU, proto_x509sat, "id-at-fileTypeInfoCapability");
+  register_ber_oid_dissector("2.16.840.1.101.2.2.1.172", dissect_SyntaxPrintableString_PDU, proto_x509sat, "id-at-aCPFunctionalDescription");
+  register_ber_oid_dissector("2.16.840.1.101.2.2.1.173", dissect_SyntaxPrintableString_PDU, proto_x509sat, "id-at-alternatePLAName");
+  register_ber_oid_dissector("2.16.840.1.101.2.2.1.174", dissect_SyntaxGeneralizedTime_PDU, proto_x509sat, "id-at-aCPEntryCreationDate");
+  register_ber_oid_dissector("2.16.840.1.101.2.2.1.175", dissect_SyntaxGeneralizedTime_PDU, proto_x509sat, "id-at-aCPEntryModificationDate");
+  register_ber_oid_dissector("2.16.840.1.101.2.2.1.176", dissect_ObjectIdentifier_PDU, proto_x509sat, "id-at-aCPEntryType");
+  register_ber_oid_dissector("2.16.840.1.101.2.2.1.177", dissect_SyntaxPrintableString_PDU, proto_x509sat, "id-at-aCPEntryEniqueId");
+  register_ber_oid_dissector("2.16.840.1.101.2.2.1.178", dissect_SyntaxPrintableString_PDU, proto_x509sat, "id-at-aCPCitizenship");
+  register_ber_oid_dissector("2.16.840.1.101.2.2.1.179", dissect_SyntaxPrintableString_PDU, proto_x509sat, "id-at-aCPEID");
+  register_ber_oid_dissector("2.16.840.1.101.2.2.1.180", dissect_SyntaxPrintableString_PDU, proto_x509sat, "id-at-aCPCOI");
+  register_ber_oid_dissector("2.16.840.1.101.2.2.1.181", dissect_SyntaxPrintableString_PDU, proto_x509sat, "id-at-aCPPublishTo");
+  register_ber_oid_dissector("2.16.840.1.101.2.2.1.182", dissect_SyntaxPrintableString_PDU, proto_x509sat, "id-at-aCPSvcApps");
+  register_ber_oid_dissector("2.16.840.1.101.2.2.1.183", dissect_SyntaxPrintableString_PDU, proto_x509sat, "id-at-aCPDirectoinsTo");
+  register_ber_oid_dissector("2.16.840.1.101.2.2.1.185", dissect_SyntaxPrintableString_PDU, proto_x509sat, "id-at-aCPLatitude");
+  register_ber_oid_dissector("2.16.840.1.101.2.2.1.186", dissect_SyntaxPrintableString_PDU, proto_x509sat, "id-at-aCPLocationMap");
+  register_ber_oid_dissector("2.16.840.1.101.2.2.1.187", dissect_SyntaxPrintableString_PDU, proto_x509sat, "id-at-aCPLongitude");
   register_ber_oid_dissector("1.2.840.113549.1.9.1", dissect_SyntaxIA5String_PDU, proto_x509sat, "pkcs-9-at-emailAddress");
   register_ber_oid_dissector("1.2.840.113549.1.9.7", dissect_DirectoryString_PDU, proto_x509sat, "pkcs-9-at-challengePassword");
   register_ber_oid_dissector("1.2.840.113549.1.9.8", dissect_DirectoryString_PDU, proto_x509sat, "pkcs-9-at-unstructuredAddress");