Try to fix unused code warnings.

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

3 files changed, 1115 insertions, 1128 deletions

diff --git a/asn1/x509sat/SelectedAttributeTypes.asn b/asn1/x509sat/SelectedAttributeTypes.asn
index 140f42beae..6b5bfb07df 100644
--- a/asn1/x509sat/SelectedAttributeTypes.asn
+++ b/asn1/x509sat/SelectedAttributeTypes.asn
@@ -51,173 +51,173 @@ DirectoryString ::= CHOICE {
 
 
 -- Attribute types 
--- knowledgeInformation ATTRIBUTE ::= {
---   WITH SYNTAX             DirectoryString {ub-knowledge-information}
---   EQUALITY MATCHING RULE  caseIgnoreMatch
---   ID                      id-at-knowledgeInformation
--- }
--- 
--- name ATTRIBUTE ::= {
---   WITH SYNTAX               DirectoryString {ub-name}
---   EQUALITY MATCHING RULE    caseIgnoreMatch
---   SUBSTRINGS MATCHING RULE  caseIgnoreSubstringsMatch
---   ID                        id-at-name
--- }
--- 
--- commonName ATTRIBUTE ::= {
---   SUBTYPE OF   name
---   WITH SYNTAX  DirectoryString {ub-common-name}
---   ID           id-at-commonName
--- }
--- 
--- surname ATTRIBUTE ::= {
---   SUBTYPE OF   name
---   WITH SYNTAX  DirectoryString {ub-surname}
---   ID           id-at-surname
--- }
--- 
--- givenName ATTRIBUTE ::= {
---   SUBTYPE OF   name
---   WITH SYNTAX  DirectoryString {ub-name}
---   ID           id-at-givenName
--- }
--- 
--- initials ATTRIBUTE ::= {
---   SUBTYPE OF   name
---   WITH SYNTAX  DirectoryString {ub-name}
---   ID           id-at-initials
--- }
--- 
--- generationQualifier ATTRIBUTE ::= {
---   SUBTYPE OF   name
---   WITH SYNTAX  DirectoryString {ub-name}
---   ID           id-at-generationQualifier
--- }
--- 
--- uniqueIdentifier ATTRIBUTE ::= {
---   WITH SYNTAX             UniqueIdentifier
---   EQUALITY MATCHING RULE  bitStringMatch
---   ID                      id-at-uniqueIdentifier
--- }
+ knowledgeInformation ATTRIBUTE ::= {
+   WITH SYNTAX             DirectoryString {ub-knowledge-information}
+   EQUALITY MATCHING RULE  caseIgnoreMatch
+   ID                      id-at-knowledgeInformation
+ }
+ 
+ name ATTRIBUTE ::= {
+   WITH SYNTAX               DirectoryString {ub-name}
+   EQUALITY MATCHING RULE    caseIgnoreMatch
+   SUBSTRINGS MATCHING RULE  caseIgnoreSubstringsMatch
+   ID                        id-at-name
+ }
+ 
+ commonName ATTRIBUTE ::= {
+   SUBTYPE OF   name
+   WITH SYNTAX  DirectoryString {ub-common-name}
+   ID           id-at-commonName
+ }
+ 
+ surname ATTRIBUTE ::= {
+   SUBTYPE OF   name
+   WITH SYNTAX  DirectoryString {ub-surname}
+   ID           id-at-surname
+ }
+ 
+ givenName ATTRIBUTE ::= {
+   SUBTYPE OF   name
+   WITH SYNTAX  DirectoryString {ub-name}
+   ID           id-at-givenName
+ }
+ 
+ initials ATTRIBUTE ::= {
+   SUBTYPE OF   name
+   WITH SYNTAX  DirectoryString {ub-name}
+   ID           id-at-initials
+ }
+ 
+ generationQualifier ATTRIBUTE ::= {
+   SUBTYPE OF   name
+   WITH SYNTAX  DirectoryString {ub-name}
+   ID           id-at-generationQualifier
+ }
+ 
+ uniqueIdentifier ATTRIBUTE ::= {
+   WITH SYNTAX             UniqueIdentifier
+   EQUALITY MATCHING RULE  bitStringMatch
+   ID                      id-at-uniqueIdentifier
+ }
 
 UniqueIdentifier ::= BIT STRING
 
--- dnQualifier ATTRIBUTE ::= {
---   WITH SYNTAX               PrintableString
---   EQUALITY MATCHING RULE    caseIgnoreMatch
---   ORDERING MATCHING RULE    caseIgnoreOrderingMatch
---   SUBSTRINGS MATCHING RULE  caseIgnoreSubstringsMatch
---   ID                        id-at-dnQualifier
--- }
--- 
--- serialNumber ATTRIBUTE ::= {
---   WITH SYNTAX               PrintableString(SIZE (1..ub-serial-number))
---   EQUALITY MATCHING RULE    caseIgnoreMatch
---   SUBSTRINGS MATCHING RULE  caseIgnoreSubstringsMatch
---   ID                        id-at-serialNumber
--- }
--- 
--- pseudonym ATTRIBUTE ::= {
---   SUBTYPE OF   name
---   WITH SYNTAX  DirectoryString {ub-pseudonym}
---   ID           id-at-pseudonym
--- }
--- 
--- countryName ATTRIBUTE ::= {
---   SUBTYPE OF    name
---   WITH SYNTAX   CountryName
---   SINGLE VALUE  TRUE
---   ID            id-at-countryName
--- }
+ dnQualifier ATTRIBUTE ::= {
+   WITH SYNTAX               PrintableString
+   EQUALITY MATCHING RULE    caseIgnoreMatch
+   ORDERING MATCHING RULE    caseIgnoreOrderingMatch
+   SUBSTRINGS MATCHING RULE  caseIgnoreSubstringsMatch
+   ID                        id-at-dnQualifier
+ }
+ 
+ serialNumber ATTRIBUTE ::= {
+   WITH SYNTAX               PrintableString(SIZE (1..ub-serial-number))
+   EQUALITY MATCHING RULE    caseIgnoreMatch
+   SUBSTRINGS MATCHING RULE  caseIgnoreSubstringsMatch
+   ID                        id-at-serialNumber
+ }
+ 
+ pseudonym ATTRIBUTE ::= {
+   SUBTYPE OF   name
+   WITH SYNTAX  DirectoryString {ub-pseudonym}
+   ID           id-at-pseudonym
+ }
+ 
+ countryName ATTRIBUTE ::= {
+   SUBTYPE OF    name
+   WITH SYNTAX   CountryName
+   SINGLE VALUE  TRUE
+   ID            id-at-countryName
+ }
 
 CountryName ::= PrintableString 
 --   ISO 3166 codes only
---                                
--- 
--- localityName ATTRIBUTE ::= {
---   SUBTYPE OF   name
---   WITH SYNTAX  DirectoryString {ub-locality-name}
---   ID           id-at-localityName
--- }
--- 
--- collectiveLocalityName ATTRIBUTE ::= {
---   SUBTYPE OF  localityName
---   COLLECTIVE  TRUE
---   ID          id-at-collectiveLocalityName
--- }
--- 
--- stateOrProvinceName ATTRIBUTE ::= {
---   SUBTYPE OF   name
---   WITH SYNTAX  DirectoryString {ub-state-name}
---   ID           id-at-stateOrProvinceName
--- }
--- 
--- collectiveStateOrProvinceName ATTRIBUTE ::= {
---   SUBTYPE OF  stateOrProvinceName
---   COLLECTIVE  TRUE
---   ID          id-at-collectiveStateOrProvinceName
--- }
--- 
--- streetAddress ATTRIBUTE ::= {
---   WITH SYNTAX               DirectoryString {ub-street-address}
---   EQUALITY MATCHING RULE    caseIgnoreMatch
---   SUBSTRINGS MATCHING RULE  caseIgnoreSubstringsMatch
---   ID                        id-at-streetAddress
--- }
--- 
--- collectiveStreetAddress ATTRIBUTE ::= {
---   SUBTYPE OF  streetAddress
---   COLLECTIVE  TRUE
---   ID          id-at-collectiveStreetAddress
--- }
--- 
--- houseIdentifier ATTRIBUTE ::= {
---   WITH SYNTAX               DirectoryString {ub-name}
---   EQUALITY MATCHING RULE    caseIgnoreMatch
---   SUBSTRINGS MATCHING RULE  caseIgnoreSubstringsMatch
---   ID                        id-at-houseIdentifier
--- }
--- 
--- organizationName ATTRIBUTE ::= {
---   SUBTYPE OF   name
---   WITH SYNTAX  DirectoryString {ub-organization-name}
---   ID           id-at-organizationName
--- }
--- 
--- collectiveOrganizationName ATTRIBUTE ::= {
---   SUBTYPE OF  organizationName
---   COLLECTIVE  TRUE
---   ID          id-at-collectiveOrganizationName
--- }
--- 
--- organizationalUnitName ATTRIBUTE ::= {
---   SUBTYPE OF   name
---   WITH SYNTAX  DirectoryString {ub-organizational-unit-name}
---   ID           id-at-organizationalUnitName
--- }
--- 
--- collectiveOrganizationalUnitName ATTRIBUTE ::= {
---   SUBTYPE OF  organizationalUnitName
---   COLLECTIVE  TRUE
---   ID          id-at-collectiveOrganizationalUnitName
--- }
--- 
--- title ATTRIBUTE ::= {
---   SUBTYPE OF   name
---   WITH SYNTAX  DirectoryString {ub-title}
---   ID           id-at-title
--- }
--- 
--- description ATTRIBUTE ::= {
---   WITH SYNTAX               DirectoryString {ub-description}
---   EQUALITY MATCHING RULE    caseIgnoreMatch
---   SUBSTRINGS MATCHING RULE  caseIgnoreSubstringsMatch
---   ID                        id-at-description
--- }
--- 
--- searchGuide ATTRIBUTE ::= {WITH SYNTAX  Guide
---                            ID           id-at-searchGuide
--- }
+                                
+ 
+ localityName ATTRIBUTE ::= {
+   SUBTYPE OF   name
+   WITH SYNTAX  DirectoryString {ub-locality-name}
+   ID           id-at-localityName
+ }
+ 
+ collectiveLocalityName ATTRIBUTE ::= {
+   SUBTYPE OF  localityName
+   COLLECTIVE  TRUE
+   ID          id-at-collectiveLocalityName
+ }
+ 
+ stateOrProvinceName ATTRIBUTE ::= {
+   SUBTYPE OF   name
+   WITH SYNTAX  DirectoryString {ub-state-name}
+   ID           id-at-stateOrProvinceName
+ }
+ 
+ collectiveStateOrProvinceName ATTRIBUTE ::= {
+   SUBTYPE OF  stateOrProvinceName
+   COLLECTIVE  TRUE
+   ID          id-at-collectiveStateOrProvinceName
+ }
+ 
+ streetAddress ATTRIBUTE ::= {
+   WITH SYNTAX               DirectoryString {ub-street-address}
+   EQUALITY MATCHING RULE    caseIgnoreMatch
+   SUBSTRINGS MATCHING RULE  caseIgnoreSubstringsMatch
+   ID                        id-at-streetAddress
+ }
+ 
+ collectiveStreetAddress ATTRIBUTE ::= {
+   SUBTYPE OF  streetAddress
+   COLLECTIVE  TRUE
+   ID          id-at-collectiveStreetAddress
+ }
+ 
+ houseIdentifier ATTRIBUTE ::= {
+   WITH SYNTAX               DirectoryString {ub-name}
+   EQUALITY MATCHING RULE    caseIgnoreMatch
+   SUBSTRINGS MATCHING RULE  caseIgnoreSubstringsMatch
+   ID                        id-at-houseIdentifier
+ }
+ 
+ organizationName ATTRIBUTE ::= {
+   SUBTYPE OF   name
+   WITH SYNTAX  DirectoryString {ub-organization-name}
+   ID           id-at-organizationName
+ }
+ 
+ collectiveOrganizationName ATTRIBUTE ::= {
+   SUBTYPE OF  organizationName
+   COLLECTIVE  TRUE
+   ID          id-at-collectiveOrganizationName
+ }
+ 
+ organizationalUnitName ATTRIBUTE ::= {
+   SUBTYPE OF   name
+   WITH SYNTAX  DirectoryString {ub-organizational-unit-name}
+   ID           id-at-organizationalUnitName
+ }
+ 
+ collectiveOrganizationalUnitName ATTRIBUTE ::= {
+   SUBTYPE OF  organizationalUnitName
+   COLLECTIVE  TRUE
+   ID          id-at-collectiveOrganizationalUnitName
+ }
+ 
+ title ATTRIBUTE ::= {
+   SUBTYPE OF   name
+   WITH SYNTAX  DirectoryString {ub-title}
+   ID           id-at-title
+ }
+ 
+ description ATTRIBUTE ::= {
+   WITH SYNTAX               DirectoryString {ub-description}
+   EQUALITY MATCHING RULE    caseIgnoreMatch
+   SUBSTRINGS MATCHING RULE  caseIgnoreSubstringsMatch
+   ID                        id-at-description
+ }
+ 
+ searchGuide ATTRIBUTE ::= {WITH SYNTAX  Guide
+                            ID           id-at-searchGuide
+ }
 
 
 Guide ::= SET {
@@ -240,10 +240,10 @@ CriteriaItem ::= CHOICE {
   approximateMatch  [4]  AttributeType
 }
 
--- enhancedSearchGuide ATTRIBUTE ::= {
---   WITH SYNTAX  EnhancedGuide
---   ID           id-at-enhancedSearchGuide
--- }
+ enhancedSearchGuide ATTRIBUTE ::= {
+   WITH SYNTAX  EnhancedGuide
+   ID           id-at-enhancedSearchGuide
+ }
 
 EnhancedGuide ::= SEQUENCE {
   objectClass  [0]  OBJECT IDENTIFIER,
@@ -251,87 +251,87 @@ EnhancedGuide ::= SEQUENCE {
   subset       [2]  INTEGER {baseObject(0), oneLevel(1), wholeSubtree(2)} OPTIONAL
 }
 
--- businessCategory ATTRIBUTE ::= {
---   WITH SYNTAX               DirectoryString {ub-business-category}
---   EQUALITY MATCHING RULE    caseIgnoreMatch
---   SUBSTRINGS MATCHING RULE  caseIgnoreSubstringsMatch
---   ID                        id-at-businessCategory
--- }
--- 
--- postalAddress ATTRIBUTE ::= {
---   WITH SYNTAX               PostalAddress
---   EQUALITY MATCHING RULE    caseIgnoreListMatch
---   SUBSTRINGS MATCHING RULE  caseIgnoreListSubstringsMatch
---   ID                        id-at-postalAddress
--- }
+ businessCategory ATTRIBUTE ::= {
+   WITH SYNTAX               DirectoryString {ub-business-category}
+   EQUALITY MATCHING RULE    caseIgnoreMatch
+   SUBSTRINGS MATCHING RULE  caseIgnoreSubstringsMatch
+   ID                        id-at-businessCategory
+ }
+ 
+ postalAddress ATTRIBUTE ::= {
+   WITH SYNTAX               PostalAddress
+   EQUALITY MATCHING RULE    caseIgnoreListMatch
+   SUBSTRINGS MATCHING RULE  caseIgnoreListSubstringsMatch
+   ID                        id-at-postalAddress
+ }
 
 PostalAddress ::= SEQUENCE OF DirectoryString
 
--- collectivePostalAddress ATTRIBUTE ::= {
---   SUBTYPE OF  postalAddress
---   COLLECTIVE  TRUE
---   ID          id-at-collectivePostalAddress
--- }
--- 
--- postalCode ATTRIBUTE ::= {
---   WITH SYNTAX               DirectoryString {ub-postal-code}
---   EQUALITY MATCHING RULE    caseIgnoreMatch
---   SUBSTRINGS MATCHING RULE  caseIgnoreSubstringsMatch
---   ID                        id-at-postalCode
--- }
--- 
--- collectivePostalCode ATTRIBUTE ::= {
---   SUBTYPE OF  postalCode
---   COLLECTIVE  TRUE
---   ID          id-at-collectivePostalCode
--- }
--- 
--- postOfficeBox ATTRIBUTE ::= {
---   WITH SYNTAX               DirectoryString {ub-post-office-box}
---   EQUALITY MATCHING RULE    caseIgnoreMatch
---   SUBSTRINGS MATCHING RULE  caseIgnoreSubstringsMatch
---   ID                        id-at-postOfficeBox
--- }
--- 
--- collectivePostOfficeBox ATTRIBUTE ::= {
---   SUBTYPE OF  postOfficeBox
---   COLLECTIVE  TRUE
---   ID          id-at-collectivePostOfficeBox
--- }
--- 
--- physicalDeliveryOfficeName ATTRIBUTE ::= {
---   WITH SYNTAX               DirectoryString {ub-physical-office-name}
---   EQUALITY MATCHING RULE    caseIgnoreMatch
---   SUBSTRINGS MATCHING RULE  caseIgnoreSubstringsMatch
---   ID                        id-at-physicalDeliveryOfficeName
--- }
--- 
--- collectivePhysicalDeliveryOfficeName ATTRIBUTE ::= {
---   SUBTYPE OF  physicalDeliveryOfficeName
---   COLLECTIVE  TRUE
---   ID          id-at-collectivePhysicalDeliveryOfficeName
--- }
--- 
--- telephoneNumber ATTRIBUTE ::= {
---   WITH SYNTAX               TelephoneNumber
---   EQUALITY MATCHING RULE    telephoneNumberMatch
---   SUBSTRINGS MATCHING RULE  telephoneNumberSubstringsMatch
---   ID                        id-at-telephoneNumber
--- }
+ collectivePostalAddress ATTRIBUTE ::= {
+   SUBTYPE OF  postalAddress
+   COLLECTIVE  TRUE
+   ID          id-at-collectivePostalAddress
+ }
+ 
+ postalCode ATTRIBUTE ::= {
+   WITH SYNTAX               DirectoryString {ub-postal-code}
+   EQUALITY MATCHING RULE    caseIgnoreMatch
+   SUBSTRINGS MATCHING RULE  caseIgnoreSubstringsMatch
+   ID                        id-at-postalCode
+ }
+ 
+ collectivePostalCode ATTRIBUTE ::= {
+   SUBTYPE OF  postalCode
+   COLLECTIVE  TRUE
+   ID          id-at-collectivePostalCode
+ }
+ 
+ postOfficeBox ATTRIBUTE ::= {
+   WITH SYNTAX               DirectoryString {ub-post-office-box}
+   EQUALITY MATCHING RULE    caseIgnoreMatch
+   SUBSTRINGS MATCHING RULE  caseIgnoreSubstringsMatch
+   ID                        id-at-postOfficeBox
+ }
+ 
+ collectivePostOfficeBox ATTRIBUTE ::= {
+   SUBTYPE OF  postOfficeBox
+   COLLECTIVE  TRUE
+   ID          id-at-collectivePostOfficeBox
+ }
+ 
+ physicalDeliveryOfficeName ATTRIBUTE ::= {
+   WITH SYNTAX               DirectoryString {ub-physical-office-name}
+   EQUALITY MATCHING RULE    caseIgnoreMatch
+   SUBSTRINGS MATCHING RULE  caseIgnoreSubstringsMatch
+   ID                        id-at-physicalDeliveryOfficeName
+ }
+ 
+ collectivePhysicalDeliveryOfficeName ATTRIBUTE ::= {
+   SUBTYPE OF  physicalDeliveryOfficeName
+   COLLECTIVE  TRUE
+   ID          id-at-collectivePhysicalDeliveryOfficeName
+ }
+ 
+ telephoneNumber ATTRIBUTE ::= {
+   WITH SYNTAX               TelephoneNumber
+   EQUALITY MATCHING RULE    telephoneNumberMatch
+   SUBSTRINGS MATCHING RULE  telephoneNumberSubstringsMatch
+   ID                        id-at-telephoneNumber
+ }
 
 TelephoneNumber ::= PrintableString
 
 -- String complying with CCITT Rec. E.123 only
--- collectiveTelephoneNumber ATTRIBUTE ::= {
---   SUBTYPE OF  telephoneNumber
---   COLLECTIVE  TRUE
---   ID          id-at-collectiveTelephoneNumber
--- }
--- 
--- telexNumber ATTRIBUTE ::= {
---   WITH SYNTAX  TelexNumber
---   ID           id-at-telexNumber
--- }
+ collectiveTelephoneNumber ATTRIBUTE ::= {
+   SUBTYPE OF  telephoneNumber
+   COLLECTIVE  TRUE
+   ID          id-at-collectiveTelephoneNumber
+ }
+ 
+ telexNumber ATTRIBUTE ::= {
+   WITH SYNTAX  TelexNumber
+   ID           id-at-telexNumber
+ }
 
 TelexNumber ::= SEQUENCE {
   telexNumber  PrintableString,
@@ -339,113 +339,113 @@ TelexNumber ::= SEQUENCE {
   answerback   PrintableString
 }
 
--- collectiveTelexNumber ATTRIBUTE ::= {
---   SUBTYPE OF  telexNumber
---   COLLECTIVE  TRUE
---   ID          id-at-collectiveTelexNumber
--- }
--- 
--- facsimileTelephoneNumber ATTRIBUTE ::= {
---   WITH SYNTAX               FacsimileTelephoneNumber
---   EQUALITY MATCHING RULE    facsimileNumberMatch
---   SUBSTRINGS MATCHING RULE  facsimileNumberSubstringsMatch
---   ID                        id-at-facsimileTelephoneNumber
--- }
--- 
--- facsimileNumberMatch MATCHING-RULE ::= {
---   SYNTAX  TelephoneNumber
---   ID      id-mr-facsimileNumberMatch
--- }
--- 
--- facsimileNumberSubstringsMatch MATCHING-RULE ::= {
---   SYNTAX  SubstringAssertion
---   ID      id-mr-facsimileNumberSubstringsMatch
--- }
+ collectiveTelexNumber ATTRIBUTE ::= {
+   SUBTYPE OF  telexNumber
+   COLLECTIVE  TRUE
+   ID          id-at-collectiveTelexNumber
+ }
+ 
+ facsimileTelephoneNumber ATTRIBUTE ::= {
+   WITH SYNTAX               FacsimileTelephoneNumber
+   EQUALITY MATCHING RULE    facsimileNumberMatch
+   SUBSTRINGS MATCHING RULE  facsimileNumberSubstringsMatch
+   ID                        id-at-facsimileTelephoneNumber
+ }
+ 
+ facsimileNumberMatch MATCHING-RULE ::= {
+   SYNTAX  TelephoneNumber
+   ID      id-mr-facsimileNumberMatch
+ }
+ 
+ facsimileNumberSubstringsMatch MATCHING-RULE ::= {
+   SYNTAX  SubstringAssertion
+   ID      id-mr-facsimileNumberSubstringsMatch
+ }
 
 FacsimileTelephoneNumber ::= SEQUENCE {
-  telephoneNumber  TelephoneNumber
---  parameters       G3FacsimileNonBasicParameters OPTIONAL
+  telephoneNumber  TelephoneNumber,
+  parameters       G3FacsimileNonBasicParameters OPTIONAL
 }
 
--- collectiveFacsimileTelephoneNumber ATTRIBUTE ::= {
---   SUBTYPE OF  facsimileTelephoneNumber
---   COLLECTIVE  TRUE
---   ID          id-at-collectiveFacsimileTelephoneNumber
--- }
--- 
--- x121Address ATTRIBUTE ::= {
---   WITH SYNTAX               X121Address
---   EQUALITY MATCHING RULE    numericStringMatch
---   SUBSTRINGS MATCHING RULE  numericStringSubstringsMatch
---   ID                        id-at-x121Address
--- }
+ collectiveFacsimileTelephoneNumber ATTRIBUTE ::= {
+   SUBTYPE OF  facsimileTelephoneNumber
+   COLLECTIVE  TRUE
+   ID          id-at-collectiveFacsimileTelephoneNumber
+ }
+ 
+ x121Address ATTRIBUTE ::= {
+   WITH SYNTAX               X121Address
+   EQUALITY MATCHING RULE    numericStringMatch
+   SUBSTRINGS MATCHING RULE  numericStringSubstringsMatch
+   ID                        id-at-x121Address
+ }
 
 X121Address ::= NumericString
 
 -- String as defined by ITU-T Rec. X.121
--- internationalISDNNumber ATTRIBUTE ::= {
---   WITH SYNTAX               InternationalISDNNumber
---   EQUALITY MATCHING RULE    numericStringMatch
---   SUBSTRINGS MATCHING RULE  numericStringSubstringsMatch
---   ID                        id-at-internationalISDNNumber
--- }
+ internationalISDNNumber ATTRIBUTE ::= {
+   WITH SYNTAX               InternationalISDNNumber
+   EQUALITY MATCHING RULE    numericStringMatch
+   SUBSTRINGS MATCHING RULE  numericStringSubstringsMatch
+   ID                        id-at-internationalISDNNumber
+ }
 
 InternationalISDNNumber ::= NumericString
 
 -- String complying with ITU-T Rec. E.164 only
--- collectiveInternationalISDNNumber ATTRIBUTE ::= {
---   SUBTYPE OF  internationalISDNNumber
---   COLLECTIVE  TRUE
---   ID          id-at-collectiveInternationalISDNNumber
--- }
--- 
--- registeredAddress ATTRIBUTE ::= {
---   SUBTYPE OF   postalAddress
---   WITH SYNTAX  PostalAddress
---   ID           id-at-registeredAddress
--- }
--- 
--- destinationIndicator ATTRIBUTE ::= {
---   WITH SYNTAX               DestinationIndicator
---   EQUALITY MATCHING RULE    caseIgnoreMatch
---   SUBSTRINGS MATCHING RULE  caseIgnoreSubstringsMatch
---   ID                        id-at-destinationIndicator
--- }
+ collectiveInternationalISDNNumber ATTRIBUTE ::= {
+   SUBTYPE OF  internationalISDNNumber
+   COLLECTIVE  TRUE
+   ID          id-at-collectiveInternationalISDNNumber
+ }
+ 
+ registeredAddress ATTRIBUTE ::= {
+   SUBTYPE OF   postalAddress
+   WITH SYNTAX  PostalAddress
+   ID           id-at-registeredAddress
+ }
+ 
+ destinationIndicator ATTRIBUTE ::= {
+   WITH SYNTAX               DestinationIndicator
+   EQUALITY MATCHING RULE    caseIgnoreMatch
+   SUBSTRINGS MATCHING RULE  caseIgnoreSubstringsMatch
+   ID                        id-at-destinationIndicator
+ }
 
 DestinationIndicator ::= PrintableString
 
--- communicationsService ATTRIBUTE ::= {
---   WITH SYNTAX             OBJECT IDENTIFIER
---   EQUALITY MATCHING RULE  objectIdentifierMatch
---   ID                      id-at-communicationsService
--- }
--- 
--- communicationsNetwork ATTRIBUTE ::= {
---   WITH SYNTAX             OBJECT IDENTIFIER
---   EQUALITY MATCHING RULE  objectIdentifierMatch
---   SINGLE VALUE            TRUE
---   ID                      id-at-communicationsNetwork
--- }
--- 
+ communicationsService ATTRIBUTE ::= {
+   WITH SYNTAX             OBJECT IDENTIFIER
+   EQUALITY MATCHING RULE  objectIdentifierMatch
+   ID                      id-at-communicationsService
+ }
+ 
+ communicationsNetwork ATTRIBUTE ::= {
+   WITH SYNTAX             OBJECT IDENTIFIER
+   EQUALITY MATCHING RULE  objectIdentifierMatch
+   SINGLE VALUE            TRUE
+   ID                      id-at-communicationsNetwork
+ }
+ 
 -- alphabetical characters only
--- preferredDeliveryMethod ATTRIBUTE ::= {
---   WITH SYNTAX   PreferredDeliveryMethod
---   SINGLE VALUE  TRUE
---   ID            id-at-preferredDeliveryMethod
--- }
+ preferredDeliveryMethod ATTRIBUTE ::= {
+   WITH SYNTAX   PreferredDeliveryMethod
+   SINGLE VALUE  TRUE
+   ID            id-at-preferredDeliveryMethod
+ }
 
 PreferredDeliveryMethod ::= SEQUENCE OF
     INTEGER {any-delivery-method(0), mhs-delivery(1), physical-delivery(2),
              telex-delivery(3), teletex-delivery(4), g3-facsimile-delivery(5),
              g4-facsimile-delivery(6), ia5-terminal-delivery(7),
              videotex-delivery(8), telephone-delivery(9)}
--- 
--- presentationAddress ATTRIBUTE ::= {
---   WITH SYNTAX             PresentationAddress
---   EQUALITY MATCHING RULE  presentationAddressMatch
---   SINGLE VALUE            TRUE
---   ID                      id-at-presentationAddress
--- }
+ 
+ presentationAddress ATTRIBUTE ::= {
+   WITH SYNTAX             PresentationAddress
+   EQUALITY MATCHING RULE  presentationAddressMatch
+   SINGLE VALUE            TRUE
+   ID                      id-at-presentationAddress
+ }
 
 PresentationAddress ::= SEQUENCE {
   pSelector   [0]  OCTET STRING OPTIONAL,
@@ -454,164 +454,164 @@ PresentationAddress ::= SEQUENCE {
   nAddresses  [3]  SET OF OCTET STRING
 }
 
--- supportedApplicationContext ATTRIBUTE ::= {
---   WITH SYNTAX             OBJECT IDENTIFIER
---   EQUALITY MATCHING RULE  objectIdentifierMatch
---   ID                      id-at-supportedApplicationContext
--- }
--- 
--- protocolInformation ATTRIBUTE ::= {
---   WITH SYNTAX             ProtocolInformation
---   EQUALITY MATCHING RULE  protocolInformationMatch
---   ID                      id-at-protocolInformation
--- }
+ supportedApplicationContext ATTRIBUTE ::= {
+   WITH SYNTAX             OBJECT IDENTIFIER
+   EQUALITY MATCHING RULE  objectIdentifierMatch
+   ID                      id-at-supportedApplicationContext
+ }
+ 
+ protocolInformation ATTRIBUTE ::= {
+   WITH SYNTAX             ProtocolInformation
+   EQUALITY MATCHING RULE  protocolInformationMatch
+   ID                      id-at-protocolInformation
+ }
 
 ProtocolInformation ::= SEQUENCE {
   nAddress  OCTET STRING,
   profiles  SET OF OBJECT IDENTIFIER
 }
 
--- distinguishedName ATTRIBUTE ::= {
---   WITH SYNTAX             DistinguishedName
---   EQUALITY MATCHING RULE  distinguishedNameMatch
---   ID                      id-at-distinguishedName
--- }
--- 
--- member ATTRIBUTE ::= {SUBTYPE OF  distinguishedName
---                       ID          id-at-member
--- }
--- 
--- uniqueMember ATTRIBUTE ::= {
---   WITH SYNTAX             NameAndOptionalUID
---   EQUALITY MATCHING RULE  uniqueMemberMatch
---   ID                      id-at-uniqueMember
--- }
+ distinguishedName ATTRIBUTE ::= {
+   WITH SYNTAX             DistinguishedName
+   EQUALITY MATCHING RULE  distinguishedNameMatch
+   ID                      id-at-distinguishedName
+ }
+ 
+ member ATTRIBUTE ::= {SUBTYPE OF  distinguishedName
+                       ID          id-at-member
+ }
+ 
+ uniqueMember ATTRIBUTE ::= {
+   WITH SYNTAX             NameAndOptionalUID
+   EQUALITY MATCHING RULE  uniqueMemberMatch
+   ID                      id-at-uniqueMember
+ }
 
 NameAndOptionalUID ::= SEQUENCE {
   dn   DistinguishedName,
   uid  UniqueIdentifier OPTIONAL
 }
 
--- owner ATTRIBUTE ::= {SUBTYPE OF  distinguishedName
---                      ID          id-at-owner
--- }
--- 
--- roleOccupant ATTRIBUTE ::= {
---   SUBTYPE OF  distinguishedName
---   ID          id-at-roleOccupant
--- }
--- 
--- seeAlso ATTRIBUTE ::= {SUBTYPE OF  distinguishedName
---                        ID          id-at-seeAlso
--- }
--- 
--- dmdName ATTRIBUTE ::= {
---   SUBTYPE OF   name
---   WITH SYNTAX  DirectoryString {ub-common-name}
---   ID           id-at-dmdName
--- }
--- 
--- dSAProblem ATTRIBUTE ::= {
---   WITH SYNTAX             OBJECT IDENTIFIER
---   EQUALITY MATCHING RULE  objectIdentifierMatch
---   ID                      id-not-dSAProblem
--- }
--- 
--- searchServiceProblem ATTRIBUTE ::= {
---   WITH SYNTAX             OBJECT IDENTIFIER
---   EQUALITY MATCHING RULE  objectIdentifierMatch
---   SINGLE VALUE            TRUE
---   ID                      id-not-searchServiceProblem
--- }
--- 
--- serviceType ATTRIBUTE ::= {
---   WITH SYNTAX             OBJECT IDENTIFIER
---   EQUALITY MATCHING RULE  objectIdentifierMatch
---   SINGLE VALUE            TRUE
---   ID                      id-not-serviceType
--- }
--- 
--- attributeTypeList ATTRIBUTE ::= {
---   WITH SYNTAX             OBJECT IDENTIFIER
---   EQUALITY MATCHING RULE  objectIdentifierMatch
---   ID                      id-not-attributeTypeList
--- }
--- 
--- filterItem ATTRIBUTE ::= {
---   WITH SYNTAX  FilterItem
---   ID           id-not-filterItem
--- }
--- 
--- attributeCombinations ATTRIBUTE ::= {
---   WITH SYNTAX  AttributeCombination
---   ID           id-not-attributeCombinations
--- }
--- 
--- contextTypeList ATTRIBUTE ::= {
---   WITH SYNTAX             OBJECT IDENTIFIER
---   EQUALITY MATCHING RULE  objectIdentifierMatch
---   ID                      id-not-contextTypeList
--- }
--- 
--- contextList ATTRIBUTE ::= {
---   WITH SYNTAX  ContextAssertion
---   ID           id-not-contextList
--- }
--- 
--- hierarchySelectList ATTRIBUTE ::= {
---   WITH SYNTAX   HierarchySelections
---   SINGLE VALUE  TRUE
---   ID            id-not-hierarchySelectList
--- }
--- 
--- searchOptionsList ATTRIBUTE ::= {
---   WITH SYNTAX   SearchControlOptions
---   SINGLE VALUE  TRUE
---   ID            id-not-searchOptionsList
--- }
--- 
--- serviceControlOptionsList ATTRIBUTE ::= {
---   WITH SYNTAX   ServiceControlOptions
---   SINGLE VALUE  TRUE
---   ID            id-not-serviceControlOptionsList
--- }
--- 
--- multipleMatchingLocalities ATTRIBUTE ::= {
---   WITH SYNTAX  MultipleMatchingLocalities
---   ID           id-not-multipleMatchingLocalities
--- }
+ owner ATTRIBUTE ::= {SUBTYPE OF  distinguishedName
+                      ID          id-at-owner
+ }
+ 
+ roleOccupant ATTRIBUTE ::= {
+   SUBTYPE OF  distinguishedName
+   ID          id-at-roleOccupant
+ }
+ 
+ seeAlso ATTRIBUTE ::= {SUBTYPE OF  distinguishedName
+                        ID          id-at-seeAlso
+ }
+ 
+ dmdName ATTRIBUTE ::= {
+   SUBTYPE OF   name
+   WITH SYNTAX  DirectoryString {ub-common-name}
+   ID           id-at-dmdName
+ }
+ 
+ dSAProblem ATTRIBUTE ::= {
+   WITH SYNTAX             OBJECT IDENTIFIER
+   EQUALITY MATCHING RULE  objectIdentifierMatch
+   ID                      id-not-dSAProblem
+ }
+ 
+ searchServiceProblem ATTRIBUTE ::= {
+   WITH SYNTAX             OBJECT IDENTIFIER
+   EQUALITY MATCHING RULE  objectIdentifierMatch
+   SINGLE VALUE            TRUE
+   ID                      id-not-searchServiceProblem
+ }
+ 
+ serviceType ATTRIBUTE ::= {
+   WITH SYNTAX             OBJECT IDENTIFIER
+   EQUALITY MATCHING RULE  objectIdentifierMatch
+   SINGLE VALUE            TRUE
+   ID                      id-not-serviceType
+ }
+ 
+ attributeTypeList ATTRIBUTE ::= {
+   WITH SYNTAX             OBJECT IDENTIFIER
+   EQUALITY MATCHING RULE  objectIdentifierMatch
+   ID                      id-not-attributeTypeList
+ }
+ 
+ filterItem ATTRIBUTE ::= {
+   WITH SYNTAX  FilterItem
+   ID           id-not-filterItem
+ }
+ 
+ attributeCombinations ATTRIBUTE ::= {
+   WITH SYNTAX  AttributeCombination
+   ID           id-not-attributeCombinations
+ }
+ 
+ contextTypeList ATTRIBUTE ::= {
+   WITH SYNTAX             OBJECT IDENTIFIER
+   EQUALITY MATCHING RULE  objectIdentifierMatch
+   ID                      id-not-contextTypeList
+ }
+ 
+ contextList ATTRIBUTE ::= {
+   WITH SYNTAX  ContextAssertion
+   ID           id-not-contextList
+ }
+ 
+ hierarchySelectList ATTRIBUTE ::= {
+   WITH SYNTAX   HierarchySelections
+   SINGLE VALUE  TRUE
+   ID            id-not-hierarchySelectList
+ }
+ 
+ searchOptionsList ATTRIBUTE ::= {
+   WITH SYNTAX   SearchControlOptions
+   SINGLE VALUE  TRUE
+   ID            id-not-searchOptionsList
+ }
+ 
+ serviceControlOptionsList ATTRIBUTE ::= {
+   WITH SYNTAX   ServiceControlOptions
+   SINGLE VALUE  TRUE
+   ID            id-not-serviceControlOptionsList
+ }
+ 
+ multipleMatchingLocalities ATTRIBUTE ::= {
+   WITH SYNTAX  MultipleMatchingLocalities
+   ID           id-not-multipleMatchingLocalities
+ }
 
 MultipleMatchingLocalities ::= SEQUENCE {
   matchingRuleUsed  OBJECT IDENTIFIER OPTIONAL,
   attributeList     SEQUENCE OF AttributeValueAssertion
 }
 
--- proposedRelaxation ATTRIBUTE ::= {
---   WITH SYNTAX  SEQUENCE OF MRMapping
---   ID           id-not-proposedRelaxation
--- }
--- 
--- appliedRelaxation ATTRIBUTE ::= {
---   WITH SYNTAX             OBJECT IDENTIFIER
---   EQUALITY MATCHING RULE  objectIdentifierMatch
---   ID                      id-not-appliedRelaxation
--- }
--- 
+ proposedRelaxation ATTRIBUTE ::= {
+   WITH SYNTAX  SEQUENCE OF MRMapping
+   ID           id-not-proposedRelaxation
+ }
+ 
+ appliedRelaxation ATTRIBUTE ::= {
+   WITH SYNTAX             OBJECT IDENTIFIER
+   EQUALITY MATCHING RULE  objectIdentifierMatch
+   ID                      id-not-appliedRelaxation
+ }
+ 
 -- Matching rules 
--- caseIgnoreMatch MATCHING-RULE ::= {
---   SYNTAX  DirectoryString {ub-match}
---   ID      id-mr-caseIgnoreMatch
--- }
--- 
--- caseIgnoreOrderingMatch MATCHING-RULE ::= {
---   SYNTAX  DirectoryString {ub-match}
---   ID      id-mr-caseIgnoreOrderingMatch
--- }
--- 
--- caseIgnoreSubstringsMatch MATCHING-RULE ::= {
---   SYNTAX  SubstringAssertion
---   ID      id-mr-caseIgnoreSubstringsMatch
--- }
+ caseIgnoreMatch MATCHING-RULE ::= {
+   SYNTAX  DirectoryString {ub-match}
+   ID      id-mr-caseIgnoreMatch
+ }
+ 
+ caseIgnoreOrderingMatch MATCHING-RULE ::= {
+   SYNTAX  DirectoryString {ub-match}
+   ID      id-mr-caseIgnoreOrderingMatch
+ }
+ 
+ caseIgnoreSubstringsMatch MATCHING-RULE ::= {
+   SYNTAX  SubstringAssertion
+   ID      id-mr-caseIgnoreSubstringsMatch
+ }
 
 SubstringAssertion ::= SEQUENCE OF
     CHOICE {initial  [0]  DirectoryString,
@@ -621,88 +621,88 @@ SubstringAssertion ::= SEQUENCE OF
     } 
 
 --     Used to specify interpretation of the following items 
--- 
+ 
 -- at most one initial and one final component
--- caseExactMatch MATCHING-RULE ::= {
---   SYNTAX  DirectoryString {ub-match}
---   ID      id-mr-caseExactMatch
--- }
--- 
--- caseExactOrderingMatch MATCHING-RULE ::= {
---   SYNTAX  DirectoryString {ub-match}
---   ID      id-mr-caseExactOrderingMatch
--- }
--- 
--- caseExactSubstringsMatch MATCHING-RULE ::= {
---   SYNTAX  SubstringAssertion 
---       only the PrintableString choice
---   ID      id-mr-caseExactSubstringsMatch
--- }
--- 
--- numericStringMatch MATCHING-RULE ::= {
---   SYNTAX  NumericString
---   ID      id-mr-numericStringMatch
--- }
--- 
--- numericStringOrderingMatch MATCHING-RULE ::= {
---   SYNTAX  NumericString
---   ID      id-mr-numericStringOrderingMatch
--- }
--- 
--- numericStringSubstringsMatch MATCHING-RULE ::= {
---   SYNTAX  SubstringAssertion
---   ID      id-mr-numericStringSubstringsMatch
--- }
--- 
--- caseIgnoreListMatch MATCHING-RULE ::= {
---   SYNTAX  CaseIgnoreListMatch
---   ID      id-mr-caseIgnoreListMatch
--- }
+ caseExactMatch MATCHING-RULE ::= {
+   SYNTAX  DirectoryString {ub-match}
+   ID      id-mr-caseExactMatch
+ }
+ 
+ caseExactOrderingMatch MATCHING-RULE ::= {
+   SYNTAX  DirectoryString {ub-match}
+   ID      id-mr-caseExactOrderingMatch
+ }
+ 
+ caseExactSubstringsMatch MATCHING-RULE ::= {
+   SYNTAX  SubstringAssertion 
+       only the PrintableString choice
+   ID      id-mr-caseExactSubstringsMatch
+ }
+ 
+ numericStringMatch MATCHING-RULE ::= {
+   SYNTAX  NumericString
+   ID      id-mr-numericStringMatch
+ }
+ 
+ numericStringOrderingMatch MATCHING-RULE ::= {
+   SYNTAX  NumericString
+   ID      id-mr-numericStringOrderingMatch
+ }
+ 
+ numericStringSubstringsMatch MATCHING-RULE ::= {
+   SYNTAX  SubstringAssertion
+   ID      id-mr-numericStringSubstringsMatch
+ }
+ 
+ caseIgnoreListMatch MATCHING-RULE ::= {
+   SYNTAX  CaseIgnoreListMatch
+   ID      id-mr-caseIgnoreListMatch
+ }
 
 CaseIgnoreListMatch ::= SEQUENCE OF DirectoryString
 
--- caseIgnoreListSubstringsMatch MATCHING-RULE ::= {
---   SYNTAX  SubstringAssertion
---   ID      id-mr-caseIgnoreListSubstringsMatch
--- }
--- 
--- storedPrefixMatch MATCHING-RULE ::= {
---   SYNTAX  DirectoryString {ub-match}
---   ID      id-mr-storedPrefixMatch
--- }
--- 
--- booleanMatch MATCHING-RULE ::= {SYNTAX  BOOLEAN
---                                 ID      id-mr-booleanMatch
--- }
--- 
--- integerMatch MATCHING-RULE ::= {SYNTAX  INTEGER
---                                 ID      id-mr-integerMatch
--- }
--- 
--- integerOrderingMatch MATCHING-RULE ::= {
---   SYNTAX  INTEGER
---   ID      id-mr-integerOrderingMatch
--- }
--- 
--- bitStringMatch MATCHING-RULE ::= {
---   SYNTAX  BIT STRING
---   ID      id-mr-bitStringMatch
--- }
--- 
--- octetStringMatch MATCHING-RULE ::= {
---   SYNTAX  OCTET STRING
---   ID      id-mr-octetStringMatch
--- }
--- 
--- octetStringOrderingMatch MATCHING-RULE ::= {
---   SYNTAX  OCTET STRING
---   ID      id-mr-octetStringOrderingMatch
--- }
--- 
--- octetStringSubstringsMatch MATCHING-RULE ::= {
---   SYNTAX  OctetSubstringAssertion
---   ID      id-mr-octetStringSubstringsMatch
--- }
+ caseIgnoreListSubstringsMatch MATCHING-RULE ::= {
+   SYNTAX  SubstringAssertion
+   ID      id-mr-caseIgnoreListSubstringsMatch
+ }
+ 
+ storedPrefixMatch MATCHING-RULE ::= {
+   SYNTAX  DirectoryString {ub-match}
+   ID      id-mr-storedPrefixMatch
+ }
+ 
+ booleanMatch MATCHING-RULE ::= {SYNTAX  BOOLEAN
+                                 ID      id-mr-booleanMatch
+ }
+ 
+ integerMatch MATCHING-RULE ::= {SYNTAX  INTEGER
+                                 ID      id-mr-integerMatch
+ }
+ 
+ integerOrderingMatch MATCHING-RULE ::= {
+   SYNTAX  INTEGER
+   ID      id-mr-integerOrderingMatch
+ }
+ 
+ bitStringMatch MATCHING-RULE ::= {
+   SYNTAX  BIT STRING
+   ID      id-mr-bitStringMatch
+ }
+ 
+ octetStringMatch MATCHING-RULE ::= {
+   SYNTAX  OCTET STRING
+   ID      id-mr-octetStringMatch
+ }
+ 
+ octetStringOrderingMatch MATCHING-RULE ::= {
+   SYNTAX  OCTET STRING
+   ID      id-mr-octetStringOrderingMatch
+ }
+ 
+ octetStringSubstringsMatch MATCHING-RULE ::= {
+   SYNTAX  OctetSubstringAssertion
+   ID      id-mr-octetStringSubstringsMatch
+ }
 
 OctetSubstringAssertion ::= SEQUENCE OF
     CHOICE {initial  [0]  OCTET STRING,
@@ -710,153 +710,153 @@ OctetSubstringAssertion ::= SEQUENCE OF
             final    [2]  OCTET STRING}
 
 -- at most one initial and one final component
--- telephoneNumberMatch MATCHING-RULE ::= {
---   SYNTAX  TelephoneNumber
---   ID      id-mr-telephoneNumberMatch
--- }
--- 
--- telephoneNumberSubstringsMatch MATCHING-RULE ::= {
---   SYNTAX  SubstringAssertion
---   ID      id-mr-telephoneNumberSubstringsMatch
--- }
--- 
--- presentationAddressMatch MATCHING-RULE ::= {
---   SYNTAX  PresentationAddress
---   ID      id-mr-presentationAddressMatch
--- }
--- 
--- uniqueMemberMatch MATCHING-RULE ::= {
---   SYNTAX  NameAndOptionalUID
---   ID      id-mr-uniqueMemberMatch
--- }
--- 
--- protocolInformationMatch MATCHING-RULE ::= {
---   SYNTAX  OCTET STRING
---   ID      id-mr-protocolInformationMatch
--- }
--- 
--- uTCTimeMatch MATCHING-RULE ::= {SYNTAX  UTCTime
---                                 ID      id-mr-uTCTimeMatch
--- }
--- 
--- uTCTimeOrderingMatch MATCHING-RULE ::= {
---   SYNTAX  UTCTime
---   ID      id-mr-uTCTimeOrderingMatch
--- }
--- 
--- generalizedTimeMatch MATCHING-RULE ::= {
---   SYNTAX  GeneralizedTime
+ telephoneNumberMatch MATCHING-RULE ::= {
+   SYNTAX  TelephoneNumber
+   ID      id-mr-telephoneNumberMatch
+ }
+ 
+ telephoneNumberSubstringsMatch MATCHING-RULE ::= {
+   SYNTAX  SubstringAssertion
+   ID      id-mr-telephoneNumberSubstringsMatch
+ }
+ 
+ presentationAddressMatch MATCHING-RULE ::= {
+   SYNTAX  PresentationAddress
+   ID      id-mr-presentationAddressMatch
+ }
+ 
+ uniqueMemberMatch MATCHING-RULE ::= {
+   SYNTAX  NameAndOptionalUID
+   ID      id-mr-uniqueMemberMatch
+ }
+ 
+ protocolInformationMatch MATCHING-RULE ::= {
+   SYNTAX  OCTET STRING
+   ID      id-mr-protocolInformationMatch
+ }
+ 
+ uTCTimeMatch MATCHING-RULE ::= {SYNTAX  UTCTime
+                                 ID      id-mr-uTCTimeMatch
+ }
+ 
+ uTCTimeOrderingMatch MATCHING-RULE ::= {
+   SYNTAX  UTCTime
+   ID      id-mr-uTCTimeOrderingMatch
+ }
+ 
+ generalizedTimeMatch MATCHING-RULE ::= {
+   SYNTAX  GeneralizedTime
 --      as per 41.3 b) or c) of ITU-T Rec. X.680 | ISO/IEC 8824-1
---   ID      id-mr-generalizedTimeMatch
--- }
--- 
--- generalizedTimeOrderingMatch MATCHING-RULE ::= {
---   SYNTAX  GeneralizedTime
---    as per 41.3 b) or c) of ITU-T Rec. X.680 | ISO/IEC 8824-1
---   ID      id-mr-generalizedTimeOrderingMatch
--- }
--- 
--- integerFirstComponentMatch MATCHING-RULE ::= {
---   SYNTAX  INTEGER
---   ID      id-mr-integerFirstComponentMatch
--- }
--- 
--- objectIdentifierFirstComponentMatch MATCHING-RULE ::= {
---   SYNTAX  OBJECT IDENTIFIER
---   ID      id-mr-objectIdentifierFirstComponentMatch
--- }
--- 
--- directoryStringFirstComponentMatch MATCHING-RULE ::= {
---   SYNTAX  DirectoryString {ub-directory-string-first-component-match}
---   ID      id-mr-directoryStringFirstComponentMatch
--- }
--- 
--- wordMatch MATCHING-RULE ::= {
---   SYNTAX  DirectoryString {ub-match}
---   ID      id-mr-wordMatch
--- }
--- 
--- keywordMatch MATCHING-RULE ::= {
---   SYNTAX  DirectoryString {ub-match}
---   ID      id-mr-keywordMatch
--- }
--- 
--- systemProposedMatch MATCHING-RULE ::= {ID  id-mr-systemProposedMatch
--- }
--- 
--- generalWordMatch MATCHING-RULE ::= {
---   SYNTAX  SubstringAssertion
---   ID      id-mr-generalWordMatch
--- }
--- 
--- sequenceMatchType ATTRIBUTE ::= {
---   WITH SYNTAX
---     ENUMERATED {sequenceExact(0), sequenceDeletion(1),
---                 sequenceRestrictedDeletion(2), sequencePermutation(3),
---                 sequencePermutationAndDeletion(4), sequenceProviderDefined(5)}
---   SINGLE VALUE  TRUE
---   ID            id-cat-sequenceMatchType
--- } 
+   ID      id-mr-generalizedTimeMatch
+ }
+ 
+ generalizedTimeOrderingMatch MATCHING-RULE ::= {
+   SYNTAX  GeneralizedTime
+    as per 41.3 b) or c) of ITU-T Rec. X.680 | ISO/IEC 8824-1
+   ID      id-mr-generalizedTimeOrderingMatch
+ }
+ 
+ integerFirstComponentMatch MATCHING-RULE ::= {
+   SYNTAX  INTEGER
+   ID      id-mr-integerFirstComponentMatch
+ }
+ 
+ objectIdentifierFirstComponentMatch MATCHING-RULE ::= {
+   SYNTAX  OBJECT IDENTIFIER
+   ID      id-mr-objectIdentifierFirstComponentMatch
+ }
+ 
+ directoryStringFirstComponentMatch MATCHING-RULE ::= {
+   SYNTAX  DirectoryString {ub-directory-string-first-component-match}
+   ID      id-mr-directoryStringFirstComponentMatch
+ }
+ 
+ wordMatch MATCHING-RULE ::= {
+   SYNTAX  DirectoryString {ub-match}
+   ID      id-mr-wordMatch
+ }
+ 
+ keywordMatch MATCHING-RULE ::= {
+   SYNTAX  DirectoryString {ub-match}
+   ID      id-mr-keywordMatch
+ }
+ 
+ systemProposedMatch MATCHING-RULE ::= {ID  id-mr-systemProposedMatch
+ }
+ 
+ generalWordMatch MATCHING-RULE ::= {
+   SYNTAX  SubstringAssertion
+   ID      id-mr-generalWordMatch
+ }
+ 
+ sequenceMatchType ATTRIBUTE ::= {
+   WITH SYNTAX
+     ENUMERATED {sequenceExact(0), sequenceDeletion(1),
+                 sequenceRestrictedDeletion(2), sequencePermutation(3),
+                 sequencePermutationAndDeletion(4), sequenceProviderDefined(5)}
+   SINGLE VALUE  TRUE
+   ID            id-cat-sequenceMatchType
+ } 
 --       defaulting to sequenceExact,
--- 
--- wordMatchTypes ATTRIBUTE ::= {
---   WITH SYNTAX
---     ENUMERATED {wordExact(0), wordTruncated(1), wordPhonetic(2),
---                 wordProviderDefined(3)}
---   SINGLE VALUE  TRUE
---   ID            id-cat-wordMatchType
--- } 
+ 
+ wordMatchTypes ATTRIBUTE ::= {
+   WITH SYNTAX
+     ENUMERATED {wordExact(0), wordTruncated(1), wordPhonetic(2),
+                 wordProviderDefined(3)}
+   SINGLE VALUE  TRUE
+   ID            id-cat-wordMatchType
+ } 
 --     defaulting to wordExact
--- 
--- characterMatchTypes ATTRIBUTE ::= {
---   WITH SYNTAX
---     ENUMERATED {characterExact(0), characterCaseIgnore(1), characterMapped(2)}
---   SINGLE VALUE  TRUE
---   ID            id-cat-characterMatchTypes
--- }
--- 
--- selectedContexts ATTRIBUTE ::= {
---   WITH SYNTAX  ContextAssertion
---   ID           id-cat-selectedContexts
--- }
--- 
--- approximateStringMatch MATCHING-RULE ::= {ID  id-mr-approximateStringMatch
--- }
--- 
--- ignoreIfAbsentMatch MATCHING-RULE ::= {ID  id-mr-ignoreIfAbsentMatch
--- }
--- 
--- nullMatch MATCHING-RULE ::= {ID  id-mr-nullMatch
--- }
--- 
--- ZONAL-MATCHING ::=
---   MAPPING-BASED-MATCHING{ZonalSelect, TRUE, ZonalResult, zonalMatch.&id}
+ 
+ characterMatchTypes ATTRIBUTE ::= {
+   WITH SYNTAX
+     ENUMERATED {characterExact(0), characterCaseIgnore(1), characterMapped(2)}
+   SINGLE VALUE  TRUE
+   ID            id-cat-characterMatchTypes
+ }
+ 
+ selectedContexts ATTRIBUTE ::= {
+   WITH SYNTAX  ContextAssertion
+   ID           id-cat-selectedContexts
+ }
+ 
+ approximateStringMatch MATCHING-RULE ::= {ID  id-mr-approximateStringMatch
+ }
+ 
+ ignoreIfAbsentMatch MATCHING-RULE ::= {ID  id-mr-ignoreIfAbsentMatch
+ }
+ 
+ nullMatch MATCHING-RULE ::= {ID  id-mr-nullMatch
+ }
+ 
+ ZONAL-MATCHING ::=
+   MAPPING-BASED-MATCHING{ZonalSelect, TRUE, ZonalResult, zonalMatch.&id}
 
 ZonalSelect ::= SEQUENCE OF AttributeType
 
 ZonalResult ::= ENUMERATED {
   cannot-select-mapping(0), zero-mappings(2), multiple-mappings(3)}
 
--- zonalMatch MATCHING-RULE ::= {
---   UNIQUE-MATCH-INDICATOR  multipleMatchingLocalities.&id
---   ID                      id-mr-zonalMatch
--- }
--- 
+ zonalMatch MATCHING-RULE ::= {
+   UNIQUE-MATCH-INDICATOR  multipleMatchingLocalities.&id
+   ID                      id-mr-zonalMatch
+ }
+ 
 -- Contexts 
--- languageContext CONTEXT ::= {
---   WITH SYNTAX  LanguageContextSyntax
---   ID           id-avc-language
--- }
+ languageContext CONTEXT ::= {
+   WITH SYNTAX  LanguageContextSyntax
+   ID           id-avc-language
+ }
 
 LanguageContextSyntax ::= PrintableString 
 --        ISO 639-2 codes only
---                                          
--- 
--- temporalContext CONTEXT ::= {
---   WITH SYNTAX  TimeSpecification
---   ASSERTED AS  TimeAssertion
---   ID           id-avc-temporal
--- }
+                                          
+ 
+ temporalContext CONTEXT ::= {
+   WITH SYNTAX  TimeSpecification
+   ASSERTED AS  TimeAssertion
+   ID           id-avc-temporal
+ }
 
 TimeSpecification ::= SEQUENCE {
   time CHOICE {absolute SEQUENCE {
@@ -916,10 +916,10 @@ TimeAssertion ::= CHOICE {
                      entirely   BOOLEAN OPTIONAL}
 }
 
--- localeContext CONTEXT ::= {
---   WITH SYNTAX  LocaleContextSyntax
---   ID           id-avc-locale
--- }
+ localeContext CONTEXT ::= {
+   WITH SYNTAX  LocaleContextSyntax
+   ID           id-avc-locale
+ }
 
 LocaleContextSyntax ::= CHOICE {
   localeID1  OBJECT IDENTIFIER,
@@ -931,533 +931,533 @@ LocaleContextSyntax ::= CHOICE {
 -- Attributes 
 --     (id-at copied in from UsefulDefinitions)
 id-at OBJECT IDENTIFIER ::= {joint-iso-itu-t ds(5) 4}
--- id-at-objectClass						OBJECT IDENTIFIER	::=	{id-at 0}
--- id-at-aliasedEntryName				OBJECT IDENTIFIER	::=	{id-at 1}
--- id-at-encryptedAliasedEntryName OBJECT IDENTIFIER ::=
---  {id-at 1 2}
+ id-at-objectClass						OBJECT IDENTIFIER	::=	{id-at 0}
+ id-at-aliasedEntryName				OBJECT IDENTIFIER	::=	{id-at 1}
+ id-at-encryptedAliasedEntryName OBJECT IDENTIFIER ::=
+  {id-at 1 2}
 
 id-at-knowledgeInformation OBJECT IDENTIFIER ::= {id-at 2}
 
 id-at-commonName OBJECT IDENTIFIER ::= {id-at 3}
 
--- id-at-encryptedCommonName OBJECT IDENTIFIER ::= {id-at 3 2}
+ id-at-encryptedCommonName OBJECT IDENTIFIER ::= {id-at 3 2}
 
 id-at-surname OBJECT IDENTIFIER ::= {id-at 4}
 
--- id-at-encryptedSurname OBJECT IDENTIFIER ::= {id-at 4 2}
--- 
--- id-at-serialNumber OBJECT IDENTIFIER ::= {id-at 5}
--- 
--- id-at-encryptedSerialNumber OBJECT IDENTIFIER ::= {id-at 5 2}
+ id-at-encryptedSurname OBJECT IDENTIFIER ::= {id-at 4 2}
+ 
+ id-at-serialNumber OBJECT IDENTIFIER ::= {id-at 5}
+ 
+ id-at-encryptedSerialNumber OBJECT IDENTIFIER ::= {id-at 5 2}
 
 id-at-countryName OBJECT IDENTIFIER ::= {id-at 6}
 
--- id-at-encryptedCountryName OBJECT IDENTIFIER ::= {id-at 6 2}
+ id-at-encryptedCountryName OBJECT IDENTIFIER ::= {id-at 6 2}
 
 id-at-localityName OBJECT IDENTIFIER ::= {id-at 7}
 
--- id-at-encryptedLocalityName OBJECT IDENTIFIER ::= {id-at 7 2}
+ id-at-encryptedLocalityName OBJECT IDENTIFIER ::= {id-at 7 2}
 
 id-at-collectiveLocalityName OBJECT IDENTIFIER ::= {id-at 7 1}
 
--- id-at-encryptedCollectiveLocalityName OBJECT IDENTIFIER ::= {id-at 7 1 2}
+ id-at-encryptedCollectiveLocalityName OBJECT IDENTIFIER ::= {id-at 7 1 2}
 
 id-at-stateOrProvinceName OBJECT IDENTIFIER ::= {id-at 8}
 
--- id-at-encryptedStateOrProvinceName OBJECT IDENTIFIER ::= {id-at 8 2}
+ id-at-encryptedStateOrProvinceName OBJECT IDENTIFIER ::= {id-at 8 2}
 
 id-at-collectiveStateOrProvinceName OBJECT IDENTIFIER ::= {id-at 8 1}
 
--- id-at-encryptedCollectiveStateOrProvinceName OBJECT IDENTIFIER ::=
---   {id-at 8 1 2}
+ id-at-encryptedCollectiveStateOrProvinceName OBJECT IDENTIFIER ::=
+   {id-at 8 1 2}
 
 id-at-streetAddress OBJECT IDENTIFIER ::= {id-at 9}
 
--- id-at-encryptedStreetAddress OBJECT IDENTIFIER ::= {id-at 9 2}
+ id-at-encryptedStreetAddress OBJECT IDENTIFIER ::= {id-at 9 2}
 
 id-at-collectiveStreetAddress OBJECT IDENTIFIER ::= {id-at 9 1}
 
--- id-at-encryptedCollectiveStreetAddress OBJECT IDENTIFIER ::= {id-at 9 1 2}
+ id-at-encryptedCollectiveStreetAddress OBJECT IDENTIFIER ::= {id-at 9 1 2}
 
 id-at-organizationName OBJECT IDENTIFIER ::= {id-at 10}
 
--- id-at-encryptedOrganizationName OBJECT IDENTIFIER ::= {id-at 10 2}
+ id-at-encryptedOrganizationName OBJECT IDENTIFIER ::= {id-at 10 2}
 
 id-at-collectiveOrganizationName OBJECT IDENTIFIER ::= {id-at 10 1}
 
--- id-at-encryptedCollectiveOrganizationName OBJECT IDENTIFIER ::= {id-at 10 1 2}
+ id-at-encryptedCollectiveOrganizationName OBJECT IDENTIFIER ::= {id-at 10 1 2}
 
 id-at-organizationalUnitName OBJECT IDENTIFIER ::= {id-at 11}
 
--- id-at-encryptedOrganizationalUnitName OBJECT IDENTIFIER ::= {id-at 11 2}
+ id-at-encryptedOrganizationalUnitName OBJECT IDENTIFIER ::= {id-at 11 2}
 
 id-at-collectiveOrganizationalUnitName OBJECT IDENTIFIER ::= {id-at 11 1}
 
--- id-at-encryptedCollectiveOrganizationalUnitName OBJECT IDENTIFIER ::=
---   {id-at 11 1 2}
+ id-at-encryptedCollectiveOrganizationalUnitName OBJECT IDENTIFIER ::=
+   {id-at 11 1 2}
 
 id-at-title OBJECT IDENTIFIER ::= {id-at 12}
 
--- id-at-encryptedTitle OBJECT IDENTIFIER ::= {id-at 12 2}
+ id-at-encryptedTitle OBJECT IDENTIFIER ::= {id-at 12 2}
 
 id-at-description OBJECT IDENTIFIER ::= {id-at 13}
 
--- id-at-encryptedDescription OBJECT IDENTIFIER ::= {id-at 13 2}
--- 
--- id-at-searchGuide OBJECT IDENTIFIER ::= {id-at 14}
--- 
--- id-at-encryptedSearchGuide OBJECT IDENTIFIER ::= {id-at 14 2}
+ id-at-encryptedDescription OBJECT IDENTIFIER ::= {id-at 13 2}
+ 
+ id-at-searchGuide OBJECT IDENTIFIER ::= {id-at 14}
+ 
+ id-at-encryptedSearchGuide OBJECT IDENTIFIER ::= {id-at 14 2}
 
 id-at-businessCategory OBJECT IDENTIFIER ::= {id-at 15}
 
--- id-at-encryptedBusinessCategory OBJECT IDENTIFIER ::= {id-at 15 2}
--- 
--- id-at-postalAddress OBJECT IDENTIFIER ::= {id-at 16}
--- 
--- id-at-encryptedPostalAddress OBJECT IDENTIFIER ::= {id-at 16 2}
--- 
--- id-at-collectivePostalAddress OBJECT IDENTIFIER ::= {id-at 16 1}
--- 
--- id-at-encryptedCollectivePostalAddress OBJECT IDENTIFIER ::= {id-at 16 1 2}
+ id-at-encryptedBusinessCategory OBJECT IDENTIFIER ::= {id-at 15 2}
+ 
+ id-at-postalAddress OBJECT IDENTIFIER ::= {id-at 16}
+ 
+ id-at-encryptedPostalAddress OBJECT IDENTIFIER ::= {id-at 16 2}
+ 
+ id-at-collectivePostalAddress OBJECT IDENTIFIER ::= {id-at 16 1}
+ 
+ id-at-encryptedCollectivePostalAddress OBJECT IDENTIFIER ::= {id-at 16 1 2}
 
 id-at-postalCode OBJECT IDENTIFIER ::= {id-at 17}
 
--- id-at-encryptedPostalCode OBJECT IDENTIFIER ::= {id-at 17 2}
+ id-at-encryptedPostalCode OBJECT IDENTIFIER ::= {id-at 17 2}
 
 id-at-collectivePostalCode OBJECT IDENTIFIER ::= {id-at 17 1}
 
--- id-at-encryptedCollectivePostalCode OBJECT IDENTIFIER ::= {id-at 17 1 2}
+ id-at-encryptedCollectivePostalCode OBJECT IDENTIFIER ::= {id-at 17 1 2}
 
 id-at-postOfficeBox OBJECT IDENTIFIER ::= {id-at 18}
 
--- id-at-encryptedPostOfficeBox OBJECT IDENTIFIER ::= {id-at 18 2}
+ id-at-encryptedPostOfficeBox OBJECT IDENTIFIER ::= {id-at 18 2}
 
 id-at-collectivePostOfficeBox OBJECT IDENTIFIER ::= {id-at 18 1}
 
--- id-at-encryptedCollectivePostOfficeBox OBJECT IDENTIFIER ::= {id-at 18 1 2}
+ id-at-encryptedCollectivePostOfficeBox OBJECT IDENTIFIER ::= {id-at 18 1 2}
 
 id-at-physicalDeliveryOfficeName OBJECT IDENTIFIER ::= {id-at 19}
 
--- id-at-encryptedPhysicalDeliveryOfficeName OBJECT IDENTIFIER ::= {id-at 19 2}
+ id-at-encryptedPhysicalDeliveryOfficeName OBJECT IDENTIFIER ::= {id-at 19 2}
 
 id-at-collectivePhysicalDeliveryOfficeName OBJECT IDENTIFIER ::= {id-at 19 1}
 
--- id-at-encryptedCollectivePhysicalDeliveryOfficeName OBJECT IDENTIFIER ::=
---   {id-at 19 1 2}
+ id-at-encryptedCollectivePhysicalDeliveryOfficeName OBJECT IDENTIFIER ::=
+   {id-at 19 1 2}
 
 id-at-telephoneNumber OBJECT IDENTIFIER ::= {id-at 20}
 
--- id-at-encryptedTelephoneNumber OBJECT IDENTIFIER ::= {id-at 20 2}
+ id-at-encryptedTelephoneNumber OBJECT IDENTIFIER ::= {id-at 20 2}
 
 id-at-collectiveTelephoneNumber OBJECT IDENTIFIER ::= {id-at 20 1}
 
--- id-at-encryptedCollectiveTelephoneNumber OBJECT IDENTIFIER ::= {id-at 20 1 2}
+ id-at-encryptedCollectiveTelephoneNumber OBJECT IDENTIFIER ::= {id-at 20 1 2}
 
 id-at-telexNumber OBJECT IDENTIFIER ::= {id-at 21}
 
--- id-at-encryptedTelexNumber OBJECT IDENTIFIER ::= {id-at 21 2}
+ id-at-encryptedTelexNumber OBJECT IDENTIFIER ::= {id-at 21 2}
 
 id-at-collectiveTelexNumber OBJECT IDENTIFIER ::= {id-at 21 1}
 
--- id-at-encryptedCollectiveTelexNumber OBJECT IDENTIFIER ::= {id-at 21 1 2}
--- 
--- id-at-teletexTerminalIdentifier  			OBJECT IDENTIFIER	::=	{id-at 22}
--- id-at-encryptedTeletexTerminalIdentifier		OBJECT IDENTIFIER	::=	{id-at 22 2}
--- id-at-collectiveTeletexTerminalIdentifier		OBJECT IDENTIFIER	::=	{id-at 22 1}
--- id-at-encryptedCollectiveTeletexTerminalIdentifier
--- 							OBJECT IDENTIFIER	::=	{id-at 22 1 2}
--- id-at-facsimileTelephoneNumber OBJECT IDENTIFIER ::=
---   {id-at 23}
--- 
--- id-at-encryptedFacsimileTelephoneNumber OBJECT IDENTIFIER ::= {id-at 23 2}
--- 
--- id-at-collectiveFacsimileTelephoneNumber OBJECT IDENTIFIER ::= {id-at 23 1}
--- 
--- id-at-encryptedCollectiveFacsimileTelephoneNumber OBJECT IDENTIFIER ::=
---   {id-at 23 1 2}
--- 
--- id-at-x121Address OBJECT IDENTIFIER ::= {id-at 24}
--- 
--- id-at-encryptedX121Address OBJECT IDENTIFIER ::= {id-at 24 2}
--- 
--- id-at-internationalISDNNumber OBJECT IDENTIFIER ::= {id-at 25}
--- 
--- id-at-encryptedInternationalISDNNumber OBJECT IDENTIFIER ::= {id-at 25 2}
--- 
--- id-at-collectiveInternationalISDNNumber OBJECT IDENTIFIER ::= {id-at 25 1}
--- 
--- id-at-encryptedCollectiveInternationalISDNNumber OBJECT IDENTIFIER ::=
---   {id-at 25 1 2}
--- 
--- id-at-registeredAddress OBJECT IDENTIFIER ::= {id-at 26}
--- 
--- id-at-encryptedRegisteredAddress OBJECT IDENTIFIER ::= {id-at 26 2}
--- 
--- id-at-destinationIndicator OBJECT IDENTIFIER ::= {id-at 27}
--- 
--- id-at-encryptedDestinationIndicator OBJECT IDENTIFIER ::= {id-at 27 2}
--- 
--- id-at-preferredDeliveryMethod OBJECT IDENTIFIER ::= {id-at 28}
--- 
--- id-at-encryptedPreferredDeliveryMethod OBJECT IDENTIFIER ::= {id-at 28 2}
--- 
--- id-at-presentationAddress OBJECT IDENTIFIER ::= {id-at 29}
--- 
--- id-at-encryptedPresentationAddress OBJECT IDENTIFIER ::= {id-at 29 2}
--- 
--- id-at-supportedApplicationContext OBJECT IDENTIFIER ::= {id-at 30}
--- 
--- id-at-encryptedSupportedApplicationContext OBJECT IDENTIFIER ::= {id-at 30 2}
--- 
--- id-at-member OBJECT IDENTIFIER ::= {id-at 31}
--- 
--- id-at-encryptedMember OBJECT IDENTIFIER ::= {id-at 31 2}
--- 
--- id-at-owner OBJECT IDENTIFIER ::= {id-at 32}
--- 
--- id-at-encryptedOwner OBJECT IDENTIFIER ::= {id-at 32 2}
--- 
--- id-at-roleOccupant OBJECT IDENTIFIER ::= {id-at 33}
--- 
--- id-at-encryptedRoleOccupant OBJECT IDENTIFIER ::= {id-at 33 2}
--- 
--- id-at-seeAlso OBJECT IDENTIFIER ::= {id-at 34}
--- 
--- id-at-encryptedSeeAlso OBJECT IDENTIFIER ::= {id-at 34 2}
--- 
--- id-at-userPassword					OBJECT IDENTIFIER	::=	{id-at 35}
--- id-at-encryptedUserPassword OBJECT IDENTIFIER ::=
---   {id-at 35 2}
--- 
--- id-at-userCertificate					OBJECT IDENTIFIER	::=	{id-at 36}
--- id-at-encryptedUserCertificate OBJECT IDENTIFIER ::=
---   {id-at 36 2}
--- 
--- id-at-cACertificate					OBJECT IDENTIFIER	::=	{id-at 37}
--- id-at-encryptedCACertificate OBJECT IDENTIFIER ::=
---   {id-at 37 2}
--- 
--- id-at-authorityRevocationList				OBJECT IDENTIFIER	::=	{id-at 38}
--- id-at-encryptedAuthorityRevocationList OBJECT IDENTIFIER ::=
---   {id-at 38 2}
--- 
--- id-at-certificateRevocationList			OBJECT IDENTIFIER	::=	{id-at 39}
--- id-at-encryptedCertificateRevocationList OBJECT IDENTIFIER ::=
---   {id-at 39 2}
--- 
--- id-at-crossCertificatePair				OBJECT IDENTIFIER	::=	{id-at 40}
--- id-at-encryptedCrossCertificatePair OBJECT IDENTIFIER ::=
---   {id-at 40 2}
+ id-at-encryptedCollectiveTelexNumber OBJECT IDENTIFIER ::= {id-at 21 1 2}
+ 
+ id-at-teletexTerminalIdentifier  			OBJECT IDENTIFIER	::=	{id-at 22}
+ id-at-encryptedTeletexTerminalIdentifier		OBJECT IDENTIFIER	::=	{id-at 22 2}
+ id-at-collectiveTeletexTerminalIdentifier		OBJECT IDENTIFIER	::=	{id-at 22 1}
+ id-at-encryptedCollectiveTeletexTerminalIdentifier
+ 							OBJECT IDENTIFIER	::=	{id-at 22 1 2}
+ id-at-facsimileTelephoneNumber OBJECT IDENTIFIER ::=
+   {id-at 23}
+ 
+ id-at-encryptedFacsimileTelephoneNumber OBJECT IDENTIFIER ::= {id-at 23 2}
+ 
+ id-at-collectiveFacsimileTelephoneNumber OBJECT IDENTIFIER ::= {id-at 23 1}
+ 
+ id-at-encryptedCollectiveFacsimileTelephoneNumber OBJECT IDENTIFIER ::=
+   {id-at 23 1 2}
+ 
+ id-at-x121Address OBJECT IDENTIFIER ::= {id-at 24}
+ 
+ id-at-encryptedX121Address OBJECT IDENTIFIER ::= {id-at 24 2}
+ 
+ id-at-internationalISDNNumber OBJECT IDENTIFIER ::= {id-at 25}
+ 
+ id-at-encryptedInternationalISDNNumber OBJECT IDENTIFIER ::= {id-at 25 2}
+ 
+ id-at-collectiveInternationalISDNNumber OBJECT IDENTIFIER ::= {id-at 25 1}
+ 
+ id-at-encryptedCollectiveInternationalISDNNumber OBJECT IDENTIFIER ::=
+   {id-at 25 1 2}
+ 
+ id-at-registeredAddress OBJECT IDENTIFIER ::= {id-at 26}
+ 
+ id-at-encryptedRegisteredAddress OBJECT IDENTIFIER ::= {id-at 26 2}
+ 
+ id-at-destinationIndicator OBJECT IDENTIFIER ::= {id-at 27}
+ 
+ id-at-encryptedDestinationIndicator OBJECT IDENTIFIER ::= {id-at 27 2}
+ 
+ id-at-preferredDeliveryMethod OBJECT IDENTIFIER ::= {id-at 28}
+ 
+ id-at-encryptedPreferredDeliveryMethod OBJECT IDENTIFIER ::= {id-at 28 2}
+ 
+ id-at-presentationAddress OBJECT IDENTIFIER ::= {id-at 29}
+ 
+ id-at-encryptedPresentationAddress OBJECT IDENTIFIER ::= {id-at 29 2}
+ 
+ id-at-supportedApplicationContext OBJECT IDENTIFIER ::= {id-at 30}
+ 
+ id-at-encryptedSupportedApplicationContext OBJECT IDENTIFIER ::= {id-at 30 2}
+ 
+ id-at-member OBJECT IDENTIFIER ::= {id-at 31}
+ 
+ id-at-encryptedMember OBJECT IDENTIFIER ::= {id-at 31 2}
+ 
+ id-at-owner OBJECT IDENTIFIER ::= {id-at 32}
+ 
+ id-at-encryptedOwner OBJECT IDENTIFIER ::= {id-at 32 2}
+ 
+ id-at-roleOccupant OBJECT IDENTIFIER ::= {id-at 33}
+ 
+ id-at-encryptedRoleOccupant OBJECT IDENTIFIER ::= {id-at 33 2}
+ 
+ id-at-seeAlso OBJECT IDENTIFIER ::= {id-at 34}
+ 
+ id-at-encryptedSeeAlso OBJECT IDENTIFIER ::= {id-at 34 2}
+ 
+ id-at-userPassword					OBJECT IDENTIFIER	::=	{id-at 35}
+ id-at-encryptedUserPassword OBJECT IDENTIFIER ::=
+   {id-at 35 2}
+ 
+ id-at-userCertificate					OBJECT IDENTIFIER	::=	{id-at 36}
+ id-at-encryptedUserCertificate OBJECT IDENTIFIER ::=
+   {id-at 36 2}
+ 
+ id-at-cACertificate					OBJECT IDENTIFIER	::=	{id-at 37}
+ id-at-encryptedCACertificate OBJECT IDENTIFIER ::=
+   {id-at 37 2}
+ 
+ id-at-authorityRevocationList				OBJECT IDENTIFIER	::=	{id-at 38}
+ id-at-encryptedAuthorityRevocationList OBJECT IDENTIFIER ::=
+   {id-at 38 2}
+ 
+ id-at-certificateRevocationList			OBJECT IDENTIFIER	::=	{id-at 39}
+ id-at-encryptedCertificateRevocationList OBJECT IDENTIFIER ::=
+   {id-at 39 2}
+ 
+ id-at-crossCertificatePair				OBJECT IDENTIFIER	::=	{id-at 40}
+ id-at-encryptedCrossCertificatePair OBJECT IDENTIFIER ::=
+   {id-at 40 2}
 
 id-at-name OBJECT IDENTIFIER ::= {id-at 41}
 
 id-at-givenName OBJECT IDENTIFIER ::= {id-at 42}
 
--- id-at-encryptedGivenName OBJECT IDENTIFIER ::= {id-at 42 2}
+ id-at-encryptedGivenName OBJECT IDENTIFIER ::= {id-at 42 2}
 
 id-at-initials OBJECT IDENTIFIER ::= {id-at 43}
 
--- id-at-encryptedInitials OBJECT IDENTIFIER ::= {id-at 43 2}
+ id-at-encryptedInitials OBJECT IDENTIFIER ::= {id-at 43 2}
 
 id-at-generationQualifier OBJECT IDENTIFIER ::= {id-at 44}
 
--- id-at-encryptedGenerationQualifier OBJECT IDENTIFIER ::= {id-at 44 2}
--- 
--- id-at-uniqueIdentifier OBJECT IDENTIFIER ::= {id-at 45}
--- 
--- id-at-encryptedUniqueIdentifier OBJECT IDENTIFIER ::= {id-at 45 2}
--- 
--- id-at-dnQualifier OBJECT IDENTIFIER ::= {id-at 46}
--- 
--- id-at-encryptedDnQualifier OBJECT IDENTIFIER ::= {id-at 46 2}
--- 
--- id-at-enhancedSearchGuide OBJECT IDENTIFIER ::= {id-at 47}
--- 
--- id-at-encryptedEnhancedSearchGuide OBJECT IDENTIFIER ::= {id-at 47 2}
--- 
--- id-at-protocolInformation OBJECT IDENTIFIER ::= {id-at 48}
--- 
--- id-at-encryptedProtocolInformation OBJECT IDENTIFIER ::= {id-at 48 2}
--- 
--- id-at-distinguishedName OBJECT IDENTIFIER ::= {id-at 49}
--- 
--- id-at-encryptedDistinguishedName OBJECT IDENTIFIER ::= {id-at 49 2}
--- 
--- id-at-uniqueMember OBJECT IDENTIFIER ::= {id-at 50}
--- 
--- id-at-encryptedUniqueMember OBJECT IDENTIFIER ::= {id-at 50 2}
+ id-at-encryptedGenerationQualifier OBJECT IDENTIFIER ::= {id-at 44 2}
+ 
+ id-at-uniqueIdentifier OBJECT IDENTIFIER ::= {id-at 45}
+ 
+ id-at-encryptedUniqueIdentifier OBJECT IDENTIFIER ::= {id-at 45 2}
+ 
+ id-at-dnQualifier OBJECT IDENTIFIER ::= {id-at 46}
+ 
+ id-at-encryptedDnQualifier OBJECT IDENTIFIER ::= {id-at 46 2}
+ 
+ id-at-enhancedSearchGuide OBJECT IDENTIFIER ::= {id-at 47}
+ 
+ id-at-encryptedEnhancedSearchGuide OBJECT IDENTIFIER ::= {id-at 47 2}
+ 
+ id-at-protocolInformation OBJECT IDENTIFIER ::= {id-at 48}
+ 
+ id-at-encryptedProtocolInformation OBJECT IDENTIFIER ::= {id-at 48 2}
+ 
+ id-at-distinguishedName OBJECT IDENTIFIER ::= {id-at 49}
+ 
+ id-at-encryptedDistinguishedName OBJECT IDENTIFIER ::= {id-at 49 2}
+ 
+ id-at-uniqueMember OBJECT IDENTIFIER ::= {id-at 50}
+ 
+ id-at-encryptedUniqueMember OBJECT IDENTIFIER ::= {id-at 50 2}
 
 id-at-houseIdentifier OBJECT IDENTIFIER ::= {id-at 51}
 
--- id-at-encryptedHouseIdentifier OBJECT IDENTIFIER ::= {id-at 51 2}
--- 
--- id-at-supportedAlgorithms				OBJECT IDENTIFIER	::=	{id-at 52}
--- id-at-encryptedSupportedAlgorithms OBJECT IDENTIFIER ::=
---   {id-at 52 2}
--- 
--- id-at-deltaRevocationList				OBJECT IDENTIFIER	::=	{id-at 53}
--- id-at-encryptedDeltaRevocationList OBJECT IDENTIFIER ::=
---   {id-at 53 2}
+ id-at-encryptedHouseIdentifier OBJECT IDENTIFIER ::= {id-at 51 2}
+ 
+ id-at-supportedAlgorithms				OBJECT IDENTIFIER	::=	{id-at 52}
+ id-at-encryptedSupportedAlgorithms OBJECT IDENTIFIER ::=
+   {id-at 52 2}
+ 
+ id-at-deltaRevocationList				OBJECT IDENTIFIER	::=	{id-at 53}
+ id-at-encryptedDeltaRevocationList OBJECT IDENTIFIER ::=
+   {id-at 53 2}
 
 id-at-dmdName OBJECT IDENTIFIER ::= {id-at 54}
 
--- id-at-encryptedDmdName OBJECT IDENTIFIER ::= {id-at 54 2}
--- 
--- id-at-clearance   						OBJECT IDENTIFIER	::=	{id-at 55}
--- id-at-encryptedClearance OBJECT IDENTIFIER ::=
---   {id-at 55 2}
--- 
--- id-at-defaultDirQop					OBJECT IDENTIFIER	::=	{id-at 56}
--- id-at-encryptedDefaultDirQop OBJECT IDENTIFIER ::=
---   {id-at 56 2}
--- 
--- id-at-attributeIntegrityInfo				OBJECT IDENTIFIER	::=	{id-at 57}
--- id-at-encryptedAttributeIntegrityInfo OBJECT IDENTIFIER ::=
---   {id-at 57 2}
--- 
--- id-at-attributeCertificate					OBJECT IDENTIFIER	::=	{id-at 58} 
--- id-at-encryptedAttributeCertificate OBJECT IDENTIFIER ::=
---   {id-at 58 2}
--- 
--- id-at-attributeCertificateRevocationList		OBJECT IDENTIFIER	::=	{id-at 59}
--- id-at-encryptedAttributeCertificateRevocationList OBJECT IDENTIFIER ::=
---   {id-at 59 2}
--- 
--- id-at-confKeyInfo					OBJECT IDENTIFIER	::=	{id-at 60}
--- id-at-encryptedConfKeyInfo OBJECT IDENTIFIER ::=
---   {id-at 60 2}
--- 
--- id-at-family-information			        OBJECT IDENTIFIER		{id-at 64}
+ id-at-encryptedDmdName OBJECT IDENTIFIER ::= {id-at 54 2}
+ 
+ id-at-clearance   						OBJECT IDENTIFIER	::=	{id-at 55}
+ id-at-encryptedClearance OBJECT IDENTIFIER ::=
+   {id-at 55 2}
+ 
+ id-at-defaultDirQop					OBJECT IDENTIFIER	::=	{id-at 56}
+ id-at-encryptedDefaultDirQop OBJECT IDENTIFIER ::=
+   {id-at 56 2}
+ 
+ id-at-attributeIntegrityInfo				OBJECT IDENTIFIER	::=	{id-at 57}
+ id-at-encryptedAttributeIntegrityInfo OBJECT IDENTIFIER ::=
+   {id-at 57 2}
+ 
+ id-at-attributeCertificate					OBJECT IDENTIFIER	::=	{id-at 58} 
+ id-at-encryptedAttributeCertificate OBJECT IDENTIFIER ::=
+   {id-at 58 2}
+ 
+ id-at-attributeCertificateRevocationList		OBJECT IDENTIFIER	::=	{id-at 59}
+ id-at-encryptedAttributeCertificateRevocationList OBJECT IDENTIFIER ::=
+   {id-at 59 2}
+ 
+ id-at-confKeyInfo					OBJECT IDENTIFIER	::=	{id-at 60}
+ id-at-encryptedConfKeyInfo OBJECT IDENTIFIER ::=
+   {id-at 60 2}
+ 
+ --id-at-family-information			        OBJECT IDENTIFIER		{id-at 64}
 id-at-pseudonym OBJECT IDENTIFIER ::= {id-at 65}
--- 
--- id-at-communicationsService OBJECT IDENTIFIER ::= {id-at 66}
--- 
--- id-at-communicationsNetwork OBJECT IDENTIFIER ::= {id-at 67}
--- 
+ 
+ id-at-communicationsService OBJECT IDENTIFIER ::= {id-at 66}
+ 
+ id-at-communicationsNetwork OBJECT IDENTIFIER ::= {id-at 67}
+ 
 -- Matching rules 
--- id-mr-objectIdentifierMatch 				OBJECT IDENTIFIER	::=	{id-mr 0}
--- id-mr-distinguishedNameMatch			OBJECT IDENTIFIER	::=	{id-mr 1}
--- id-mr-caseIgnoreMatch OBJECT IDENTIFIER ::=
---   {id-mr 2}
--- 
--- id-mr-caseIgnoreOrderingMatch OBJECT IDENTIFIER ::= {id-mr 3}
--- 
--- id-mr-caseIgnoreSubstringsMatch OBJECT IDENTIFIER ::= {id-mr 4}
--- 
--- id-mr-caseExactMatch OBJECT IDENTIFIER ::= {id-mr 5}
--- 
--- id-mr-caseExactOrderingMatch OBJECT IDENTIFIER ::= {id-mr 6}
--- 
--- id-mr-caseExactSubstringsMatch OBJECT IDENTIFIER ::= {id-mr 7}
--- 
--- id-mr-numericStringMatch OBJECT IDENTIFIER ::= {id-mr 8}
--- 
--- id-mr-numericStringOrderingMatch OBJECT IDENTIFIER ::= {id-mr 9}
--- 
--- id-mr-numericStringSubstringsMatch OBJECT IDENTIFIER ::= {id-mr 10}
--- 
--- id-mr-caseIgnoreListMatch OBJECT IDENTIFIER ::= {id-mr 11}
--- 
--- id-mr-caseIgnoreListSubstringsMatch OBJECT IDENTIFIER ::= {id-mr 12}
--- 
--- id-mr-booleanMatch OBJECT IDENTIFIER ::= {id-mr 13}
--- 
--- id-mr-integerMatch OBJECT IDENTIFIER ::= {id-mr 14}
--- 
--- id-mr-integerOrderingMatch OBJECT IDENTIFIER ::= {id-mr 15}
--- 
--- id-mr-bitStringMatch OBJECT IDENTIFIER ::= {id-mr 16}
--- 
--- id-mr-octetStringMatch OBJECT IDENTIFIER ::= {id-mr 17}
--- 
--- id-mr-octetStringOrderingMatch OBJECT IDENTIFIER ::= {id-mr 18}
--- 
--- id-mr-octetStringSubstringsMatch OBJECT IDENTIFIER ::= {id-mr 19}
--- 
--- id-mr-telephoneNumberMatch OBJECT IDENTIFIER ::= {id-mr 20}
--- 
--- id-mr-telephoneNumberSubstringsMatch OBJECT IDENTIFIER ::= {id-mr 21}
--- 
--- id-mr-presentationAddressMatch OBJECT IDENTIFIER ::= {id-mr 22}
--- 
--- id-mr-uniqueMemberMatch OBJECT IDENTIFIER ::= {id-mr 23}
--- 
--- id-mr-protocolInformationMatch OBJECT IDENTIFIER ::= {id-mr 24}
--- 
--- id-mr-uTCTimeMatch OBJECT IDENTIFIER ::= {id-mr 25}
--- 
--- id-mr-uTCTimeOrderingMatch OBJECT IDENTIFIER ::= {id-mr 26}
--- 
--- id-mr-generalizedTimeMatch OBJECT IDENTIFIER ::= {id-mr 27}
--- 
--- id-mr-generalizedTimeOrderingMatch OBJECT IDENTIFIER ::= {id-mr 28}
--- 
--- id-mr-integerFirstComponentMatch OBJECT IDENTIFIER ::= {id-mr 29}
--- 
--- id-mr-objectIdentifierFirstComponentMatch OBJECT IDENTIFIER ::= {id-mr 30}
--- 
--- id-mr-directoryStringFirstComponentMatch OBJECT IDENTIFIER ::= {id-mr 31}
--- 
--- id-mr-wordMatch OBJECT IDENTIFIER ::= {id-mr 32}
--- 
--- id-mr-keywordMatch OBJECT IDENTIFIER ::= {id-mr 33}
--- 
--- id-mr-certificateExactMatch				OBJECT IDENTIFIER	::=	{id-mr 34}
--- id-mr-certificateMatch					OBJECT IDENTIFIER	::=	{id-mr 35}
--- id-mr-certificatePairExactMatch			OBJECT IDENTIFIER	::=	{id-mr 36}
--- id-mr-certificatePairMatch				OBJECT IDENTIFIER	::=	{id-mr 37}
--- id-mr-certificateListExactMatch			OBJECT IDENTIFIER	::=	{id-mr 38}
--- id-mr-certificateListMatch				OBJECT IDENTIFIER	::=	{id-mr 39}
--- id-mr-algorithmIdentifierMatch			OBJECT IDENTIFIER	::=	{id-mr 40}
--- id-mr-storedPrefixMatch OBJECT IDENTIFIER ::=
---   {id-mr 41}
--- 
--- id-mr-attributeCertificateMatch			OBJECT IDENTIFIER 	::=	{id-mr 42}
--- id-mr-readerAndKeyIDMatch				OBJECT IDENTIFIER	::=	{id-mr 43}
--- id-mr-attributeIntegrityMatch				OBJECT IDENTIFIER 	::=	{id-mr 44}
--- id-mr-systemProposedMatch OBJECT IDENTIFIER ::=
---   {id-mr 47}
--- 
--- id-mr-generalWordMatch OBJECT IDENTIFIER ::= {id-mr 48}
--- 
--- id-mr-approximateStringMatch OBJECT IDENTIFIER ::= {id-mr 49}
--- 
--- id-mr-ignoreIfAbsentMatch OBJECT IDENTIFIER ::= {id-mr 50}
--- 
--- id-mr-nullMatch OBJECT IDENTIFIER ::= {id-mr 51}
--- 
--- id-mr-zonalMatch OBJECT IDENTIFIER ::= {id-mr 52}
--- 
--- id-mr-facsimileNumberMatch OBJECT IDENTIFIER ::= {id-mr 63}
--- 
--- id-mr-facsimileNumberSubstringsMatch OBJECT IDENTIFIER ::= {id-mr 64}
--- 
+ id-mr-objectIdentifierMatch 				OBJECT IDENTIFIER	::=	{id-mr 0}
+ id-mr-distinguishedNameMatch			OBJECT IDENTIFIER	::=	{id-mr 1}
+ id-mr-caseIgnoreMatch OBJECT IDENTIFIER ::=
+   {id-mr 2}
+ 
+ id-mr-caseIgnoreOrderingMatch OBJECT IDENTIFIER ::= {id-mr 3}
+ 
+ id-mr-caseIgnoreSubstringsMatch OBJECT IDENTIFIER ::= {id-mr 4}
+ 
+ id-mr-caseExactMatch OBJECT IDENTIFIER ::= {id-mr 5}
+ 
+ id-mr-caseExactOrderingMatch OBJECT IDENTIFIER ::= {id-mr 6}
+ 
+ id-mr-caseExactSubstringsMatch OBJECT IDENTIFIER ::= {id-mr 7}
+ 
+ id-mr-numericStringMatch OBJECT IDENTIFIER ::= {id-mr 8}
+ 
+ id-mr-numericStringOrderingMatch OBJECT IDENTIFIER ::= {id-mr 9}
+ 
+ id-mr-numericStringSubstringsMatch OBJECT IDENTIFIER ::= {id-mr 10}
+ 
+ id-mr-caseIgnoreListMatch OBJECT IDENTIFIER ::= {id-mr 11}
+ 
+ id-mr-caseIgnoreListSubstringsMatch OBJECT IDENTIFIER ::= {id-mr 12}
+ 
+ id-mr-booleanMatch OBJECT IDENTIFIER ::= {id-mr 13}
+ 
+ id-mr-integerMatch OBJECT IDENTIFIER ::= {id-mr 14}
+ 
+ id-mr-integerOrderingMatch OBJECT IDENTIFIER ::= {id-mr 15}
+ 
+ id-mr-bitStringMatch OBJECT IDENTIFIER ::= {id-mr 16}
+ 
+ id-mr-octetStringMatch OBJECT IDENTIFIER ::= {id-mr 17}
+ 
+ id-mr-octetStringOrderingMatch OBJECT IDENTIFIER ::= {id-mr 18}
+ 
+ id-mr-octetStringSubstringsMatch OBJECT IDENTIFIER ::= {id-mr 19}
+ 
+ id-mr-telephoneNumberMatch OBJECT IDENTIFIER ::= {id-mr 20}
+ 
+ id-mr-telephoneNumberSubstringsMatch OBJECT IDENTIFIER ::= {id-mr 21}
+ 
+ id-mr-presentationAddressMatch OBJECT IDENTIFIER ::= {id-mr 22}
+ 
+ id-mr-uniqueMemberMatch OBJECT IDENTIFIER ::= {id-mr 23}
+ 
+ id-mr-protocolInformationMatch OBJECT IDENTIFIER ::= {id-mr 24}
+ 
+ id-mr-uTCTimeMatch OBJECT IDENTIFIER ::= {id-mr 25}
+ 
+ id-mr-uTCTimeOrderingMatch OBJECT IDENTIFIER ::= {id-mr 26}
+ 
+ id-mr-generalizedTimeMatch OBJECT IDENTIFIER ::= {id-mr 27}
+ 
+ id-mr-generalizedTimeOrderingMatch OBJECT IDENTIFIER ::= {id-mr 28}
+ 
+ id-mr-integerFirstComponentMatch OBJECT IDENTIFIER ::= {id-mr 29}
+ 
+ id-mr-objectIdentifierFirstComponentMatch OBJECT IDENTIFIER ::= {id-mr 30}
+ 
+ id-mr-directoryStringFirstComponentMatch OBJECT IDENTIFIER ::= {id-mr 31}
+ 
+ id-mr-wordMatch OBJECT IDENTIFIER ::= {id-mr 32}
+ 
+ id-mr-keywordMatch OBJECT IDENTIFIER ::= {id-mr 33}
+ 
+ id-mr-certificateExactMatch				OBJECT IDENTIFIER	::=	{id-mr 34}
+ id-mr-certificateMatch					OBJECT IDENTIFIER	::=	{id-mr 35}
+ id-mr-certificatePairExactMatch			OBJECT IDENTIFIER	::=	{id-mr 36}
+ id-mr-certificatePairMatch				OBJECT IDENTIFIER	::=	{id-mr 37}
+ id-mr-certificateListExactMatch			OBJECT IDENTIFIER	::=	{id-mr 38}
+ id-mr-certificateListMatch				OBJECT IDENTIFIER	::=	{id-mr 39}
+ id-mr-algorithmIdentifierMatch			OBJECT IDENTIFIER	::=	{id-mr 40}
+ id-mr-storedPrefixMatch OBJECT IDENTIFIER ::=
+   {id-mr 41}
+ 
+ id-mr-attributeCertificateMatch			OBJECT IDENTIFIER 	::=	{id-mr 42}
+ id-mr-readerAndKeyIDMatch				OBJECT IDENTIFIER	::=	{id-mr 43}
+ id-mr-attributeIntegrityMatch				OBJECT IDENTIFIER 	::=	{id-mr 44}
+ id-mr-systemProposedMatch OBJECT IDENTIFIER ::=
+   {id-mr 47}
+ 
+ id-mr-generalWordMatch OBJECT IDENTIFIER ::= {id-mr 48}
+ 
+ id-mr-approximateStringMatch OBJECT IDENTIFIER ::= {id-mr 49}
+ 
+ id-mr-ignoreIfAbsentMatch OBJECT IDENTIFIER ::= {id-mr 50}
+ 
+ id-mr-nullMatch OBJECT IDENTIFIER ::= {id-mr 51}
+ 
+ id-mr-zonalMatch OBJECT IDENTIFIER ::= {id-mr 52}
+ 
+ id-mr-facsimileNumberMatch OBJECT IDENTIFIER ::= {id-mr 63}
+ 
+ id-mr-facsimileNumberSubstringsMatch OBJECT IDENTIFIER ::= {id-mr 64}
+ 
 -- contexts 
--- id-avc-language OBJECT IDENTIFIER ::= {id-avc 0}
--- 
--- id-avc-temporal OBJECT IDENTIFIER ::= {id-avc 1}
--- 
--- id-avc-locale OBJECT IDENTIFIER ::= {id-avc 2}
--- 
--- id-avc-attributeValueSecurityLabelContext  	OBJECT IDENTIFIER	::=	{id-avc 3}
--- id-avc-attributeValueIntegrityInfoContext		OBJECT IDENTIFIER	::=	{id-avc 4}
+ id-avc-language OBJECT IDENTIFIER ::= {id-avc 0}
+ 
+ id-avc-temporal OBJECT IDENTIFIER ::= {id-avc 1}
+ 
+ id-avc-locale OBJECT IDENTIFIER ::= {id-avc 2}
+ 
+ id-avc-attributeValueSecurityLabelContext  	OBJECT IDENTIFIER	::=	{id-avc 3}
+ id-avc-attributeValueIntegrityInfoContext		OBJECT IDENTIFIER	::=	{id-avc 4}
 -- Problem definitions 
--- id-pr-targetDsaUnavailable OBJECT IDENTIFIER ::=
---   {id-pr 1}
--- 
--- id-pr-dataSourceUnavailable OBJECT IDENTIFIER ::= {id-pr 2}
--- 
--- id-pr-unidentifiedOperation OBJECT IDENTIFIER ::= {id-pr 3}
--- 
--- id-pr-unavailableOperation OBJECT IDENTIFIER ::= {id-pr 4}
--- 
--- id-pr-searchAttributeViolation OBJECT IDENTIFIER ::= {id-pr 5}
--- 
--- id-pr-searchAttributeCombinationViolation OBJECT IDENTIFIER ::= {id-pr 6}
--- 
--- id-pr-searchValueNotAllowed OBJECT IDENTIFIER ::= {id-pr 7}
--- 
--- id-pr-missingSearchAttribute OBJECT IDENTIFIER ::= {id-pr 8}
--- 
--- id-pr-searchValueViolation OBJECT IDENTIFIER ::= {id-pr 9}
--- 
--- id-pr-attributeNegationViolation OBJECT IDENTIFIER ::= {id-pr 10}
--- 
--- id-pr-searchValueRequired OBJECT IDENTIFIER ::= {id-pr 11}
--- 
--- id-pr-invalidSearchValue OBJECT IDENTIFIER ::= {id-pr 12}
--- 
--- id-pr-searchContextViolation OBJECT IDENTIFIER ::= {id-pr 13}
--- 
--- id-pr-searchContextCombinationViolation OBJECT IDENTIFIER ::= {id-pr 14}
--- 
--- id-pr-missingSearchContext OBJECT IDENTIFIER ::= {id-pr 15}
--- 
--- id-pr-searchContextValueViolation OBJECT IDENTIFIER ::= {id-pr 16}
--- 
--- id-pr-searchContextValueRequired OBJECT IDENTIFIER ::= {id-pr 17}
--- 
--- id-pr-invalidContextSearchValue OBJECT IDENTIFIER ::= {id-pr 18}
--- 
--- id-pr-unsupportedMatchingRule OBJECT IDENTIFIER ::= {id-pr 19}
--- 
--- id-pr-attributeMatchingViolation OBJECT IDENTIFIER ::= {id-pr 20}
--- 
--- id-pr-unsupportedMatchingUse OBJECT IDENTIFIER ::= {id-pr 21}
--- 
--- id-pr-matchingUseViolation OBJECT IDENTIFIER ::= {id-pr 22}
--- 
--- id-pr-hierarchySelectForbidden OBJECT IDENTIFIER ::= {id-pr 23}
--- 
--- id-pr-invalidHierarchySelect OBJECT IDENTIFIER ::= {id-pr 24}
--- 
--- id-pr-unavailableHierarchySelect OBJECT IDENTIFIER ::= {id-pr 25}
--- 
--- id-pr-invalidSearchOptions OBJECT IDENTIFIER ::= {id-pr 26}
--- 
--- id-pr-missingSearchOptions OBJECT IDENTIFIER ::= {id-pr 27}
--- 
--- id-pr-invalidServiceControlOptions OBJECT IDENTIFIER ::= {id-pr 28}
--- 
--- id-pr-missingServiceControlOptions OBJECT IDENTIFIER ::= {id-pr 29}
--- 
--- id-pr-searchSubsetViolation OBJECT IDENTIFIER ::= {id-pr 30}
--- 
--- id-pr-unmatchedKeyAttributes OBJECT IDENTIFIER ::= {id-pr 31}
--- 
--- id-pr-ambiguousKeyAttributes OBJECT IDENTIFIER ::= {id-pr 32}
--- 
+ id-pr-targetDsaUnavailable OBJECT IDENTIFIER ::=
+   {id-pr 1}
+ 
+ id-pr-dataSourceUnavailable OBJECT IDENTIFIER ::= {id-pr 2}
+ 
+ id-pr-unidentifiedOperation OBJECT IDENTIFIER ::= {id-pr 3}
+ 
+ id-pr-unavailableOperation OBJECT IDENTIFIER ::= {id-pr 4}
+ 
+ id-pr-searchAttributeViolation OBJECT IDENTIFIER ::= {id-pr 5}
+ 
+ id-pr-searchAttributeCombinationViolation OBJECT IDENTIFIER ::= {id-pr 6}
+ 
+ id-pr-searchValueNotAllowed OBJECT IDENTIFIER ::= {id-pr 7}
+ 
+ id-pr-missingSearchAttribute OBJECT IDENTIFIER ::= {id-pr 8}
+ 
+ id-pr-searchValueViolation OBJECT IDENTIFIER ::= {id-pr 9}
+ 
+ id-pr-attributeNegationViolation OBJECT IDENTIFIER ::= {id-pr 10}
+ 
+ id-pr-searchValueRequired OBJECT IDENTIFIER ::= {id-pr 11}
+ 
+ id-pr-invalidSearchValue OBJECT IDENTIFIER ::= {id-pr 12}
+ 
+ id-pr-searchContextViolation OBJECT IDENTIFIER ::= {id-pr 13}
+ 
+ id-pr-searchContextCombinationViolation OBJECT IDENTIFIER ::= {id-pr 14}
+ 
+ id-pr-missingSearchContext OBJECT IDENTIFIER ::= {id-pr 15}
+ 
+ id-pr-searchContextValueViolation OBJECT IDENTIFIER ::= {id-pr 16}
+ 
+ id-pr-searchContextValueRequired OBJECT IDENTIFIER ::= {id-pr 17}
+ 
+ id-pr-invalidContextSearchValue OBJECT IDENTIFIER ::= {id-pr 18}
+ 
+ id-pr-unsupportedMatchingRule OBJECT IDENTIFIER ::= {id-pr 19}
+ 
+ id-pr-attributeMatchingViolation OBJECT IDENTIFIER ::= {id-pr 20}
+ 
+ id-pr-unsupportedMatchingUse OBJECT IDENTIFIER ::= {id-pr 21}
+ 
+ id-pr-matchingUseViolation OBJECT IDENTIFIER ::= {id-pr 22}
+ 
+ id-pr-hierarchySelectForbidden OBJECT IDENTIFIER ::= {id-pr 23}
+ 
+ id-pr-invalidHierarchySelect OBJECT IDENTIFIER ::= {id-pr 24}
+ 
+ id-pr-unavailableHierarchySelect OBJECT IDENTIFIER ::= {id-pr 25}
+ 
+ id-pr-invalidSearchOptions OBJECT IDENTIFIER ::= {id-pr 26}
+ 
+ id-pr-missingSearchOptions OBJECT IDENTIFIER ::= {id-pr 27}
+ 
+ id-pr-invalidServiceControlOptions OBJECT IDENTIFIER ::= {id-pr 28}
+ 
+ id-pr-missingServiceControlOptions OBJECT IDENTIFIER ::= {id-pr 29}
+ 
+ id-pr-searchSubsetViolation OBJECT IDENTIFIER ::= {id-pr 30}
+ 
+ id-pr-unmatchedKeyAttributes OBJECT IDENTIFIER ::= {id-pr 31}
+ 
+ id-pr-ambiguousKeyAttributes OBJECT IDENTIFIER ::= {id-pr 32}
+ 
 -- Notification attributes 
--- id-not-dSAProblem OBJECT IDENTIFIER ::= {id-not 0}
--- 
--- id-not-searchServiceProblem OBJECT IDENTIFIER ::= {id-not 1}
--- 
--- id-not-serviceType OBJECT IDENTIFIER ::= {id-not 2}
--- 
--- id-not-attributeTypeList OBJECT IDENTIFIER ::= {id-not 3}
--- 
--- id-not-matchingRuleList OBJECT IDENTIFIER ::= {id-not 4}
--- 
--- id-not-filterItem OBJECT IDENTIFIER ::= {id-not 5}
--- 
--- id-not-attributeCombinations OBJECT IDENTIFIER ::= {id-not 6}
--- 
--- id-not-contextTypeList OBJECT IDENTIFIER ::= {id-not 7}
--- 
--- id-not-contextList OBJECT IDENTIFIER ::= {id-not 8}
--- 
--- id-not-contextCombinations OBJECT IDENTIFIER ::= {id-not 9}
--- 
--- id-not-hierarchySelectList OBJECT IDENTIFIER ::= {id-not 10}
--- 
--- id-not-searchOptionsList OBJECT IDENTIFIER ::= {id-not 11}
--- 
--- id-not-serviceControlOptionsList OBJECT IDENTIFIER ::= {id-not 12}
--- 
--- id-not-multipleMatchingLocalities OBJECT IDENTIFIER ::= {id-not 13}
--- 
--- id-not-proposedRelaxation OBJECT IDENTIFIER ::= {id-not 14}
--- 
--- id-not-appliedRelaxation OBJECT IDENTIFIER ::= {id-not 15}
--- 
--- id-not-substringRequirements OBJECT IDENTIFIER ::= {id-not 16}
--- 
+ id-not-dSAProblem OBJECT IDENTIFIER ::= {id-not 0}
+ 
+ id-not-searchServiceProblem OBJECT IDENTIFIER ::= {id-not 1}
+ 
+ id-not-serviceType OBJECT IDENTIFIER ::= {id-not 2}
+ 
+ id-not-attributeTypeList OBJECT IDENTIFIER ::= {id-not 3}
+ 
+ id-not-matchingRuleList OBJECT IDENTIFIER ::= {id-not 4}
+ 
+ id-not-filterItem OBJECT IDENTIFIER ::= {id-not 5}
+ 
+ id-not-attributeCombinations OBJECT IDENTIFIER ::= {id-not 6}
+ 
+ id-not-contextTypeList OBJECT IDENTIFIER ::= {id-not 7}
+ 
+ id-not-contextList OBJECT IDENTIFIER ::= {id-not 8}
+ 
+ id-not-contextCombinations OBJECT IDENTIFIER ::= {id-not 9}
+ 
+ id-not-hierarchySelectList OBJECT IDENTIFIER ::= {id-not 10}
+ 
+ id-not-searchOptionsList OBJECT IDENTIFIER ::= {id-not 11}
+ 
+ id-not-serviceControlOptionsList OBJECT IDENTIFIER ::= {id-not 12}
+ 
+ id-not-multipleMatchingLocalities OBJECT IDENTIFIER ::= {id-not 13}
+ 
+ id-not-proposedRelaxation OBJECT IDENTIFIER ::= {id-not 14}
+ 
+ id-not-appliedRelaxation OBJECT IDENTIFIER ::= {id-not 15}
+ 
+ id-not-substringRequirements OBJECT IDENTIFIER ::= {id-not 16}
+ 
 -- Control  attributes 
--- id-cat-sequenceMatchType OBJECT IDENTIFIER ::=
---   {id-cat 1}
--- 
--- id-cat-wordMatchType OBJECT IDENTIFIER ::= {id-cat 2}
--- 
--- id-cat-characterMatchTypes OBJECT IDENTIFIER ::= {id-cat 3}
--- 
--- id-cat-selectedContexts OBJECT IDENTIFIER ::= {id-cat 4}
-
---
+ id-cat-sequenceMatchType OBJECT IDENTIFIER ::=
+   {id-cat 1}
+ 
+ id-cat-wordMatchType OBJECT IDENTIFIER ::= {id-cat 2}
+ 
+ id-cat-characterMatchTypes OBJECT IDENTIFIER ::= {id-cat 3}
+ 
+ id-cat-selectedContexts OBJECT IDENTIFIER ::= {id-cat 4}
+
+
 -- We add these in to give the low-level ASN.1 syntaxes
 -- PrintableString and ObjectIdentifier are the most useful
 -- Note the "Syntax" will be removed during the "make" - it is 
 -- present to stop asn2wrs complaining about reserved words
---
+-- Needed to be able to "call" them from OID callbacks.(see .cnf)
 
 ObjectIdentifier ::= OBJECT IDENTIFIER
 OctetString ::= OCTET STRING
@@ -1466,21 +1466,22 @@ Integer ::= INTEGER
 Boolean ::= BOOLEAN
 
 -- these are reserved words, so we need to prefix them
+-- Currently not used ones commented out.
 SyntaxGeneralizedTime ::= GeneralizedTime
 SyntaxUTCTime ::= UTCTime
 SyntaxNumericString ::= NumericString
 SyntaxPrintableString ::= PrintableString
 SyntaxIA5String ::= IA5String
 SyntaxBMPString ::= BMPString
-SyntaxUniversalString ::= UniversalString
+--SyntaxUniversalString ::= UniversalString
 SyntaxUTF8String ::= UTF8String
-SyntaxTeletexString ::= TeletexString
-SyntaxT61String ::= T61String
-SyntaxVideotexString ::= VideotexString
+--SyntaxTeletexString ::= TeletexString
+--SyntaxT61String ::= T61String
+--SyntaxVideotexString ::= VideotexString
 SyntaxGraphicString ::= GraphicString
-SyntaxISO646String ::= ISO646String
-SyntaxVisibleString ::= VisibleString
-SyntaxGeneralString ::= GeneralString
+--SyntaxISO646String ::= ISO646String
+--SyntaxVisibleString ::= VisibleString
+--SyntaxGeneralString ::= GeneralString
 GUID ::= OCTET STRING
 
 END -- SelectedAttributeTypes
diff --git a/asn1/x509sat/packet-x509sat-template.c b/asn1/x509sat/packet-x509sat-template.c
index f0dc5ee129..748d61bc34 100644
--- a/asn1/x509sat/packet-x509sat-template.c
+++ b/asn1/x509sat/packet-x509sat-template.c
@@ -37,6 +37,7 @@
 #include <string.h>
 
 #include "packet-ber.h"
+#include "packet-x411.h"
 #include "packet-x509sat.h"
 #include "packet-x509if.h"
 
diff --git a/asn1/x509sat/x509sat.cnf b/asn1/x509sat/x509sat.cnf
index ba5f5d1240..7fc3ecb999 100644
--- a/asn1/x509sat/x509sat.cnf
+++ b/asn1/x509sat/x509sat.cnf
@@ -7,6 +7,10 @@
 GUID			TYPE = FT_GUID  DISPLAY = BASE_NONE  STRING = NULL BITMASK = 0
 
 #.IMPORT ../x509if/x509if-exp.cnf
+#.IMPORT ../x411/x411-exp.cnf
+
+#.MODULE_IMPORT
+MTSAbstractService x411
 
 #.EXPORTS
 CaseIgnoreListMatch
@@ -59,26 +63,7 @@ TelexNumber
 UniqueIdentifier
 X121Address
 
-ObjectIdentifier
-OctetString
-BitString
-Integer
-Boolean
-SyntaxGeneralizedTime
-#SyntaxUTCTime
-#SyntaxNumericString
-SyntaxPrintableString
-SyntaxIA5String
-SyntaxBMPString
-#SyntaxUniversalString
-SyntaxUTF8String
-#SyntaxTeletexString
-#SyntaxT61String
-#SyntaxVideotexString
-SyntaxGraphicString
-#SyntaxISO646String
-#SyntaxVisibleString
-#SyntaxGeneralString
+
 
 #.REGISTER
 ObjectIdentifier        B "2.5.4.0"   "id-at-objectClass"
@@ -162,10 +147,10 @@ DirectoryString        B "2.5.4.65"   "id-at-pseudonym"
 ObjectIdentifier       B "2.5.4.66" "id-at-communuicationsService"
 ObjectIdentifier       B "2.5.4.67" "id-at-communuicationsNetwork"
 
-NumericString		   B "2.5.13.8" "id-mr-numericStringMatch"
+SyntaxNumericString	   B "2.5.13.8" "id-mr-numericStringMatch"
 CaseIgnoreListMatch	   B "2.5.13.11" "id-mr-caseIgnoreListMatch"
 BitString			   B "2.5.13.16" "id-mr-bitStringMatch"
-UTCTime				   B "2.5.13.26" "id-mr-uTCTimeOrderingMatch"
+SyntaxUTCTime		   B "2.5.13.26" "id-mr-uTCTimeOrderingMatch"
 
 SyntaxGeneralizedTime  B "2.5.18.1" "id-oa-createTimeStamp"	
 SyntaxGeneralizedTime  B "2.5.18.2" "id-oa-modifyTimeStamp"