From d969b705c0b124602867a39a3b48cdf24dfab426 Mon Sep 17 00:00:00 2001 From: Denis Filatov Date: Wed, 14 Jul 2021 12:38:54 +0200 Subject: [PATCH 1/4] titanization --- .gitmodules | 1 + EtsiTs103097ExtensionModule.asn | 2 +- EtsiTs103097Module.asn | 2 +- ieee1609dot2 | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index d04d319..748621c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,4 @@ [submodule "ieee1609dot2"] path = ieee1609dot2 url = https://forge.etsi.org/rep/ITS/asn1/ieee1609.2.git + branch = testing diff --git a/EtsiTs103097ExtensionModule.asn b/EtsiTs103097ExtensionModule.asn index eed75d4..b2c6c2e 100644 --- a/EtsiTs103097ExtensionModule.asn +++ b/EtsiTs103097ExtensionModule.asn @@ -8,7 +8,7 @@ IMPORTS 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) minor-version-2 (2)} -WITH SUCCESSORS +--WITH SUCCESSORS ; ExtensionModuleVersion::= INTEGER(1) diff --git a/EtsiTs103097Module.asn b/EtsiTs103097Module.asn index 67cd4c6..440a857 100644 --- a/EtsiTs103097Module.asn +++ b/EtsiTs103097Module.asn @@ -9,7 +9,7 @@ Ieee1609Dot2Data, Certificate 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 +--WITH SUCCESSORS ExtensionModuleVersion FROM EtsiTs103097ExtensionModule {itu-t(0) identified-organization(4) diff --git a/ieee1609dot2 b/ieee1609dot2 index 0190d9f..46ebf41 160000 --- a/ieee1609dot2 +++ b/ieee1609dot2 @@ -1 +1 @@ -Subproject commit 0190d9fdb903da0a6cd1e3d529a35c827152a93a +Subproject commit 46ebf41a6fcdd6719f86c9c3e1ab694d942979e9 -- GitLab From 2962a5ba571966771fbfd79a3ae0509487b366f0 Mon Sep 17 00:00:00 2001 From: Denis Filatov Date: Fri, 23 Jul 2021 12:31:16 +0200 Subject: [PATCH 2/4] titanization --- README.md | 2 +- ieee1609dot2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 13edddb..435e840 100644 --- a/README.md +++ b/README.md @@ -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** - WAVE - Security Services for Applications and Management Messages +* The **[Ieee1609Dot2](https://forge.etsi.org/rep/ITS/asn1/ieee1609.2/)** 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 46ebf41..085c995 160000 --- a/ieee1609dot2 +++ b/ieee1609dot2 @@ -1 +1 @@ -Subproject commit 46ebf41a6fcdd6719f86c9c3e1ab694d942979e9 +Subproject commit 085c995c223c8cf15c6cf252ad1ee05771556e70 -- GitLab From abc08575e888a927dbd9fbcd02a3222ffb8714e2 Mon Sep 17 00:00:00 2001 From: Denis Filatov Date: Wed, 29 Sep 2021 13:08:09 +0200 Subject: [PATCH 3/4] merge v1.4.1 --- ieee1609dot2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ieee1609dot2 b/ieee1609dot2 index 085c995..d2c15f6 160000 --- a/ieee1609dot2 +++ b/ieee1609dot2 @@ -1 +1 @@ -Subproject commit 085c995c223c8cf15c6cf252ad1ee05771556e70 +Subproject commit d2c15f6a6c9aa0f9c032d800997d1c0f424a9653 -- GitLab From c4d138571dcbca3e83970256b4780b566fcb4580 Mon Sep 17 00:00:00 2001 From: Denis Filatov Date: Wed, 29 Sep 2021 13:18:58 +0200 Subject: [PATCH 4/4] use new 1609.2 version --- EtsiTs103097ExtensionModule.asn | 4 ++-- EtsiTs103097Module.asn | 6 +++--- ieee1609dot2 | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/EtsiTs103097ExtensionModule.asn b/EtsiTs103097ExtensionModule.asn index b2c6c2e..63198a1 100644 --- a/EtsiTs103097ExtensionModule.asn +++ b/EtsiTs103097ExtensionModule.asn @@ -1,5 +1,5 @@ EtsiTs103097ExtensionModule -{itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) secHeaders(103097) extension(2) version1(1)} +{itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) secHeaders(103097) extension(2) version-1(1) minor-version-1(1)} DEFINITIONS AUTOMATIC TAGS ::= BEGIN IMPORTS @@ -7,7 +7,7 @@ IMPORTS 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) minor-version-2 (2)} + dot2(2) base(1) base-types(2) major-version-2 (2) minor-version-3 (3)} --WITH SUCCESSORS ; diff --git a/EtsiTs103097Module.asn b/EtsiTs103097Module.asn index 440a857..6ccdf07 100644 --- a/EtsiTs103097Module.asn +++ b/EtsiTs103097Module.asn @@ -1,5 +1,5 @@ EtsiTs103097Module -{itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) secHeaders(103097) core(1) version3(3)} +{itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) secHeaders(103097) core(1) version-3(3) minor-version-1(1)} DEFINITIONS AUTOMATIC TAGS ::= BEGIN @@ -8,12 +8,12 @@ IMPORTS Ieee1609Dot2Data, Certificate 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)} + dot2(2) base(1) schema(1) major-version-2(2) minor-version-4(4)} --WITH SUCCESSORS ExtensionModuleVersion FROM EtsiTs103097ExtensionModule {itu-t(0) identified-organization(4) - etsi(0) itsDomain(5) wg5(5) secHeaders(103097) extension(2) version1(1)} + etsi(0) itsDomain(5) wg5(5) secHeaders(103097) extension(2) version-1(1) minor-version-1(1)} ; EtsiTs103097Certificate::= Certificate (WITH COMPONENTS{..., diff --git a/ieee1609dot2 b/ieee1609dot2 index d2c15f6..54c2d3d 160000 --- a/ieee1609dot2 +++ b/ieee1609dot2 @@ -1 +1 @@ -Subproject commit d2c15f6a6c9aa0f9c032d800997d1c0f424a9653 +Subproject commit 54c2d3d702104edc19b6df925725d49145fbfb5e -- GitLab