Add new templates for Regions (7a8beba2) · Commits · TTCN-3 Libraries / LibIts

ttcn/Security/LibItsSecurity_Templates.ttcn3

+30 −11

Original line number	Original line	Diff line number	Diff line
	@@ -324,13 +324,18 @@ module LibItsSecurity_Templates {
	} // End of template m_geographicRegion_polygonial		} // End of template m_geographicRegion_polygonial

	template (value) GeographicRegion m_geographicRegion_identifiedRegion(		template (value) GeographicRegion m_geographicRegion_identifiedRegion(
	in template (value) PolygonalRegion p_polygonal_region		in template (value) IdentifiedRegion p_id_region
	) := {		) := {
	region_type := e_polygon,		region_type := e_id,
	region := {		region := {
	polygonal_region := p_polygonal_region		id_region := p_id_region
	} // End of field region		} // End of field region
	} // End of template m_geographicRegion_polygonial		} // End of template m_geographicRegion_identifiedRegion

			template (value) GeographicRegion m_geographicRegion_nonce := {
			region_type := e_none,
			region := omit
			} // End of template m_geographicRegion_nonce

	} // End of group dummyBasicFormatElementsSend		} // End of group dummyBasicFormatElementsSend

	@@ -492,6 +497,20 @@ module LibItsSecurity_Templates {
	} // End of field region		} // End of field region
	} // End of template mw_geographicRegion_polygonial		} // End of template mw_geographicRegion_polygonial

			template (present) GeographicRegion mww_geographicRegion_identifiedRegion(
			in template (present) IdentifiedRegion p_id_region
			) := {
			region_type := e_id,
			region := {
			id_region := p_id_region
			} // End of field region
			} // End of template mw_geographicRegion_identifiedRegion

			template (present) GeographicRegion mw_geographicRegion_nonce := {
			region_type := e_none,
			region := *
			} // End of template mw_geographicRegion_nonce

	} // End of group dummyBasicFormatElementsRecv		} // End of group dummyBasicFormatElementsRecv

	} // End of group dummyBasicFormatElements		} // End of group dummyBasicFormatElements

ttcn/Security/LibItsSecurity_TypesAndValues.ttcn3

+7 −7

Original line number	Original line	Diff line number	Diff line
	@@ -16,7 +16,7 @@ module LibItsSecurity_TypesAndValues {
	import from LibCommon_DataStrings {		import from LibCommon_DataStrings {
	type		type
	Bit2, Bit3,		Bit2, Bit3,
	Oct2, Oct0to3, Oct0to8, Oct0to12, Oct0to20, Oct0to31, Oct0to255		Oct2, Oct3, Oct8, Oct12, Oct20, Oct0to31, Oct0to255
	}		}

	// LibIts		// LibIts
	@@ -148,7 +148,7 @@ module LibItsSecurity_TypesAndValues {
	* @member params Out of scope		* @member params Out of scope
	*/		*/
	type union EncryptionParametersContainer {		type union EncryptionParametersContainer {
	Oct0to12 nonce,		Oct12 nonce,
	octetstring params		octetstring params
	} // End of type EncryptionParametersContainer		} // End of type EncryptionParametersContainer

	@@ -244,14 +244,14 @@ module LibItsSecurity_TypesAndValues {
	* @see Draft ETSI TS 103 097 V1.1.6 Clause 4.2.14 HashedId3		* @see Draft ETSI TS 103 097 V1.1.6 Clause 4.2.14 HashedId3
	* @see RFC2246 Clause 4.2. Miscellaneous		* @see RFC2246 Clause 4.2. Miscellaneous
	*/		*/
	type Oct0to3 HashedId3;		type Oct3 HashedId3;

	/**		/**
	* @desc Identifies data such as a certificate		* @desc Identifies data such as a certificate
	* @see Draft ETSI TS 103 097 V1.1.6 Clause 4.2.13 HashedId8		* @see Draft ETSI TS 103 097 V1.1.6 Clause 4.2.13 HashedId8
	* @see RFC2246 Clause 4.2. Miscellaneous		* @see RFC2246 Clause 4.2. Miscellaneous
	*/		*/
	type Oct0to8 HashedId8;		type Oct8 HashedId8;

	/**		/**
	* @desc The unsigned 32 bits number of International Atomic Time (TAI) microseconds since 00:00:00 UTC, 01 January 2004		* @desc The unsigned 32 bits number of International Atomic Time (TAI) microseconds since 00:00:00 UTC, 01 January 2004
	@@ -403,8 +403,8 @@ module LibItsSecurity_TypesAndValues {
	* @see Draft ETSI TS 103 097 V1.1.6 Clause 4.2.27 RegionDictionary		* @see Draft ETSI TS 103 097 V1.1.6 Clause 4.2.27 RegionDictionary
	*/		*/
	type enumerated RegionDictionary {		type enumerated RegionDictionary {
	iso_3166_1 (0),		e_iso_3166_1 (0),
	un_stats (1)		e_un_stats (1)
	} with { variant "8 bit" }		} with { variant "8 bit" }

	} // End of group basicFormatElements		} // End of group basicFormatElements
	@@ -575,7 +575,7 @@ module LibItsSecurity_TypesAndValues {
	UInt32 symm_key_len,		UInt32 symm_key_len,
	EccPoint v,		EccPoint v,
	octetstring c,		octetstring c,
	Oct0to20 t // TODO Oct0to20 ot Oct1to20?		Oct20 t
	} // End of type EciesEncryptedKey		} // End of type EciesEncryptedKey

	} // End of group SecurityMessages		} // End of group SecurityMessages

Admin message