aboutsummaryrefslogtreecommitdiffstats
path: root/asn1
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2006-04-06 05:09:45 +0000
committerAnders Broman <anders.broman@ericsson.com>2006-04-06 05:09:45 +0000
commitd422653d53473648cbbddd1d3cbb41d37a6a68cc (patch)
treeeb81555b78d5abbb8ac39194e7e15c0e2ecb1689 /asn1
parent4aa5a68788fe3f6732d4f4a822b5ca9d2a968bf4 (diff)
Add two missing *-exp.cnf files
tcap.asn - whitespace changes svn path=/trunk/; revision=17828
Diffstat (limited to 'asn1')
-rw-r--r--asn1/pkix1explicit/pkix1explicit-exp.cnf24
-rw-r--r--asn1/pkix1implicit/pkix1implicit-exp.cnf10
-rw-r--r--asn1/tcap/tcap.asn52
3 files changed, 60 insertions, 26 deletions
diff --git a/asn1/pkix1explicit/pkix1explicit-exp.cnf b/asn1/pkix1explicit/pkix1explicit-exp.cnf
new file mode 100644
index 0000000000..28cf64cad4
--- /dev/null
+++ b/asn1/pkix1explicit/pkix1explicit-exp.cnf
@@ -0,0 +1,24 @@
+#.IMPORT_TAG
+CertificateSerialNumber BER_CLASS_UNI BER_UNI_TAG_INTEGER
+Extensions BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+Extension BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+AttributeTypeAndValue BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+RDNSequence BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+RelativeDistinguishedName BER_CLASS_UNI BER_UNI_TAG_SET
+DirectoryString BER_CLASS_UNI BER_UNI_TAG_PrintableString
+TerminalType BER_CLASS_UNI BER_UNI_TAG_INTEGER
+TeletexDomainDefinedAttribute BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+#.END
+
+#.TYPE_ATTR
+CertificateSerialNumber TYPE = FT_INT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0
+Extensions TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0
+Extension TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
+AttributeTypeAndValue TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
+RDNSequence TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0
+RelativeDistinguishedName TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0
+DirectoryString TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
+TerminalType TYPE = FT_INT32 DISPLAY = BASE_DEC STRINGS = VALS(pkix1explicit_TerminalType_vals) BITMASK = 0
+TeletexDomainDefinedAttribute TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
+#.END
+
diff --git a/asn1/pkix1implicit/pkix1implicit-exp.cnf b/asn1/pkix1implicit/pkix1implicit-exp.cnf
new file mode 100644
index 0000000000..7c6f72cebc
--- /dev/null
+++ b/asn1/pkix1implicit/pkix1implicit-exp.cnf
@@ -0,0 +1,10 @@
+#.IMPORT_TAG
+AuthorityInfoAccessSyntax BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+UserNotice BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+#.END
+
+#.TYPE_ATTR
+AuthorityInfoAccessSyntax TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0
+UserNotice TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
+#.END
+
diff --git a/asn1/tcap/tcap.asn b/asn1/tcap/tcap.asn
index 5546fc6b0a..3e1163cba3 100644
--- a/asn1/tcap/tcap.asn
+++ b/asn1/tcap/tcap.asn
@@ -39,17 +39,17 @@ UserInfoOID ::= OBJECT IDENTIFIER
Applicationcontext ::= OBJECT IDENTIFIER
AARQ-apdu ::= [APPLICATION 0] IMPLICIT SEQUENCE {
protocol-versionrq [0] IMPLICIT BIT STRING { version1 (0) }
- DEFAULT { version1 },
- application-context-name [1] Applicationcontext,
+ DEFAULT { version1 },
+ application-context-name [1] Applicationcontext,
user-information [30] IMPLICIT User-information
OPTIONAL }
AARE-apdu ::= [APPLICATION 1] IMPLICIT SEQUENCE {
protocol-versionre [0] IMPLICIT BIT STRING { version1 (0) }
DEFAULT { version1 },
- application-context-name [1] Applicationcontext,
- result [2] Associate-result,
- result-source-diagnostic [3] Associate-source-diagnostic,
+ application-context-name [1] Applicationcontext,
+ result [2] Associate-result,
+ result-source-diagnostic [3] Associate-source-diagnostic,
user-information [30] IMPLICIT User-information
OPTIONAL }
@@ -57,7 +57,7 @@ AARE-apdu ::= [APPLICATION 1] IMPLICIT SEQUENCE {
-- It is included for completeness only.
RLRQ-apdu ::= [APPLICATION 2] IMPLICIT SEQUENCE {
- reasonrq [0] IMPLICIT Release-request-reason OPTIONAL,
+ reasonrq [0] IMPLICIT Release-request-reason OPTIONAL,
user-information [30] IMPLICIT User-information
OPTIONAL }
@@ -65,7 +65,7 @@ RLRQ-apdu ::= [APPLICATION 2] IMPLICIT SEQUENCE {
-- It is included for completeness only
RLRE-apdu ::= [APPLICATION 3] IMPLICIT SEQUENCE {
- reasonre [0] IMPLICIT Release-response-reason OPTIONAL,
+ reasonre [0] IMPLICIT Release-response-reason OPTIONAL,
user-information [30] IMPLICIT User-information
OPTIONAL }
@@ -148,19 +148,19 @@ BEGIN
-- Transaction Portion fields
MessageType ::= CHOICE {
- unidirectional [APPLICATION 1] IMPLICIT Unidirectional,
- begin [APPLICATION 2] IMPLICIT Begin,
- end [APPLICATION 4] IMPLICIT End,
- continue [APPLICATION 5] IMPLICIT Continue,
- abort [APPLICATION 7] IMPLICIT Abort ,
+ unidirectional [APPLICATION 1] IMPLICIT Unidirectional,
+ begin [APPLICATION 2] IMPLICIT Begin,
+ end [APPLICATION 4] IMPLICIT End,
+ continue [APPLICATION 5] IMPLICIT Continue,
+ abort [APPLICATION 7] IMPLICIT Abort ,
-- and we now get clever making this ansi and itu!
- ansiunidirectional [ PRIVATE 1 ] IMPLICIT UniTransactionPDU ,
- ansiqueryWithPerm [ PRIVATE 2 ] IMPLICIT TransactionPDU ,
- ansiqueryWithoutPerm [ PRIVATE 3 ] IMPLICIT TransactionPDU ,
- ansiresponse [ PRIVATE 4 ] IMPLICIT TransactionPDU ,
- ansiconversationWithPerm [ PRIVATE 5 ] IMPLICIT TransactionPDU ,
+ ansiunidirectional [ PRIVATE 1 ] IMPLICIT UniTransactionPDU ,
+ ansiqueryWithPerm [ PRIVATE 2 ] IMPLICIT TransactionPDU ,
+ ansiqueryWithoutPerm [ PRIVATE 3 ] IMPLICIT TransactionPDU ,
+ ansiresponse [ PRIVATE 4 ] IMPLICIT TransactionPDU ,
+ ansiconversationWithPerm [ PRIVATE 5 ] IMPLICIT TransactionPDU ,
ansiconversationWithoutPerm [ PRIVATE 6 ] IMPLICIT TransactionPDU ,
- ansiabort [ PRIVATE 22 ] IMPLICIT AbortPDU
+ ansiabort [ PRIVATE 22 ] IMPLICIT AbortPDU
}
Unidirectional ::= SEQUENCE { dialoguePortion DialoguePortion OPTIONAL,
@@ -181,11 +181,11 @@ Continue ::= SEQUENCE { otid OrigTransactionID,
components ComponentPortion OPTIONAL }
Abort ::= SEQUENCE {
dtid DestTransactionID,
- reason Reason OPTIONAL
- }
+ reason Reason OPTIONAL
+ }
Reason ::= CHOICE
{ p-abortCause P-AbortCause,
- u-abortCause DialoguePortion }
+ u-abortCause DialoguePortion }
-- NOTE – When the Abort Message is generated by the Transaction sublayer, a p-Abort Cause must be
-- present.The u-abortCause may be generated by the component sublayer in which case it is an ABRT
-- APDU, or by the TC-User in which case it could be either an ABRT APDU or data in some user-defined
@@ -223,8 +223,8 @@ ComponentPortion ::= --[APPLICATION 12] IMPLICIT SEQUENCE SIZE (1..MAX) OF Compo
-- TCAP adds returnResultNotLast to allow for the segmentation of a result.
Component ::= CHOICE {
- invoke [1] IMPLICIT Invoke,
- returnResultLast [2] IMPLICIT ReturnResult,
+ invoke [1] IMPLICIT Invoke,
+ returnResultLast [2] IMPLICIT ReturnResult,
returnError [3] IMPLICIT ReturnError,
reject [4] IMPLICIT Reject,
returnResultNotLast [7] IMPLICIT ReturnResult }
@@ -387,10 +387,10 @@ TransactionID ::= [PRIVATE 7 ] IMPLICIT OCTET STRING
AbortPDU ::= SEQUENCE
{
- identifier TransactionID ,
- dialoguePortionansi DialoguePortionANSI OPTIONAL ,
+ identifier TransactionID ,
+ dialoguePortionansi DialoguePortionANSI OPTIONAL ,
causeInformation CHOICE {
- abortCause P-Abort-cause ,
+ abortCause P-Abort-cause ,
userInformation UserInformation -- UserAbortInformation
} OPTIONAL
}