summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCGantert345 <57003061+CGantert345@users.noreply.github.com>2022-03-16 12:08:09 +0100
committerGitHub <noreply@github.com>2022-03-16 12:08:09 +0100
commit20a55e55316cf5e9e73fa508bef9a7bc568ee968 (patch)
tree4fa242b4503553f082c8505521157971a6838bcf
parentMerge pull request #42 from UnionInternationalCheminsdeFer/1.2.14 (diff)
parent- documentation on extensionData enhanced (diff)
downloadUIC-barcode-20a55e55316cf5e9e73fa508bef9a7bc568ee968.tar
UIC-barcode-20a55e55316cf5e9e73fa508bef9a7bc568ee968.tar.gz
UIC-barcode-20a55e55316cf5e9e73fa508bef9a7bc568ee968.tar.bz2
UIC-barcode-20a55e55316cf5e9e73fa508bef9a7bc568ee968.tar.lz
UIC-barcode-20a55e55316cf5e9e73fa508bef9a7bc568ee968.tar.xz
UIC-barcode-20a55e55316cf5e9e73fa508bef9a7bc568ee968.tar.zst
UIC-barcode-20a55e55316cf5e9e73fa508bef9a7bc568ee968.zip
Diffstat (limited to '')
-rw-r--r--misc/uicBarcodeHeader_v2.0.0.asn20
-rw-r--r--misc/uicDynamicContentData_v1.0.1.asn61
-rw-r--r--misc/uicRailTicketData_v3.0.0.asn25
3 files changed, 62 insertions, 44 deletions
diff --git a/misc/uicBarcodeHeader_v2.0.0.asn b/misc/uicBarcodeHeader_v2.0.0.asn
index e7363b0..55915d0 100644
--- a/misc/uicBarcodeHeader_v2.0.0.asn
+++ b/misc/uicBarcodeHeader_v2.0.0.asn
@@ -112,11 +112,21 @@ ASN-Module DEFINITIONS AUTOMATIC TAGS ::= BEGIN
}
DataType ::= SEQUENCE {
- -- Content of data format:
- -- FCBn (FCB1 = FCB version 1, FCB2 = FCB version 2)
- -- FDCn dynamic content
- -- or proprietary:
- -- _RICS company code + addon
+
+ -- The value of 'dataFormat' describes how 'data' is encoded:
+ -- "FCBn" means that 'data' is the Canonical Unaligned PER encoding
+ -- of an ASN.1 element of type UicRailTicketData in major version n.
+ -- "FDCn" means that 'data' is the Canonical Unaligned PER encoding
+ -- of an ASN.1 element of type UicDynamicContentData in major version n.
+ -- "+" + [2-letters ISO 3166 country code] + [addon, chosen by the standardization body of that country]
+ -- means that 'data' is a content defined by the national standardization body,
+ -- identified as 'addon' by this body.
+ -- "_" + [4-digit RICS] + [addon, chosen by this company] means that 'data' is a proprietary
+ -- content of the company identified by the RICS code, identified as 'addon' by this company.
+ -- "*" + [addon] means that 'data' is a content specific to this barcode,
+ -- with no further information on who defined it, identified as 'addon' by its issuer.
+ -- Others values are reserved for future UIC use and shall not be used.
+
dataFormat IA5String,
data OCTET STRING
}
diff --git a/misc/uicDynamicContentData_v1.0.1.asn b/misc/uicDynamicContentData_v1.0.1.asn
index 1515700..9814d0c 100644
--- a/misc/uicDynamicContentData_v1.0.1.asn
+++ b/misc/uicDynamicContentData_v1.0.1.asn
@@ -43,33 +43,31 @@ ASN-Module DEFINITIONS AUTOMATIC TAGS ::= BEGIN
-- # UicDynamicContentData.dynamicContentResponseToChallenge.
-- #
-- ##########################################################################################
- -- ..................+.......................................................................
- -- extensionId value | extensionData content
- -- ..................+.......................................................................
- -- ..................+.......................................................................
- -- "=" | Exactly the data received from the control device
- -- ..................+.......................................................................
- -- "UTF" | UTF-8 encoded text provided by the train staff to the traveler
- -- ..................+.......................................................................
- -- "PHC" | Hash value of a phone identifier that is available in the ticket
- -- | control data provided in an annotation according to UIC IRS 90918-4
- -- | (e.g. via ETCD).
- -- ..................+.......................................................................
- -- "EPC" | Hash value of an electronic passport that is available in the ticket
- -- | control data provided in an annotation according to UIC IRS 90918-4
- -- | (e.g. via ETCD).
- -- | The control app can read the passport at the time of control.
- -- ..................+.......................................................................
- -- "_" + RICS + addon| Proprietary data, defined by the issuer identified by its RICS code.
- -- | (addon being defined by this issuer)
- -- ..................+.......................................................................
+ -- ..........................................................................................
+ -- extensionId value | extensionData content
+ -- .....................+....................................................................
+ -- "=" | Exactly the data received from the control device
+ -- .....................+....................................................................
+ -- "UTF" | UTF-8 encoded text provided by the train staff to the traveler
+ -- .....................+....................................................................
+ -- "PHC" | Hash value of a phone identifier that is available in the ticket
+ -- | control data provided in an annotation according to UIC IRS 90918-4
+ -- | (e.g. via ETCD).
+ -- .....................+....................................................................
+ -- "EPC" | Hash value of an electronic passport that is available in the
+ -- | ticketcontrol data provided in an annotation according to
+ -- | UIC IRS 90918-4 (e.g. via ETCD).
+ -- | The control app can read the passport at the time of control.
+ -- .....................+....................................................................
+ -- "+" + country + addon| Specific data. See the possible values for extensionId and the
+ -- "_" + RICS + addon | corresponding extensionData content in the comments above the
+ -- "*" + addon | definition of ExtensionData (below).
+ -- ..........................................................................................
+
dynamicContentResponseToChallenge SEQUENCE OF ExtensionData OPTIONAL,
- -- Proprietary data defined bilaterally
- -- (same ExtensionData type as in UicRailTicketData).
- -- extensionId identifies the content of extensionData,
- -- it shall be set to "_" + RICS + addon chosen by the issuer identified by its RICS code
+ -- Proprietary data defined bilaterally (same ExtensionData type as in UicRailTicketData).
dynamicContentExtension ExtensionData OPTIONAL,
...
@@ -123,11 +121,20 @@ ASN-Module DEFINITIONS AUTOMATIC TAGS ::= BEGIN
west (1)
}
+
-- ###########################################################################################
- -- # Generic extension element.
+ -- # Generic extension element (same definition as in UicRailTicketData).
-- #
- -- # extensionId identifies the content of extensionData.
- -- ###########################################################################################
+ -- # The value of 'extensionId' describes how 'extensionData' is encoded:
+ -- # "+" + [2-letters ISO 3166 country code] + [addon, chosen by the standardization body of that country]
+ -- # means that 'extensionData' is a content defined by this national standardization body,
+ -- # identified as 'addon' by this body.
+ -- # "_" + [4-digit RICS] + [addon, chosen by this company] means that 'extensionData' is a proprietary
+ -- # content of the company identified by the RICS code, identified as 'addon' by this company.
+ -- # "*" + [addon] means that 'extensionData' is a content specific to this barcode,
+ -- # identified as 'addon', with no further information on who defined it.
+ -- # Others values are reserved for future UIC use and shall not be used.
+ -- ###########################################################################################
ExtensionData ::= SEQUENCE {
extensionId IA5String,
extensionData OCTET STRING
diff --git a/misc/uicRailTicketData_v3.0.0.asn b/misc/uicRailTicketData_v3.0.0.asn
index 0e6c2a5..fdbc1cd 100644
--- a/misc/uicRailTicketData_v3.0.0.asn
+++ b/misc/uicRailTicketData_v3.0.0.asn
@@ -1384,18 +1384,19 @@ ASN-Module DEFINITIONS AUTOMATIC TAGS ::= BEGIN
}
- -- ###########################################################################################
- -- generic non standard extension element
- -- the generic non - standard element contains:
- -- - an extension id to distinguish different extensions
- -- - the extension data as binary data
- -- proprietary extensions are by definition proprietary. This standard provides
- -- the means to identify these extensions
- -- within the data and to skip these data.
- -- the evaluation of these data and the unique identification of the extensions
- -- via the extension id is in the
- -- responsibility of the railways which use these extensions.
- -- ###########################################################################################
+ -- ###########################################################################################
+ -- # Generic extension element.
+ -- #
+ -- # The value of 'extensionId' describes how 'extensionData' is encoded:
+ -- # "+" + [2-letters ISO 3166 country code] + [addon, chosen by the standardization body of that country]
+ -- # means that 'extensionData' is a content defined by this national standardization body,
+ -- # identified as 'addon' by this body.
+ -- # "_" + [4-digit RICS] + [addon, chosen by this company] means that 'extensionData' is a proprietary
+ -- # content of the company identified by the RICS code, identified as 'addon' by this company.
+ -- # "*" + [addon] means that 'extensionData' is a content specific to this barcode,
+ -- # identified as 'addon', with no further information on who defined it.
+ -- # Others values are reserved for future UIC use and shall not be used.
+ -- ###########################################################################################
ExtensionData ::= SEQUENCE {
extensionId IA5String,
extensionData OCTET STRING