as2wrs now handles EXTERNAL(direct-reference requires no special handling).

svn path=/trunk/; revision=23386

3 files changed, 79 insertions, 86 deletions

diff --git a/asn1/x411/Makefile.common b/asn1/x411/Makefile.common
index 81f8127bc2..8052ff7137 100644
--- a/asn1/x411/Makefile.common
+++ b/asn1/x411/Makefile.common
@@ -48,15 +48,11 @@ SRC_FILES = \
 A2W_FLAGS= -b -e -X -T
 
 EXTRA_CNF= \
-	../acse/acse-exp.cnf \
 	../x509af/x509af-exp.cnf \
 	../x509ce/x509ce-exp.cnf \
 	../x509if/x509if-exp.cnf \
 	../x509sat/x509sat-exp.cnf
 
-../acse/acse-exp.cnf:
-	(cd ../acse && $(MAKE_CNF_EXPORT))
-
 ../x509af/x509af-exp.cnf:
 	(cd ../x509af && $(MAKE_CNF_EXPORT))
 
diff --git a/asn1/x411/x411.asn b/asn1/x411/x411.asn
index 75c06b9020..ff901e7743 100644
--- a/asn1/x411/x411.asn
+++ b/asn1/x411/x411.asn
@@ -75,10 +75,7 @@ IMPORTS
   Certificates, AlgorithmIdentifier
     --==
     FROM AuthenticationFramework {joint-iso-itu-t ds(5) module(1)
-      authenticationFramework(7) 3} 
-  EXTERNALt
-    --==
-    FROM ACSE-1;
+      authenticationFramework(7) 3};
 
 
 --	Objects
@@ -3019,7 +3016,7 @@ EncryptionKey ::= BIT STRING
 --  IDENTIFIED BY  4
 --}
 
-BindTokenEncryptedData ::= EXTERNALt
+BindTokenEncryptedData ::= EXTERNAL
 
 --	Security Label
 SecurityLabel ::= SET {
diff --git a/asn1/x411/x411.cnf b/asn1/x411/x411.cnf
index 59598d4a88..15e4ef9dc7 100644
--- a/asn1/x411/x411.cnf
+++ b/asn1/x411/x411.cnf
@@ -2,7 +2,6 @@
 CountryName 	TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x411_CountryName_U_vals)  BITMASK = 0
 Time			TYPE = FT_STRING  DISPLAY = BASE_NONE  STRING = NULL BITMASK = 0
 
-#.IMPORT ../acse/acse-exp.cnf
 #.IMPORT ../x509ce/x509ce-exp.cnf
 #.IMPORT ../x509if/x509if-exp.cnf
 #.IMPORT ../x509sat/x509sat-exp.cnf
@@ -17,6 +16,7 @@ ExtendedContentType
 G3FacsimileNonBasicParameters
 MessageDeliveryIdentifier
 MessageDeliveryTime
+MessageSecurityLabel
 MessageSubmissionEnvelope
 ORAddress
 ORName
@@ -142,94 +142,94 @@ MTABindError
 MTS-APDU
 
 #.REGISTER
-RecipientReassignmentProhibited N x411.extension 1
-MTSOriginatorRequestedAlternateRecipient N x411.extension 2
-DLExpansionProhibited N x411.extension 3
-ConversionWithLossProhibited N x411.extension 4
-LatestDeliveryTime N x411.extension 5
-RequestedDeliveryMethod N x411.extension 6
-PhysicalForwardingProhibited N x411.extension 7
-PhysicalForwardingAddressRequest N x411.extension 8
-PhysicalDeliveryModes N x411.extension 9
-RegisteredMailType N x411.extension 10
-RecipientNumberForAdvice N x411.extension 11
-PhysicalRenditionAttributes N x411.extension 12
-OriginatorReturnAddress N x411.extension 13
-PhysicalDeliveryReportRequest N x411.extension 14
-OriginatorCertificate N x411.extension 15
-MessageToken N x411.extension 16
-ContentConfidentialityAlgorithmIdentifier N x411.extension 17
-ContentIntegrityCheck N x411.extension 18
-MessageOriginAuthenticationCheck N x411.extension 19
-MessageSecurityLabel N x411.extension 20
-ProofOfSubmissionRequest N x411.extension 21
-ProofOfDeliveryRequest N x411.extension 22
-ContentCorrelator N x411.extension 23
-ProbeOriginAuthenticationCheck N x411.extension 24
-RedirectionHistory N x411.extension 25
-DLExpansionHistory N x411.extension 26
-PhysicalForwardingAddress N x411.extension 27
-RecipientCertificate N x411.extension 28
-ProofOfDelivery N x411.extension 29
-OriginatorAndDLExpansionHistory N x411.extension 30
-ReportingDLName N x411.extension 31
-ReportingMTACertificate N x411.extension 32
-ReportOriginAuthenticationCheck N x411.extension 33
-ProofOfSubmission N x411.extension 35
-
-TraceInformation N x411.extension 37
-InternalTraceInformation N x411.extension 38
-ReportingMTAName N x411.extension 39
-ExtendedCertificates N x411.extension 40
-
-DLExemptedRecipients N x411.extension 42
-
-CertificateSelectors N x411.extension 45
-
-CommonName N x411.extension-attribute 1
-TeletexCommonName N x411.extension-attribute 2
-TeletexOrganizationName N x411.extension-attribute 3
-TeletexPersonalName N x411.extension-attribute 4
-TeletexOrganizationalUnitNames N x411.extension-attribute 5
-
-PDSName N x411.extension-attribute 7
-PhysicalDeliveryCountryName N x411.extension-attribute 8
-PostalCode N x411.extension-attribute 9
-PhysicalDeliveryOfficeName N x411.extension-attribute 10
-
-UniversalCommonName N x411.extension-attribute 24
-UniversalOrganizationName N x411.extension-attribute 25
-UniversalPersonalName N x411.extension-attribute 26
-UniversalOrganizationalUnitNames N x411.extension-attribute 27
+RecipientReassignmentProhibited				N x411.extension 1
+MTSOriginatorRequestedAlternateRecipient	N x411.extension 2
+DLExpansionProhibited						N x411.extension 3
+ConversionWithLossProhibited				N x411.extension 4
+LatestDeliveryTime							N x411.extension 5
+RequestedDeliveryMethod						N x411.extension 6
+PhysicalForwardingProhibited				N x411.extension 7
+PhysicalForwardingAddressRequest			N x411.extension 8
+PhysicalDeliveryModes						N x411.extension 9
+RegisteredMailType							N x411.extension 10
+RecipientNumberForAdvice					N x411.extension 11
+PhysicalRenditionAttributes					N x411.extension 12
+OriginatorReturnAddress						N x411.extension 13
+PhysicalDeliveryReportRequest				N x411.extension 14
+OriginatorCertificate						N x411.extension 15
+MessageToken								N x411.extension 16
+ContentConfidentialityAlgorithmIdentifier	N x411.extension 17
+ContentIntegrityCheck						N x411.extension 18
+MessageOriginAuthenticationCheck			N x411.extension 19
+MessageSecurityLabel						N x411.extension 20
+ProofOfSubmissionRequest					N x411.extension 21
+ProofOfDeliveryRequest						N x411.extension 22
+ContentCorrelator							N x411.extension 23
+ProbeOriginAuthenticationCheck				N x411.extension 24
+RedirectionHistory							N x411.extension 25
+DLExpansionHistory							N x411.extension 26
+PhysicalForwardingAddress					N x411.extension 27
+RecipientCertificate						N x411.extension 28
+ProofOfDelivery								N x411.extension 29
+OriginatorAndDLExpansionHistory				N x411.extension 30
+ReportingDLName								N x411.extension 31
+ReportingMTACertificate						N x411.extension 32
+ReportOriginAuthenticationCheck				N x411.extension 33
+ProofOfSubmission							N x411.extension 35
+
+TraceInformation							N x411.extension 37
+InternalTraceInformation					N x411.extension 38
+ReportingMTAName							N x411.extension 39
+ExtendedCertificates						N x411.extension 40
+
+DLExemptedRecipients						N x411.extension 42
+
+CertificateSelectors						N x411.extension 45
+
+CommonName									N x411.extension-attribute 1
+TeletexCommonName							N x411.extension-attribute 2
+TeletexOrganizationName						N x411.extension-attribute 3
+TeletexPersonalName							N x411.extension-attribute 4
+TeletexOrganizationalUnitNames				N x411.extension-attribute 5
+
+PDSName										N x411.extension-attribute 7
+PhysicalDeliveryCountryName					N x411.extension-attribute 8
+PostalCode									N x411.extension-attribute 9
+PhysicalDeliveryOfficeName					N x411.extension-attribute 10
+
+UniversalCommonName							N x411.extension-attribute 24
+UniversalOrganizationName					N x411.extension-attribute 25
+UniversalPersonalName						N x411.extension-attribute 26
+UniversalOrganizationalUnitNames			N x411.extension-attribute 27
 
 ReportDeliveryArgument	B	"2.6.1.4.14"	"id-et-report"
 
-AsymmetricToken		B	"2.6.3.6.0"	"id-tok-asymmetricToken"
+AsymmetricToken			B	"2.6.3.6.0"	"id-tok-asymmetricToken"
 MTANameAndOptionalGDI	B	"2.6.5.6.0"	"id-on-mtaName"
 
-BindTokenSignedData	N	x411.tokendata 1
-MessageTokenSignedData	N	x411.tokendata 2
+BindTokenSignedData			N	x411.tokendata 1
+MessageTokenSignedData		N	x411.tokendata 2
 # the next two are unlikely to ever be seen (unless in a bad encoding)
-MessageTokenEncryptedData N	x411.tokendata 3
-BindTokenEncryptedData	N	x411.tokendata 4
+MessageTokenEncryptedData	N	x411.tokendata 3
+BindTokenEncryptedData		N	x411.tokendata 4
 
 # X402 - see master list in acp133.cnf
 
-ContentLength B "2.6.5.2.0" "id-at-mhs-maximum-content-length"
-ExtendedContentType B "2.6.5.2.1" "id-at-mhs-deliverable-content-types"
-ExtendedEncodedInformationType B "2.6.5.2.2" "id-at-mhs-exclusively-acceptable-eits"
-ORName B "2.6.5.2.3" "id-at-mhs-dl-members"
-ORAddress B "2.6.5.2.6" "id-at-mhs-or-addresses"
-ExtendedContentType B "2.6.5.2.9" "id-at-mhs-supported-content-types"
-ORName B "2.6.5.2.12" "id-at-mhs-dl-archive-service"
-ORName B "2.6.5.2.15" "id-at-mhs-dl-subscription-service"
-ExtendedEncodedInformationType B "2.6.5.2.17" "id-at-mhs-acceptable-eits"
-ExtendedEncodedInformationType B "2.6.5.2.18" "id-at-mhs-unacceptable-eits"
+ContentLength					B "2.6.5.2.0" "id-at-mhs-maximum-content-length"
+ExtendedContentType				B "2.6.5.2.1" "id-at-mhs-deliverable-content-types"
+ExtendedEncodedInformationType	B "2.6.5.2.2" "id-at-mhs-exclusively-acceptable-eits"
+ORName							B "2.6.5.2.3" "id-at-mhs-dl-members"
+ORAddress						B "2.6.5.2.6" "id-at-mhs-or-addresses"
+ExtendedContentType				B "2.6.5.2.9" "id-at-mhs-supported-content-types"
+ORName							B "2.6.5.2.12" "id-at-mhs-dl-archive-service"
+ORName							B "2.6.5.2.15" "id-at-mhs-dl-subscription-service"
+ExtendedEncodedInformationType	B "2.6.5.2.17" "id-at-mhs-acceptable-eits"
+ExtendedEncodedInformationType	B "2.6.5.2.18" "id-at-mhs-unacceptable-eits"
 
 
 # ACP133 - see master list in acp133.cnf
-ORName B "2.16.840.1.101.2.1.5.47" "id-at-aLExemptedAddressProcessor"
-ORAddress B "2.16.840.1.101.2.2.1.134.1" "id-at-collective-mhs-or-addresses"
+ORName							B "2.16.840.1.101.2.1.5.47" "id-at-aLExemptedAddressProcessor"
+ORAddress						B "2.16.840.1.101.2.2.1.134.1" "id-at-collective-mhs-or-addresses"
 
 #.FN_BODY AdditionalInformation
    proto_item *item = NULL;