Skip to content
GitLab
Commit e65f6b96 authored by garciay's avatar garciay
Browse files

Change record of into set of in order to use superset 

record of shall be used, refer to ETSI TS 103 097 V 1.1.6 (2014-05)
parent eb25fc82
Hide whitespace changes
Inline Side-by-side
ttcn/Security/LibItsSecurity_Templates.ttcn3
View file @ e65f6b96
......@@ -846,9 +846,9 @@ module LibItsSecurity_Templates {
* @desc Generic received template for SecuredMessage
*/
template (present) SecuredMessage mw_securedMessage(
template (present) HeaderFields p_header := ?,
template SecPayloads p_payloads := *,
template (present) TrailerFields p_trailer := ?
in template (present) HeaderFields p_header := ?,
in template SecPayloads p_payloads := *,
in template (present) TrailerFields p_trailer := ?
) := {
protocol_version := c_protocol_version,
security_profile := ?,
......@@ -1096,7 +1096,9 @@ module LibItsSecurity_Templates {
* @desc Receive template for HeaderField with generation time information
* @param p_headerType Type id of the Header field
*/
template (present) HeaderField mw_header_field_any(HeaderFieldType p_headerType) := {
template (present) HeaderField mw_header_field(
in HeaderFieldType p_headerType
) := {
type_ := p_headerType,
headerField := ?
} // End of template mw_header_field_generation_time
......@@ -1852,9 +1854,9 @@ module LibItsSecurity_Templates {
* @desc Generic send template for Security profile for CAMs with several payloads
*/
template (value) SecuredMessage md_secureMessage_profileCam(
in template (value) HeaderFields p_header_fields,
in template (omit) SecPayloads p_payload_fields,
in template (value) TrailerFields p_trailer_fields
in template (value) HeaderFields p_header_fields,
in template (omit) SecPayloads p_payload_fields,
in template (value) TrailerFields p_trailer_fields
) modifies m_secureMessage := {
security_profile := c_security_profileCAMs,
header_fields := p_header_fields,
......@@ -1878,9 +1880,9 @@ module LibItsSecurity_Templates {
* @desc Generic received template for SecuredMessage
*/
template (present) SecuredMessage mdw_securedMessageCAM(
template (present) HeaderFields p_header := ?,
template (present) SecPayloads p_payloads := ?,
template (present) TrailerFields p_trailer := ?
in template (present) HeaderFields p_header := ?,
in template (present) SecPayloads p_payloads := ?,
in template (present) TrailerFields p_trailer := ?
)
modifies mw_securedMessage := {
security_profile := c_security_profileCAMs
......@@ -1908,9 +1910,9 @@ module LibItsSecurity_Templates {
* @desc Generic send template for Security profile for CAMs with several payloads
*/
template (value) SecuredMessage md_secureMessage_profileDenm(
in template (value) HeaderFields p_header_fields,
in template (omit) SecPayloads p_payload_fields,
in template (value) TrailerFields p_trailer_fields
in template (value) HeaderFields p_header_fields,
in template (omit) SecPayloads p_payload_fields,
in template (value) TrailerFields p_trailer_fields
) modifies m_secureMessage := {
security_profile := c_security_profileDENMs,
header_fields := p_header_fields,
......@@ -1934,9 +1936,9 @@ module LibItsSecurity_Templates {
* @desc Generic received template for SecuredMessage in DENM profile
*/
template (present) SecuredMessage mdw_securedMessageDENM(
template (present) HeaderFields p_header := ?,
template SecPayloads p_payloads := ?,
template (present) TrailerFields p_trailer := ?
in template (present) HeaderFields p_header := ?,
in template SecPayloads p_payloads := ?,
in template (present) TrailerFields p_trailer := ?
)
modifies mw_securedMessage := {
security_profile := c_security_profileDENMs
......@@ -1951,9 +1953,9 @@ module LibItsSecurity_Templates {
group otherSecurityProfilesSend {
template (value) SecuredMessage md_securedMessage_profileOther(
in template (value) HeaderFields p_header_fields,
in template (omit) SecPayloads p_payload_fields,
in template (value) TrailerFields p_trailer_fields
in template (value) HeaderFields p_header_fields,
in template (omit) SecPayloads p_payload_fields,
in template (value) TrailerFields p_trailer_fields
) modifies m_secureMessage := {
security_profile := c_security_profileOthers,
header_fields := p_header_fields,
......@@ -1969,9 +1971,9 @@ module LibItsSecurity_Templates {
* @desc Generic received template for SecuredMessage in DENM profile
*/
template (present) SecuredMessage mdw_securedMessageOther(
template (present) HeaderFields p_header := ?,
template SecPayloads p_payloads := *,
template (present) TrailerFields p_trailer := ?
in template (present) HeaderFields p_header := ?,
in template SecPayloads p_payloads := *,
in template (present) TrailerFields p_trailer := ?
)
modifies mw_securedMessage := {
security_profile := c_security_profileOthers
......
ttcn/Security/LibItsSecurity_TypesAndValues.ttcn3
View file @ e65f6b96
......@@ -317,7 +317,7 @@ module LibItsSecurity_TypesAndValues {
/**
* @desc Specify a list of three dimensional locations
*/
type record of ThreeDLocation ThreeDLocations;
type set of ThreeDLocation ThreeDLocations;
/**
* @desc Defines geographic regions used to limit the validity of certificates
......@@ -373,12 +373,12 @@ module LibItsSecurity_TypesAndValues {
TwoDLocation southeast
} // End of type RectangularRegion
type record of RectangularRegion RectangularRegions;
type set of RectangularRegion RectangularRegions;
/**
* @desc a region by enumerating points on the region's boundary
*/
type record of TwoDLocation PolygonalRegion;
type set of TwoDLocation PolygonalRegion;
/**
* @desc Defines a predefined geographic region determined by the region dictionary and the region identifier
......@@ -402,7 +402,7 @@ module LibItsSecurity_TypesAndValues {
e_un_stats (1)
} with { variant "8 bit" }
type record of UInt16 RegionIdentifiers;
type set of UInt16 RegionIdentifiers;
} // End of group basicFormatElements
......@@ -447,7 +447,7 @@ module LibItsSecurity_TypesAndValues {
/**
* @desc Defines an ordered list of fields
* @remark TTCN-3 lamguage does not provide feature suach as superset for the record of. In consequence, the record of is replaced here by a set of
* @remark TTCN-3 lamguage does not provide feature suach as superset for the . In consequence, the is replaced here by a set of
*/
type set of HeaderField HeaderFields;
......@@ -489,9 +489,9 @@ module LibItsSecurity_TypesAndValues {
octetstring other_header
} // End of type HeaderFieldContainer
type record of HashedId3 HashedId3s;
type set of HashedId3 HashedId3s;
type record of RecipientInfo RecipientInfos;
type set of RecipientInfo RecipientInfos;
/**
* @desc Payload structure
......@@ -505,7 +505,7 @@ module LibItsSecurity_TypesAndValues {
octetstring data optional
} // End of type Payload
type record of SecPayload SecPayloads;
type set of SecPayload SecPayloads;
/**
* @desc Supported types of payloads
......@@ -520,7 +520,7 @@ module LibItsSecurity_TypesAndValues {
e_signed_and_encrypted (4)
} with { variant "8 bit" }
type record of TrailerField TrailerFields;
type set of TrailerField TrailerFields;
/**
* @desc Information used by the security layer after processing the payload
......@@ -608,9 +608,9 @@ module LibItsSecurity_TypesAndValues {
Signature signature_
} // End of type Certificate
type record of Certificate CertificateChain;
type set of Certificate CertificateChain;
type record of SignerInfo SignerInfos;
type set of SignerInfo SignerInfos;
/**
* @desc Certificate description
......@@ -666,11 +666,11 @@ module LibItsSecurity_TypesAndValues {
octetstring other_attribute
} // End of type SubjectAttributeContainer
type record of SubjectAttribute SubjectAttributes;
type set of SubjectAttribute SubjectAttributes;
type record of IntX IntXs;
type set of IntX IntXs;
type record of ItsAidSsp ItsAidSsps;
type set of ItsAidSsp ItsAidSsps;
/**
* @desc The list of the possible types of attributes
......@@ -758,7 +758,7 @@ module LibItsSecurity_TypesAndValues {
e_region (3)
} with { variant "8 bit" }
type record of ValidityRestriction ValidityRestrictions;
type set of ValidityRestriction ValidityRestrictions;
/**
* @desc ITS-AID description
......@@ -821,7 +821,7 @@ module LibItsSecurity_TypesAndValues {
/**
* @desc Describes the Test Adapter security configurations
*/
type record of TaConfig TaConfigs;
type set of TaConfig TaConfigs;
} // End of group taConfiguration
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment