From 1be381de08e681000fe5f503d5bcb90062b9e652 Mon Sep 17 00:00:00 2001 From: Denis Filatov Date: Mon, 15 Jun 2020 18:05:53 +0200 Subject: [PATCH 1/7] ETSI WI-00557 --- IEEE1609dot2.asn | 39 ++++++++++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/IEEE1609dot2.asn b/IEEE1609dot2.asn index f6763d6..d5bbc5c 100755 --- a/IEEE1609dot2.asn +++ b/IEEE1609dot2.asn @@ -1,8 +1,8 @@ IEEE1609dot2 {iso(1) identified-organization(3) ieee(111) standards-association-numbered-series-standards(2) wave-stds(1609) -dot2(2) base(1) schema(1) major-version-2(2) minor-version-2(2)} +dot2(2) base(1) schema(1) major-version-2(2) minor-version-3(3)} --- Minor version: 2 +-- Minor version: 3 --****************************************************************************** -- @@ -52,7 +52,10 @@ FROM IEEE1609dot2BaseTypes {iso(1) identified-organization(3) ieee(111) standards-association-numbered-series-standards(2) wave-stds(1609) dot2(2) base(1) base-types(2) major-version-2 (2)} -; +EtsiOriginatingHeaderInfoExtension +FROM EtsiTs103097ExtensionModule {itu-t(0) identified-organization(4) + etsi(0) itsDomain(5) wg5(5) secHeaders(103097) extension(2) + version1(1)} WITH SUCCESSORS; -- --********************************************************************* @@ -109,7 +112,9 @@ ToBeSignedData ::= SEQUENCE { HashedData::= CHOICE { sha256HashedData OCTET STRING (SIZE(32)), - ... + ..., + sha384HashedData OCTET STRING (SIZE(48)), + reserved OCTET STRING (SIZE(32)) } HeaderInfo ::= SEQUENCE { @@ -123,9 +128,33 @@ HeaderInfo ::= SEQUENCE { ..., inlineP2pcdRequest SequenceOfHashedId3 OPTIONAL, requestedCertificate Certificate OPTIONAL, - pduFunctionalType PduFunctionalType OPTIONAL + pduFunctionalType PduFunctionalType OPTIONAL, + contributedExtensions ContributedExtensionBlocks OPTIONAL +} + +ContributedExtensionBlocks ::= SEQUENCE (SIZE(1..MAX)) OF ContributedExtensionBlock + +ContributedExtensionBlock ::= SEQUENCE { + contributorId IEEE1609DOT2-HEADERINFO-CONTRIBUTED-EXTENSION. + &id({Ieee1609dot2HeaderInfoContributedExtensions}), + extns SEQUENCE (SIZE(1..MAX)) OF IEEE1609DOT2-HEADERINFO-CONTRIBUTED-EXTENSION. + &Extn({Ieee1609dot2HeaderInfoContributedExtensions}{@.contributorId}) } +IEEE1609DOT2-HEADERINFO-CONTRIBUTED-EXTENSION ::= CLASS { + &id HeaderInfoContributorId UNIQUE, + &Extn +} WITH SYNTAX {&Extn IDENTIFIED BY &id} + +Ieee1609dot2HeaderInfoContributedExtensions + IEEE1609DOT2-HEADERINFO-CONTRIBUTED-EXTENSION ::= { + {EtsiOriginatingHeaderInfoExtension IDENTIFIED BY etsiHeaderInfoContributorId}, + ... +} + +HeaderInfoContributorId ::= INTEGER (0..255) + etsiHeaderInfoContributorId HeaderInfoContributorId ::= 2 + MissingCrlIdentifier ::= SEQUENCE { cracaId HashedId3, crlSeries CrlSeries, -- GitLab From 26221f3cbb56332e910df771f0f22b89daf9eca2 Mon Sep 17 00:00:00 2001 From: Denis Filatov Date: Mon, 15 Jun 2020 18:27:54 +0200 Subject: [PATCH 2/7] add ETSI estension; temorary remove 'WITH SUCCESSOR' --- EtsiTs103097ExtensionModule.asn | 50 +++++++++++++++++++++++++++++++++ IEEE1609dot2.asn | 4 +-- 2 files changed, 52 insertions(+), 2 deletions(-) create mode 100755 EtsiTs103097ExtensionModule.asn diff --git a/EtsiTs103097ExtensionModule.asn b/EtsiTs103097ExtensionModule.asn new file mode 100755 index 0000000..bb2d67c --- /dev/null +++ b/EtsiTs103097ExtensionModule.asn @@ -0,0 +1,50 @@ +EtsiTs103097ExtensionModule +{itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) secHeaders(103097) extension(2) version1(1)} +DEFINITIONS AUTOMATIC TAGS ::= BEGIN + +IMPORTS + HashedId8, + Time32 +FROM IEEE1609dot2BaseTypes {iso(1) identified-organization(3) ieee(111) + standards-association-numbered-series-standards(2) wave-stds(1609) + dot2(2) base(1) base-types(2) major-version-2 (2)}; + +Version::= INTEGER(1) + +Extension {EXT-TYPE : ExtensionTypes} ::= SEQUENCE { + id EXT-TYPE.&extId({ExtensionTypes}), + content EXT-TYPE.&ExtContent({ExtensionTypes}{@.id}) +} + +EXT-TYPE ::= CLASS { + &extId ExtId, + &ExtContent +} WITH SYNTAX {&ExtContent IDENTIFIED BY &extId} + +ExtId ::= INTEGER(0..255) + +EtsiOriginatingHeaderInfoExtension ::= Extension{{EtsiTs103097HeaderInfoExtensions}} + +EtsiTs103097HeaderInfoExtensionId ::= ExtId + etsiTs102941CrlRequestId EtsiTs103097HeaderInfoExtensionId ::= 1 --'01'H + etsiTs102941DeltaCtlRequestId EtsiTs103097HeaderInfoExtensionId ::= 2 --'02'H + +EtsiTs103097HeaderInfoExtensions EXT-TYPE ::= { + { EtsiTs102941CrlRequest IDENTIFIED BY etsiTs102941CrlRequestId } | + { EtsiTs102941DeltaCtlRequest IDENTIFIED BY etsiTs102941DeltaCtlRequestId }, + ... +} + +EtsiTs102941CrlRequest::= SEQUENCE { + issuerId HashedId8, + lastKnownUpdate Time32 OPTIONAL + } + +EtsiTs102941CtlRequest::= SEQUENCE { + issuerId HashedId8, + lastKnownCtlSequence INTEGER (0..255) OPTIONAL + } + +EtsiTs102941DeltaCtlRequest::= EtsiTs102941CtlRequest + +END diff --git a/IEEE1609dot2.asn b/IEEE1609dot2.asn index d5bbc5c..7e5a84c 100755 --- a/IEEE1609dot2.asn +++ b/IEEE1609dot2.asn @@ -55,8 +55,8 @@ FROM IEEE1609dot2BaseTypes {iso(1) identified-organization(3) ieee(111) EtsiOriginatingHeaderInfoExtension FROM EtsiTs103097ExtensionModule {itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) secHeaders(103097) extension(2) - version1(1)} WITH SUCCESSORS; - + version1(1)} -- WITH SUCCESSORS +; -- --********************************************************************* -- -- GitLab From 7a322501a360cf19a3ec3e42e443ce7fa7cea672 Mon Sep 17 00:00:00 2001 From: Denis Filatov Date: Mon, 15 Jun 2020 18:34:54 +0200 Subject: [PATCH 3/7] Update for new version --- README.md | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 656b9cf..189831e 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,17 @@ -# The IEEE 1609.2 ASN.1 module +# ASN.1 module for ETSI TS 103 097 v1.4.1 -The ASN.1 module contained in the **IEEE Std 1609.2b™-2019**: "IEEE Standard for Wireless Access in Vehicular Environments -- Security Services for Applications and Management Messages", - as amended by IEEE Std 1609.2a™-2017: "Standard for Wireless Access In Vehicular Environments -- Security Services for Applications and Management Messages Amendment 1 and 2". +The module was published as a part of delivery **[ETSI TS 103 097 v1.4.1](http://www.etsi.org/deliver/etsi_ts/103000_103099/103097/01.04.01_60/ts_103097v010401p.pdf)** -This repository provides a copy of the ASN.1 modules from IEEE Std 1609.2 and its amendments (a)-2016 and (b)-2019, reprinted with permission from IEEE, Copyright © 2016. +## License -This module was published as a part of **[ETSI TS 103 097 v1.4.1](http://www.etsi.org/deliver/etsi_ts/103000_103099/103097/01.04.01_60/ts_103097v010401p.pdf)**. +The content of this repository and the files contained are released under the BSD-3-Clause license. + +See the attached LICENSE file or visit https://forge.etsi.org/legal-matters. + +## Dependencies + +The module dependens of the following external modules and repositories: + +* The **[IEEE1609dot2](https://forge.etsi.org/rep/ITS/asn1/ieee1609.2/tree/WI-00557)** module from the **IEEE Std 1609.2** - WAVE - Security Services for Applications and Management Messages + +*NOTE: Please use `--recurse-submodules` option in order to clone the module with all necessary dependencies.* -- GitLab From a770be3276029ea4fb6a116ecb46c3ac0851b61b Mon Sep 17 00:00:00 2001 From: Denis Filatov Date: Tue, 16 Jun 2020 10:21:40 +0200 Subject: [PATCH 4/7] move ETSI extension to TS103097 repo; put back WITH SUCCESSOR --- EtsiTs103097ExtensionModule.asn | 50 --------------------------------- IEEE1609dot2.asn | 2 +- 2 files changed, 1 insertion(+), 51 deletions(-) delete mode 100755 EtsiTs103097ExtensionModule.asn diff --git a/EtsiTs103097ExtensionModule.asn b/EtsiTs103097ExtensionModule.asn deleted file mode 100755 index bb2d67c..0000000 --- a/EtsiTs103097ExtensionModule.asn +++ /dev/null @@ -1,50 +0,0 @@ -EtsiTs103097ExtensionModule -{itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) secHeaders(103097) extension(2) version1(1)} -DEFINITIONS AUTOMATIC TAGS ::= BEGIN - -IMPORTS - HashedId8, - Time32 -FROM IEEE1609dot2BaseTypes {iso(1) identified-organization(3) ieee(111) - standards-association-numbered-series-standards(2) wave-stds(1609) - dot2(2) base(1) base-types(2) major-version-2 (2)}; - -Version::= INTEGER(1) - -Extension {EXT-TYPE : ExtensionTypes} ::= SEQUENCE { - id EXT-TYPE.&extId({ExtensionTypes}), - content EXT-TYPE.&ExtContent({ExtensionTypes}{@.id}) -} - -EXT-TYPE ::= CLASS { - &extId ExtId, - &ExtContent -} WITH SYNTAX {&ExtContent IDENTIFIED BY &extId} - -ExtId ::= INTEGER(0..255) - -EtsiOriginatingHeaderInfoExtension ::= Extension{{EtsiTs103097HeaderInfoExtensions}} - -EtsiTs103097HeaderInfoExtensionId ::= ExtId - etsiTs102941CrlRequestId EtsiTs103097HeaderInfoExtensionId ::= 1 --'01'H - etsiTs102941DeltaCtlRequestId EtsiTs103097HeaderInfoExtensionId ::= 2 --'02'H - -EtsiTs103097HeaderInfoExtensions EXT-TYPE ::= { - { EtsiTs102941CrlRequest IDENTIFIED BY etsiTs102941CrlRequestId } | - { EtsiTs102941DeltaCtlRequest IDENTIFIED BY etsiTs102941DeltaCtlRequestId }, - ... -} - -EtsiTs102941CrlRequest::= SEQUENCE { - issuerId HashedId8, - lastKnownUpdate Time32 OPTIONAL - } - -EtsiTs102941CtlRequest::= SEQUENCE { - issuerId HashedId8, - lastKnownCtlSequence INTEGER (0..255) OPTIONAL - } - -EtsiTs102941DeltaCtlRequest::= EtsiTs102941CtlRequest - -END diff --git a/IEEE1609dot2.asn b/IEEE1609dot2.asn index 7e5a84c..bfc9b2e 100755 --- a/IEEE1609dot2.asn +++ b/IEEE1609dot2.asn @@ -55,7 +55,7 @@ FROM IEEE1609dot2BaseTypes {iso(1) identified-organization(3) ieee(111) EtsiOriginatingHeaderInfoExtension FROM EtsiTs103097ExtensionModule {itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) secHeaders(103097) extension(2) - version1(1)} -- WITH SUCCESSORS + version1(1)} WITH SUCCESSORS ; -- --********************************************************************* -- GitLab From 25f0abf4b1c0da3140b832891a1e15dd60c5ef95 Mon Sep 17 00:00:00 2001 From: Denis Filatov Date: Tue, 16 Jun 2020 12:56:45 +0200 Subject: [PATCH 5/7] fix EciesP256EncryptedKey and EncryptedDataEncryptionKey --- IEEE1609dot2.asn | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/IEEE1609dot2.asn b/IEEE1609dot2.asn index bfc9b2e..a5f760a 100755 --- a/IEEE1609dot2.asn +++ b/IEEE1609dot2.asn @@ -2,8 +2,6 @@ IEEE1609dot2 {iso(1) identified-organization(3) ieee(111) standards-association-numbered-series-standards(2) wave-stds(1609) dot2(2) base(1) schema(1) major-version-2(2) minor-version-3(3)} --- Minor version: 3 - --****************************************************************************** -- -- IEEE P1609.2 Data Types @@ -17,7 +15,7 @@ EXPORTS ALL; IMPORTS CrlSeries, EccP256CurvePoint, - EncryptedDataEncryptionKey, + EciesP256EncryptedKey, EncryptionKey, GeographicRegion, GroupLinkageValue, -- GitLab From c81c593dfa80c82f6880ef031dd80606b9d1e052 Mon Sep 17 00:00:00 2001 From: Denis Filatov Date: Wed, 22 Jul 2020 21:49:14 +0200 Subject: [PATCH 6/7] fix file attributes --- IEEE1609dot2.asn | 2 +- IEEE1609dot2BaseTypes.asn | 0 2 files changed, 1 insertion(+), 1 deletion(-) mode change 100755 => 100644 IEEE1609dot2.asn mode change 100755 => 100644 IEEE1609dot2BaseTypes.asn diff --git a/IEEE1609dot2.asn b/IEEE1609dot2.asn old mode 100755 new mode 100644 index a5f760a..d6b3264 --- a/IEEE1609dot2.asn +++ b/IEEE1609dot2.asn @@ -53,7 +53,7 @@ FROM IEEE1609dot2BaseTypes {iso(1) identified-organization(3) ieee(111) EtsiOriginatingHeaderInfoExtension FROM EtsiTs103097ExtensionModule {itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) secHeaders(103097) extension(2) - version1(1)} WITH SUCCESSORS + version1(1)} --WITH SUCCESSORS ; -- --********************************************************************* diff --git a/IEEE1609dot2BaseTypes.asn b/IEEE1609dot2BaseTypes.asn old mode 100755 new mode 100644 -- GitLab From a8248f464d4c2062d1c1271dca8fd6366c6baa43 Mon Sep 17 00:00:00 2001 From: Denis Filatov Date: Thu, 13 Aug 2020 12:22:50 +0200 Subject: [PATCH 7/7] keep back WITH SUCCESSORS --- IEEE1609dot2.asn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IEEE1609dot2.asn b/IEEE1609dot2.asn index d6b3264..a5f760a 100644 --- a/IEEE1609dot2.asn +++ b/IEEE1609dot2.asn @@ -53,7 +53,7 @@ FROM IEEE1609dot2BaseTypes {iso(1) identified-organization(3) ieee(111) EtsiOriginatingHeaderInfoExtension FROM EtsiTs103097ExtensionModule {itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) secHeaders(103097) extension(2) - version1(1)} --WITH SUCCESSORS + version1(1)} WITH SUCCESSORS ; -- --********************************************************************* -- GitLab