Merge branch 'WI-00557' into 'master' (df7f4ed3) · Commits · ITS - Intelligent Transport Systems / ASN1 / SEC TS 103 097

EtsiTs103097ExtensionModule.asn

0 → 100644

+50 −0

Original line number	Diff line number	Diff line
		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)};

		ExtensionModuleVersion::= 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

EtsiTs103097Module.asn

100755 → 100644

+32 −12

Original line number	Diff line number	Diff line
		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

		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)}
		WITH SUCCESSORS

		ExtensionModuleVersion
		FROM EtsiTs103097ExtensionModule {itu-t(0) identified-organization(4)
		etsi(0) itsDomain(5) wg5(5) secHeaders(103097) extension(2) version1(1)};

		EtsiTs103097Certificate::= ExplicitCertificate (WITH COMPONENTS{...,
		toBeSigned (WITH COMPONENTS{...,
		@@ -24,11 +26,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 +37,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 +53,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 +103,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

LICENSE

100755 → 100644

+1 −1

Original line number	Diff line number	Diff line
		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:

README.md

+3 −3

Original line number	Diff line number	Diff line
		# 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.

ieee1609dot2 @ 54eba2d4

Original line number	Diff line number	Diff line
		Subproject commit 70c10e7bb032794fa5168c009be8b865179fc883
		Subproject commit 54eba2d4c2d2bac07e8e5f3376e5f1ac558ca3f1

Admin message