diff options
Diffstat (limited to 'asn1/x509sat')
-rw-r--r-- | asn1/x509sat/Makefile.common | 4 | ||||
-rw-r--r-- | asn1/x509sat/SelectedAttributeTypes.asn | 15 | ||||
-rw-r--r-- | asn1/x509sat/x509sat.cnf | 22 |
3 files changed, 32 insertions, 9 deletions
diff --git a/asn1/x509sat/Makefile.common b/asn1/x509sat/Makefile.common index 49a1670837..3f16e11e9d 100644 --- a/asn1/x509sat/Makefile.common +++ b/asn1/x509sat/Makefile.common @@ -46,10 +46,10 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -e +A2W_FLAGS= -b -e -R -r Syntax EXTRA_CNF= \ - ../x509if/x509if-exp.cnf + ../x509if/x509if-exp.cnf ../x509if/x509if-exp.cnf: (cd ../x509if && $(MAKE_CNF_EXPORT)) diff --git a/asn1/x509sat/SelectedAttributeTypes.asn b/asn1/x509sat/SelectedAttributeTypes.asn index 6b5bfb07df..190226f54a 100644 --- a/asn1/x509sat/SelectedAttributeTypes.asn +++ b/asn1/x509sat/SelectedAttributeTypes.asn @@ -1473,15 +1473,16 @@ 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/x509sat.cnf b/asn1/x509sat/x509sat.cnf index a2223a1f5c..72565f9439 100644 --- a/asn1/x509sat/x509sat.cnf +++ b/asn1/x509sat/x509sat.cnf @@ -65,19 +65,41 @@ ZonalResult ZonalSelect #.PDU +BitString +Boolean CaseIgnoreListMatch CountryName DestinationIndicator DirectoryString EnhancedGuide FacsimileTelephoneNumber +GUID Guide InternationalISDNNumber +Integer NameAndOptionalUID +ObjectIdentifier +OctetString PostalAddress PreferredDeliveryMethod PresentationAddress +SyntaxBMPString +SyntaxGeneralizedTime +SyntaxGeneralString +SyntaxGraphicString +SyntaxIA5String +SyntaxISO646String +SyntaxNumericString +SyntaxPrintableString +SyntaxT61String +SyntaxTeletexString +SyntaxUniversalString +SyntaxUTF8String +SyntaxUTCTime +SyntaxVideotexString +SyntaxVisibleString TelephoneNumber + TelexNumber UniqueIdentifier X121Address |