From 56bc162cb0c4ea7245d3e366f6a9bd760357543e Mon Sep 17 00:00:00 2001 From: Denis Filatov Date: Mon, 15 Jun 2020 18:29:42 +0200 Subject: [PATCH 1/8] ETSI WI-00557 --- EtsiTs103097Module.asn | 45 +++++++++++++++++++++++++++++++----------- ieee1609dot2 | 2 +- 2 files changed, 35 insertions(+), 12 deletions(-) diff --git a/EtsiTs103097Module.asn b/EtsiTs103097Module.asn index 164d085..e1740f4 100755 --- a/EtsiTs103097Module.asn +++ b/EtsiTs103097Module.asn @@ -1,5 +1,5 @@ EtsiTs103097Module -{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(103097) v1(0) } +{itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) secHeaders(103097) core(1) version2(2)} DEFINITIONS AUTOMATIC TAGS ::= BEGIN @@ -7,11 +7,16 @@ IMPORTS Ieee1609Dot2Data, ExplicitCertificate -FROM - -IEEE1609dot2 {iso(1) identified-organization(3) ieee(111) +FROM 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)}; +dot2(2) base(1) schema(1) major-version-2(2) minor-version-3(3)} + +Version + +FROM EtsiTs103097ExtensionModule {itu-t(0) identified-organization(4) +etsi(0) itsDomain(5) wg5(5) secHeaders(103097) extension(2) version1(1)}; + +ExtensionModuleVersion::= Version EtsiTs103097Certificate::= ExplicitCertificate (WITH COMPONENTS{..., toBeSigned (WITH COMPONENTS{..., @@ -24,11 +29,6 @@ EtsiTs103097Certificate::= ExplicitCertificate (WITH COMPONENTS{..., }) }) -SingleEtsiTs103097Certificate ::= SEQUENCE { - only EtsiTs103097Certificate -} - - EtsiTs103097Data::=Ieee1609Dot2Data (WITH COMPONENTS {..., content (WITH COMPONENTS {..., signedData (WITH COMPONENTS {..., -- constraints on signed data headers @@ -40,12 +40,13 @@ EtsiTs103097Data::=Ieee1609Dot2Data (WITH COMPONENTS {..., }) }), signer (WITH COMPONENTS {..., --constraints on the certificate - certificate (WITH COMPONENT (SingleEtsiTs103097Certificate)) + certificate ((WITH COMPONENT (EtsiTs103097Certificate))^(SIZE(1))) }) }), encryptedData (WITH COMPONENTS {..., -- constraints on encrypted data headers recipients (WITH COMPONENT ( (WITH COMPONENTS {..., + pskRecipInfo ABSENT, symmRecipInfo ABSENT, rekRecipInfo ABSENT }) @@ -55,6 +56,12 @@ EtsiTs103097Data::=Ieee1609Dot2Data (WITH COMPONENTS {..., }) }) +EtsiTs103097Data-Unsecured {ToBeSentDataContent} ::= EtsiTs103097Data (WITH COMPONENTS {..., + content (WITH COMPONENTS { + unsecuredData (CONTAINING ToBeSentDataContent) + }) +}) + EtsiTs103097Data-Signed {ToBeSignedDataContent} ::= EtsiTs103097Data (WITH COMPONENTS {..., content (WITH COMPONENTS { signedData (WITH COMPONENTS {..., @@ -99,4 +106,20 @@ EtsiTs103097Data-Encrypted {ToBeEncryptedDataContent} ::= EtsiTs103097Data (WITH EtsiTs103097Data-SignedAndEncrypted {ToBesignedAndEncryptedDataContent} ::= EtsiTs103097Data-Encrypted {EtsiTs103097Data-Signed {ToBesignedAndEncryptedDataContent}} +EtsiTs103097Data-Encrypted-Unicast {ToBeEncryptedDataContent} ::= EtsiTs103097Data-Encrypted { EtsiTs103097Data-Unsecured{ToBeEncryptedDataContent}} (WITH COMPONENTS {..., + content (WITH COMPONENTS { + encryptedData (WITH COMPONENTS {..., + recipients (SIZE(1)) + }) + }) +}) + +EtsiTs103097Data-SignedAndEncrypted-Unicast {ToBesignedAndEncryptedDataContent} ::= EtsiTs103097Data-Encrypted {EtsiTs103097Data-Signed {ToBesignedAndEncryptedDataContent}} (WITH COMPONENTS {..., + content (WITH COMPONENTS { + encryptedData (WITH COMPONENTS {..., + recipients (SIZE(1)) + }) + }) +}) + END diff --git a/ieee1609dot2 b/ieee1609dot2 index 70c10e7..26221f3 160000 --- a/ieee1609dot2 +++ b/ieee1609dot2 @@ -1 +1 @@ -Subproject commit 70c10e7bb032794fa5168c009be8b865179fc883 +Subproject commit 26221f3cbb56332e910df771f0f22b89daf9eca2 -- GitLab From a4166ac0a9e03677802dc611440db771d0952630 Mon Sep 17 00:00:00 2001 From: Denis Filatov Date: Tue, 16 Jun 2020 10:23:20 +0200 Subject: [PATCH 2/8] move ETSI extension to TS103097 repo; put back WITH SUCCESSOR --- EtsiTs103097ExtensionModule.asn | 50 +++++++++++++++++++++++++++++++++ README.md | 6 ++-- ieee1609dot2 | 2 +- 3 files changed, 54 insertions(+), 4 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/README.md b/README.md index 4eb4fda..189831e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# ASN.1 module for ETSI TS 103 097 v1.3.1 +# ASN.1 module for ETSI TS 103 097 v1.4.1 -The module was published as a part of delivery **[ETSI TS 103 097 v1.3.1](http://www.etsi.org/deliver/etsi_ts/103000_103099/103097/01.03.01_60/ts_103097v010301p.pdf)** (2017-10) +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)** ## License @@ -12,6 +12,6 @@ See the attached LICENSE file or visit https://forge.etsi.org/legal-matters. The module dependens of the following external modules and repositories: -* The **[IEEE1609dot2](https://forge.etsi.org/rep/ITS/asn1/ieee1609.2)** module from the **IEEE Std 1609.2 2016a** - WAVE - Security Services for Applications and Management Messages +* 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.* diff --git a/ieee1609dot2 b/ieee1609dot2 index 26221f3..a770be3 160000 --- a/ieee1609dot2 +++ b/ieee1609dot2 @@ -1 +1 @@ -Subproject commit 26221f3cbb56332e910df771f0f22b89daf9eca2 +Subproject commit a770be3276029ea4fb6a116ecb46c3ac0851b61b -- GitLab From 96439be8afef2817b524adbf22d9448e62d59d17 Mon Sep 17 00:00:00 2001 From: Denis Filatov Date: Tue, 16 Jun 2020 12:57:19 +0200 Subject: [PATCH 3/8] fix EciesP256EncryptedKey and EncryptedDataEncryptionKey --- ieee1609dot2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ieee1609dot2 b/ieee1609dot2 index a770be3..25f0abf 160000 --- a/ieee1609dot2 +++ b/ieee1609dot2 @@ -1 +1 @@ -Subproject commit a770be3276029ea4fb6a116ecb46c3ac0851b61b +Subproject commit 25f0abf4b1c0da3140b832891a1e15dd60c5ef95 -- GitLab From 76c050d2f0ccf4aa968964b449e89ff106a334c8 Mon Sep 17 00:00:00 2001 From: Denis Filatov Date: Mon, 13 Jul 2020 12:34:55 +0200 Subject: [PATCH 4/8] Rename Version type to ExtensionModuleVersion --- EtsiTs103097ExtensionModule.asn | 2 +- EtsiTs103097Module.asn | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/EtsiTs103097ExtensionModule.asn b/EtsiTs103097ExtensionModule.asn index bb2d67c..d5d6b8b 100755 --- a/EtsiTs103097ExtensionModule.asn +++ b/EtsiTs103097ExtensionModule.asn @@ -9,7 +9,7 @@ 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) +ExtensionModuleVersion::= INTEGER(1) Extension {EXT-TYPE : ExtensionTypes} ::= SEQUENCE { id EXT-TYPE.&extId({ExtensionTypes}), diff --git a/EtsiTs103097Module.asn b/EtsiTs103097Module.asn index e1740f4..a7e5a7c 100755 --- a/EtsiTs103097Module.asn +++ b/EtsiTs103097Module.asn @@ -6,18 +6,14 @@ DEFINITIONS AUTOMATIC TAGS ::= BEGIN IMPORTS Ieee1609Dot2Data, ExplicitCertificate - FROM 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)} -Version - +ExtensionModuleVersion FROM EtsiTs103097ExtensionModule {itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) secHeaders(103097) extension(2) version1(1)}; -ExtensionModuleVersion::= Version - EtsiTs103097Certificate::= ExplicitCertificate (WITH COMPONENTS{..., toBeSigned (WITH COMPONENTS{..., id (WITH COMPONENTS{..., -- GitLab From bbb0e18b009e543f35415b8fd9beb057f989c363 Mon Sep 17 00:00:00 2001 From: Denis Filatov Date: Wed, 22 Jul 2020 21:49:04 +0200 Subject: [PATCH 5/8] fix file attributes --- EtsiTs103097ExtensionModule.asn | 0 EtsiTs103097Module.asn | 0 LICENSE | 0 3 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 EtsiTs103097ExtensionModule.asn mode change 100755 => 100644 EtsiTs103097Module.asn mode change 100755 => 100644 LICENSE diff --git a/EtsiTs103097ExtensionModule.asn b/EtsiTs103097ExtensionModule.asn old mode 100755 new mode 100644 diff --git a/EtsiTs103097Module.asn b/EtsiTs103097Module.asn old mode 100755 new mode 100644 diff --git a/LICENSE b/LICENSE old mode 100755 new mode 100644 -- GitLab From a8a1f7ceec3121c47b3dec3e415ae030e08578af Mon Sep 17 00:00:00 2001 From: Denis Filatov Date: Wed, 22 Jul 2020 21:50:43 +0200 Subject: [PATCH 6/8] fix file attributes --- ieee1609dot2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ieee1609dot2 b/ieee1609dot2 index 25f0abf..c81c593 160000 --- a/ieee1609dot2 +++ b/ieee1609dot2 @@ -1 +1 @@ -Subproject commit 25f0abf4b1c0da3140b832891a1e15dd60c5ef95 +Subproject commit c81c593dfa80c82f6880ef031dd80606b9d1e052 -- GitLab From dc94112a538e8a90b6ac4e6e1ef728b127984834 Mon Sep 17 00:00:00 2001 From: Denis Filatov Date: Wed, 23 Sep 2020 15:19:31 +0200 Subject: [PATCH 7/8] add WITH SUCCESSORS in 1609.2 import --- EtsiTs103097Module.asn | 1 + LICENSE | 2 +- ieee1609dot2 | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/EtsiTs103097Module.asn b/EtsiTs103097Module.asn index a7e5a7c..36ead12 100644 --- a/EtsiTs103097Module.asn +++ b/EtsiTs103097Module.asn @@ -9,6 +9,7 @@ Ieee1609Dot2Data, ExplicitCertificate FROM 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)} +WITH SUCCESSORS ExtensionModuleVersion FROM EtsiTs103097ExtensionModule {itu-t(0) identified-organization(4) diff --git a/LICENSE b/LICENSE index 4436d6d..28bd922 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright 2019 ETSI +Copyright 2020 ETSI Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/ieee1609dot2 b/ieee1609dot2 index c81c593..a8248f4 160000 --- a/ieee1609dot2 +++ b/ieee1609dot2 @@ -1 +1 @@ -Subproject commit c81c593dfa80c82f6880ef031dd80606b9d1e052 +Subproject commit a8248f464d4c2062d1c1271dca8fd6366c6baa43 -- GitLab From 9b1bbd3307ca26f1ffde9a23c8132c47bad7fb4e Mon Sep 17 00:00:00 2001 From: Denis Filatov Date: Wed, 23 Sep 2020 15:37:59 +0200 Subject: [PATCH 8/8] reference master of ieee1609.2 --- ieee1609dot2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ieee1609dot2 b/ieee1609dot2 index a8248f4..54eba2d 160000 --- a/ieee1609dot2 +++ b/ieee1609dot2 @@ -1 +1 @@ -Subproject commit a8248f464d4c2062d1c1271dca8fd6366c6baa43 +Subproject commit 54eba2d4c2d2bac07e8e5f3376e5f1ac558ca3f1 -- GitLab