diff --git a/IEEE1609dot2.asn b/IEEE1609dot2.asn old mode 100755 new mode 100644 index 0bd2f17964c5cf3d06b37fd58c06693cf9dfbd95..a5f760af33b6afdddd3d8142c7eb665118f65f37 --- a/IEEE1609dot2.asn +++ b/IEEE1609dot2.asn @@ -1,8 +1,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: 2 +dot2(2) base(1) schema(1) major-version-2(2) minor-version-3(3)} --****************************************************************************** -- @@ -52,8 +50,11 @@ 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 +110,9 @@ ToBeSignedData ::= SEQUENCE { HashedData::= CHOICE { sha256HashedData OCTET STRING (SIZE(32)), - ... + ..., + sha384HashedData OCTET STRING (SIZE(48)), + reserved OCTET STRING (SIZE(32)) } HeaderInfo ::= SEQUENCE { @@ -123,9 +126,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, diff --git a/IEEE1609dot2BaseTypes.asn b/IEEE1609dot2BaseTypes.asn old mode 100755 new mode 100644 diff --git a/README.md b/README.md index 656b9cf4352b36c26881a4bc8555398cc1d01594..189831e4bc3febb4223445c7c38c9f8436b803bf 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.*