Change record of into set of in order to use superset (e65f6b96) · Commits · TTCN-3 Libraries / LibIts

ttcn/Security/LibItsSecurity_Templates.ttcn3

+24 −22

ttcn/Security/LibItsSecurity_TypesAndValues.ttcn3

+16 −16

Original line number	Original line	Diff line number	Diff line
	@@ -317,7 +317,7 @@ module LibItsSecurity_TypesAndValues {
	/**		/**
	* @desc Specify a list of three dimensional locations		* @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		* @desc Defines geographic regions used to limit the validity of certificates
	@@ -373,12 +373,12 @@ module LibItsSecurity_TypesAndValues {
	TwoDLocation southeast		TwoDLocation southeast
	} // End of type RectangularRegion		} // 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		* @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		* @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)		e_un_stats (1)
	} with { variant "8 bit" }		} with { variant "8 bit" }

	type record of UInt16 RegionIdentifiers;		type set of UInt16 RegionIdentifiers;

	} // End of group basicFormatElements		} // End of group basicFormatElements

	@@ -447,7 +447,7 @@ module LibItsSecurity_TypesAndValues {

	/**		/**
	* @desc Defines an ordered list of fields		* @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;		type set of HeaderField HeaderFields;

	@@ -489,9 +489,9 @@ module LibItsSecurity_TypesAndValues {
	octetstring other_header		octetstring other_header
	} // End of type HeaderFieldContainer		} // 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		* @desc Payload structure
	@@ -505,7 +505,7 @@ module LibItsSecurity_TypesAndValues {
	octetstring data optional		octetstring data optional
	} // End of type Payload		} // End of type Payload

	type record of SecPayload SecPayloads;		type set of SecPayload SecPayloads;

	/**		/**
	* @desc Supported types of payloads		* @desc Supported types of payloads
	@@ -520,7 +520,7 @@ module LibItsSecurity_TypesAndValues {
	e_signed_and_encrypted (4)		e_signed_and_encrypted (4)
	} with { variant "8 bit" }		} 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		* @desc Information used by the security layer after processing the payload
	@@ -608,9 +608,9 @@ module LibItsSecurity_TypesAndValues {
	Signature signature_		Signature signature_
	} // End of type Certificate		} // 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		* @desc Certificate description
	@@ -666,11 +666,11 @@ module LibItsSecurity_TypesAndValues {
	octetstring other_attribute		octetstring other_attribute
	} // End of type SubjectAttributeContainer		} // 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		* @desc The list of the possible types of attributes
	@@ -758,7 +758,7 @@ module LibItsSecurity_TypesAndValues {
	e_region (3)		e_region (3)
	} with { variant "8 bit" }		} with { variant "8 bit" }

	type record of ValidityRestriction ValidityRestrictions;		type set of ValidityRestriction ValidityRestrictions;

	/**		/**
	* @desc ITS-AID description		* @desc ITS-AID description
	@@ -821,7 +821,7 @@ module LibItsSecurity_TypesAndValues {
	/**		/**
	* @desc Describes the Test Adapter security configurations		* @desc Describes the Test Adapter security configurations
	*/		*/
	type record of TaConfig TaConfigs;		type set of TaConfig TaConfigs;

	} // End of group taConfiguration		} // End of group taConfiguration

Original line number	Original line	Diff line number	Diff line
	@@ -846,9 +846,9 @@ module LibItsSecurity_Templates {
	* @desc Generic received template for SecuredMessage		* @desc Generic received template for SecuredMessage
	*/		*/
	template (present) SecuredMessage mw_securedMessage(		template (present) SecuredMessage mw_securedMessage(
	template (present) HeaderFields p_header := ?,		in template (present) HeaderFields p_header := ?,
	template SecPayloads p_payloads := *,		in template SecPayloads p_payloads := *,
	template (present) TrailerFields p_trailer := ?		in template (present) TrailerFields p_trailer := ?
	) := {		) := {
	protocol_version := c_protocol_version,		protocol_version := c_protocol_version,
	security_profile := ?,		security_profile := ?,
	@@ -1096,7 +1096,9 @@ module LibItsSecurity_Templates {
	* @desc Receive template for HeaderField with generation time information		* @desc Receive template for HeaderField with generation time information
	* @param p_headerType Type id of the Header field		* @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,		type_ := p_headerType,
	headerField := ?		headerField := ?
	} // End of template mw_header_field_generation_time		} // End of template mw_header_field_generation_time
	@@ -1878,9 +1880,9 @@ module LibItsSecurity_Templates {
	* @desc Generic received template for SecuredMessage		* @desc Generic received template for SecuredMessage
	*/		*/
	template (present) SecuredMessage mdw_securedMessageCAM(		template (present) SecuredMessage mdw_securedMessageCAM(
	template (present) HeaderFields p_header := ?,		in template (present) HeaderFields p_header := ?,
	template (present) SecPayloads p_payloads := ?,		in template (present) SecPayloads p_payloads := ?,
	template (present) TrailerFields p_trailer := ?		in template (present) TrailerFields p_trailer := ?
	)		)
	modifies mw_securedMessage := {		modifies mw_securedMessage := {
	security_profile := c_security_profileCAMs		security_profile := c_security_profileCAMs
	@@ -1934,9 +1936,9 @@ module LibItsSecurity_Templates {
	* @desc Generic received template for SecuredMessage in DENM profile		* @desc Generic received template for SecuredMessage in DENM profile
	*/		*/
	template (present) SecuredMessage mdw_securedMessageDENM(		template (present) SecuredMessage mdw_securedMessageDENM(
	template (present) HeaderFields p_header := ?,		in template (present) HeaderFields p_header := ?,
	template SecPayloads p_payloads := ?,		in template SecPayloads p_payloads := ?,
	template (present) TrailerFields p_trailer := ?		in template (present) TrailerFields p_trailer := ?
	)		)
	modifies mw_securedMessage := {		modifies mw_securedMessage := {
	security_profile := c_security_profileDENMs		security_profile := c_security_profileDENMs

Admin message