Renamed x411 to p1, x420 to p22 and s4406 to p772 to be consistent

on the naming policy for X.400 protocols.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36013 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 51 insertions, 51 deletions

diff --git a/asn1/p7/p7.cnf b/asn1/p7/p7.cnf
index 740cf0772d..487f6f7c2e 100644
--- a/asn1/p7/p7.cnf
+++ b/asn1/p7/p7.cnf
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-#.IMPORT ../x411/x411-exp.cnf
+#.IMPORT ../p1/p1-exp.cnf
 #.IMPORT ../ros/ros-exp.cnf
 #.IMPORT ../rtse/rtse-exp.cnf
 
@@ -220,80 +220,80 @@ AutoActionError			B	"2.6.4.3.46"	"id-att-auto-action-error"
 #Integer				B	"2.6.4.3.47"	"id-att-auto-action-registration-identifier" - see XXX
 SequenceNumber			B	"2.6.4.3.48"	"id-att-auto-action-subject-entry"
 AutoActionType			B	"2.6.4.3.49"	"id-att-auto-action-type"
-#CertificateSelectors	B	"2.6.4.3.80"	"id-att-certificate-selectors" - see x411.cnf
+#CertificateSelectors	B	"2.6.4.3.80"	"id-att-certificate-selectors" - see p1.cnf
 SequenceNumber			B	"2.6.4.3.0"		"id-att-child-sequence-numbers"
 #Content				B	"2.6.4.3.1"		"id-att-content" - see XXX
 #AlgorithmIdentifier	B	"2.6.4.3.2"		"id-att-content-confidentiality-algorithm-identifier" - see XXX
-#ContentCorrelator		B	"2.6.4.3.3"		"id-att-content-correlator" - see x411.cnf
-#ContentIdentifier		B	"2.6.4.3.4"		"id-att-content-identifier" - see x411.cnf
-#ContentIntegrityCheck	B	"2.6.4.3.5"		"id-att-content-inetgrity-check" - see x411.cnf
-#ContentLength			B	"2.6.4.3.6"		"id-att-content-length" - see x411.cnf
+#ContentCorrelator		B	"2.6.4.3.3"		"id-att-content-correlator" - see p1.cnf
+#ContentIdentifier		B	"2.6.4.3.4"		"id-att-content-identifier" - see p1.cnf
+#ContentIntegrityCheck	B	"2.6.4.3.5"		"id-att-content-inetgrity-check" - see p1.cnf
+#ContentLength			B	"2.6.4.3.6"		"id-att-content-length" - see p1.cnf
 #Boolean				B	"2.6.4.3.7"		"id-att-content-returned" - see XXX
-#ExtendedContentType	B	"2.6.4.3.8"		"id-att-content-type" - see x411.cnf
-#ConversionWithLossProhibited		B	"2.6.4.3.9"	"id-att-conversion-with-loss-prohibited" - see x411.cnf
+#ExtendedContentType	B	"2.6.4.3.8"		"id-att-content-type" - see p1.cnf
+#ConversionWithLossProhibited		B	"2.6.4.3.9"	"id-att-conversion-with-loss-prohibited" - see p1.cnf
 MS-EIT								B	"2.6.4.3.10"	"id-att-converted-EITs"
 CreationTime						B	"2.6.4.3.11"	"id-att-creation-time"
 DeferredDeliveryCancellationTime	B	"2.6.4.3.50"	"id-att-deferred-delivery-cancellation-time"
-#DeferredDeliveryTime				B	"2.6.4.3.51"	"id-att-deferred-delivery-time" - see x411.cnf
+#DeferredDeliveryTime				B	"2.6.4.3.51"	"id-att-deferred-delivery-time" - see p1.cnf
 DeletionTime						B	"2.6.4.3.52"	"id-att-deletion-time"
 MS-EIT								B	"2.6.4.3.12"	"id-att-delivered-EITs"
-#DeliveryFlags						B	"2.6.4.3.13"	"id-att-delivery-flags" - see x411.cnf
-#ORName								B	"2.6.4.3.78"	"id-att-dl-exempted-recipients" - see x411.cnf
-#DLExpansion						B	"2.6.4.3.14"	"id-att-dl-expansion-history" - see x411.cnf
-#DLExpansionProhibited				B	"2.6.4.3.53"	"id-att-dl-expansion-prohibited" - see x411.cnf
+#DeliveryFlags						B	"2.6.4.3.13"	"id-att-delivery-flags" - see p1.cnf
+#ORName								B	"2.6.4.3.78"	"id-att-dl-exempted-recipients" - see p1.cnf
+#DLExpansion						B	"2.6.4.3.14"	"id-att-dl-expansion-history" - see p1.cnf
+#DLExpansionProhibited				B	"2.6.4.3.53"	"id-att-dl-expansion-prohibited" - see p1.cnf
 EntryType							B	"2.6.4.3.16"	"id-att-entry-type"
-#InternalTraceInformationElement	B	"2.6.4.3.54"	"id-att-internal-trace-information" - see x411.cnf
-#LatestDeliveryTime					B	"2.6.4.3.55"	"id-att-latest-delivery-time" - see x411.cnf
+#InternalTraceInformationElement	B	"2.6.4.3.54"	"id-att-internal-trace-information" - see p1.cnf
+#LatestDeliveryTime					B	"2.6.4.3.55"	"id-att-latest-delivery-time" - see p1.cnf
 #NULL								B	"2.6.4.3.77"	"id-att-locally-originated - see XXX
 #NULL								B	"2.6.4.3.56"	"id-att-marked-for-deletion" - see XXX
-#MessageDeliveryEnvelope			B	"2.6.4.3.18"	"id-att-message-delivery-envelope" - see x411.cnf
-#MessageDeliveryTime				B	"2.6.4.3.20"	"id-att-message-delivery-time" - see x411.cnf
+#MessageDeliveryEnvelope			B	"2.6.4.3.18"	"id-att-message-delivery-envelope" - see p1.cnf
+#MessageDeliveryTime				B	"2.6.4.3.20"	"id-att-message-delivery-time" - see p1.cnf
 MessageGroupName					B	"2.6.4.3.57"	"id-att-message-group-name"
-#MTSIdentifier						B	"2.6.4.3.19"	"id-att-message-identifier" - see x411.cnf
+#MTSIdentifier						B	"2.6.4.3.19"	"id-att-message-identifier" - see p1.cnf
 #GeneralString						B	"2.6.4.3.58"	"id-att-message-notes" - see XXX
-#MessageOriginAuthenticationCheck	B	"2.6.4.3.21"	"id-at-message-orgin-authentication-check" - see x411.cnf
-#MessageSecurityLabel				B	"2.6.4.3.22"	"id-att-message-security-label" - see x411.cnf
-#MessageSubmissionEnvelope			B	"2.6.4.3.59"	"id-att-message-submission-envelope" - see x411.cnf
+#MessageOriginAuthenticationCheck	B	"2.6.4.3.21"	"id-at-message-orgin-authentication-check" - see p1.cnf
+#MessageSecurityLabel				B	"2.6.4.3.22"	"id-att-message-security-label" - see p1.cnf
+#MessageSubmissionEnvelope			B	"2.6.4.3.59"	"id-att-message-submission-envelope" - see p1.cnf
 #MessageSubmissionTime				B	"2.6.4.3.23"	"id-att-message-submission-time"
 #MessageToken						B	"2.6.4.3.24"	"id-att-message-token"
 #NULL								B	"2.6.4.3.60"	"id-att-ms-originated"
 SubmissionError						B	"2.6.4.3.61"	"id-att-ms-submission-error"
-#ExtendedCertificates				B	"2.6.4.3.81"	"id-att-multiple-originator-certificates" - see x411.cnf
+#ExtendedCertificates				B	"2.6.4.3.81"	"id-att-multiple-originator-certificates" - see p1.cnf
 MS-EIT								B	"2.6.4.3.25"	"id-att-original-EITs"
-#ORName								B	"2.6.4.3.17"	"id-att-originally-intended-recipient-name" - see x411.cnf
-#OriginatingMTACertificate			B	"2.6.4.3.62"	"id-att-originating-MTA-certificate" - see x411.cnf
-#OriginatorCertificate				B	"2.6.4.3.26"	"id-att-originator-certificate" - see x411.cnf
-#ORName								B	"2.6.4.3.27"	"id-att-originator-name" - see x411.cnf
-#OriginatorReportRequest			B	"2.6.4.3.63"	"id-att-originator-report-request" - see x411.cnf
-#OriginatorReturnAddress			B	"2.6.4.3.64"	"id-att-originator-return-address" - see x411.cnf
-#ORName								B	"2.6.4.3.28"	"id-att-other-recipient-names" - see x411.cnf
+#ORName								B	"2.6.4.3.17"	"id-att-originally-intended-recipient-name" - see p1.cnf
+#OriginatingMTACertificate			B	"2.6.4.3.62"	"id-att-originating-MTA-certificate" - see p1.cnf
+#OriginatorCertificate				B	"2.6.4.3.26"	"id-att-originator-certificate" - see p1.cnf
+#ORName								B	"2.6.4.3.27"	"id-att-originator-name" - see p1.cnf
+#OriginatorReportRequest			B	"2.6.4.3.63"	"id-att-originator-report-request" - see p1.cnf
+#OriginatorReturnAddress			B	"2.6.4.3.64"	"id-att-originator-return-address" - see p1.cnf
+#ORName								B	"2.6.4.3.28"	"id-att-other-recipient-names" - see p1.cnf
 SequenceNumber						B	"2.6.4.3.29"	"id-att-parent-sequence-number"
-#PerMessageIndicators				B	"2.6.4.3.65"	"id-att-per-message-indicators" - see x411.cnf
-#PerRecipientMessageSubmissionFields	B	"2.6.4.3.66"	"id-att-per-recipient-message-submission-fields" - see x411.cnf
-#PerRecipientProbeSubmissionFields	B	"2.6.4.3.67"	"id-att-per-recipient-probe-submission-fields" - see x411.cnf
-#PerRecipientReportDeliveryFields	B	"2.6.4.3.30"	"id-att-per-recipient-report-delivery-fields" - see x411.cnf
-#Priority							B	"2.6.4.3.31"	"id-att-priority" - see x411.cnf
-#ProbeOriginAuthenticationCheck	B	"2.6.4.3.68"	"id-att-probe-origin-authentication-check" - see x411.cnf
-#ProbeSubmissionEnvelope	B	"2.6.4.3.69"	"id-att-probe-submission-envelope" - see x411.cnf
-#ProofOfDeliveryRequest	B	"2.6.4.3.32"	"id-att-proof-of-delivery-request" - see x411.cnf
-#ProofOfSubmission	B	"2.6.4.3.70"	"id-att-proof-of-submission" - see x411.cnf
-#ExtendedCertificates	B	"2.6.4.3.82"	"id-att-recipient-certificate" - see x411.cnf
-#ORName			B	"2.6.4.3.71"	"id-att-recipient-names" - see x411.cnf
-#RecipientReassignmentProhibited	B	"2.6.4.3.72"	"id-att-recipient-reassignment-prohibited" - see x411.cnf
-#Redirection		B	"2.6.4.3.33"	"id-at-redirection-history" - see x411.cnf
-#ReportDeliveryEnvelope	B	"2.6.4.3.34"	"id-att-report-delivery-envelope" - see x411.cnf
-#ReportingDLName	B	"2.6.4.3.35"	"id-att-reporting-DL-name" - see x411.cnf
-#ReportingMTACertificate	B	"2.6.4.3.36"	"id-att-reporting-MTA-certificate" - see x411.cnf
-#ReportOriginAuthenticationCheck	B	"2.6.4.3.37"	"id-att-report-origin-authentication-check" - see x411.cnf
+#PerMessageIndicators				B	"2.6.4.3.65"	"id-att-per-message-indicators" - see p1.cnf
+#PerRecipientMessageSubmissionFields	B	"2.6.4.3.66"	"id-att-per-recipient-message-submission-fields" - see p1.cnf
+#PerRecipientProbeSubmissionFields	B	"2.6.4.3.67"	"id-att-per-recipient-probe-submission-fields" - see p1.cnf
+#PerRecipientReportDeliveryFields	B	"2.6.4.3.30"	"id-att-per-recipient-report-delivery-fields" - see p1.cnf
+#Priority							B	"2.6.4.3.31"	"id-att-priority" - see p1.cnf
+#ProbeOriginAuthenticationCheck	B	"2.6.4.3.68"	"id-att-probe-origin-authentication-check" - see p1.cnf
+#ProbeSubmissionEnvelope	B	"2.6.4.3.69"	"id-att-probe-submission-envelope" - see p1.cnf
+#ProofOfDeliveryRequest	B	"2.6.4.3.32"	"id-att-proof-of-delivery-request" - see p1.cnf
+#ProofOfSubmission	B	"2.6.4.3.70"	"id-att-proof-of-submission" - see p1.cnf
+#ExtendedCertificates	B	"2.6.4.3.82"	"id-att-recipient-certificate" - see p1.cnf
+#ORName			B	"2.6.4.3.71"	"id-att-recipient-names" - see p1.cnf
+#RecipientReassignmentProhibited	B	"2.6.4.3.72"	"id-att-recipient-reassignment-prohibited" - see p1.cnf
+#Redirection		B	"2.6.4.3.33"	"id-at-redirection-history" - see p1.cnf
+#ReportDeliveryEnvelope	B	"2.6.4.3.34"	"id-att-report-delivery-envelope" - see p1.cnf
+#ReportingDLName	B	"2.6.4.3.35"	"id-att-reporting-DL-name" - see p1.cnf
+#ReportingMTACertificate	B	"2.6.4.3.36"	"id-att-reporting-MTA-certificate" - see p1.cnf
+#ReportOriginAuthenticationCheck	B	"2.6.4.3.37"	"id-att-report-origin-authentication-check" - see p1.cnf
 RetrievalStatus		B	"2.6.4.3.15"	"id-att-retrieval-status"
-#SecurityClassification	B	"2.6.4.3.38"	"id-att-security-classification" - see x411.cnf
+#SecurityClassification	B	"2.6.4.3.38"	"id-att-security-classification" - see p1.cnf
 SequenceNumber		B	"2.6.4.3.39"	"id-att-sequence-number"
 SignatureVerificationStatus	B	"2.6.4.3.79"	"id-att-signature-verification-status"
 StoragePeriod		B	"2.6.4.3.73"	"id-att-storage-period"
 StorageTime		B	"2.6.4.3.74"	"id-att-storage-time"
-#SubjectSubmissionIdentifier	B	"2.6.4.3.40"	"id-att-subject-submission-identifier" - see x411.cnf
-#ORName			B	"2.6.4.3.41"	"id-att-this-recipient-name" - see x411.cnf
-#TraceInformationElement	B	"2.6.4.3.75"	"id-att-trace-information" - see x411.cnf
+#SubjectSubmissionIdentifier	B	"2.6.4.3.40"	"id-att-subject-submission-identifier" - see p1.cnf
+#ORName			B	"2.6.4.3.41"	"id-att-this-recipient-name" - see p1.cnf
+#TraceInformationElement	B	"2.6.4.3.75"	"id-att-trace-information" - see p1.cnf
 
 #MSExtensions
 ChangeCredentialsAlgorithms			B	"2.6.4.9.5"	"id-ext-protected-change-credentials-capability"
@@ -370,7 +370,7 @@ RTSE-apdus	B	"2.6.0.2.10""id-as-ms-rtse"
 	
 	%(DEFAULT_BODY)s
 
-	if (check_col(actx->pinfo->cinfo, COL_INFO) && (ora = x411_get_last_oraddress())) {
+	if (check_col(actx->pinfo->cinfo, COL_INFO) && (ora = p1_get_last_oraddress())) {
 		col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (initiator=%%s)", ora);
 	}