Remove support of CAM/DENM into LibItsSecurity (a0e26b17) · Commits · TTCN-3 Libraries / LibIts

ttcn/Security/LibItsSecurity_Templates.ttcn3

+156 −152

Original line number	Diff line number	Diff line
		@@ -18,14 +18,14 @@ module LibItsSecurity_Templates {
		Oct2
		}

		// LibIts
		import from CAM_PDU_Descriptions language "ASN.1:1997" {
		type CAM
		}
		import from DENM_PDU_Descriptions language "ASN.1:1997" {
		type DENM
		}

		// // LibIts
		// import from CAM_PDU_Descriptions language "ASN.1:1997" {
		// type CAM
		// }
		// import from DENM_PDU_Descriptions language "ASN.1:1997" {
		// type DENM
		// }
		//
		// LibItsSecurity
		import from LibItsSecurity_TypesAndValues all;
		import from LibItsSecurity_Pixits all;
		@@ -652,143 +652,141 @@ module LibItsSecurity_Templates {
		in template (value) octetstring p_rawPayload
		) := {
		type_ := p_type,
		data := {
		rawPayload := p_rawPayload
		} // End of field data
		data := p_rawPayload
		} // End of template m_data_payload_rawPayload

		group camPayloads {

		group camPayloadsSend {

		template (value) Payload m_payload_unsecured_cam(
		in template (value) CAM p_camPayload
		) := {
		type_ := e_unsecured,
		data := {
		camPayload := p_camPayload
		} // End of field data
		} // End of template m_payload_unsecured_cam

		template (value) Payload md_payload_signed_cam(
		in template (value) CAM p_camPayload
		) modifies m_payload_unsecured_cam := {
		type_ := e_signed
		} // End of template md_payload_signed_cam

		template (value) Payload md_payload_encrypted_cam(
		in template (value) CAM p_camPayload
		) modifies m_payload_unsecured_cam := {
		type_ := e_encrypted
		} // End of template md_payload_encrypted_cam

		template (value) Payload md_payload_signed_encrypted_cam(
		in template (value) CAM p_camPayload
		) modifies m_payload_unsecured_cam := {
		type_ := e_signed_and_encrypted
		} // End of template md_payload_signed_encrypted_cam

		template (present) Payload mw_payload_unsecured_cam(
		in template (present) CAM p_camPayload
		) := {
		type_ := e_unsecured,
		data := {
		camPayload := p_camPayload
		} // End of field data
		} // End of template mw_payload_unsecured_cam

		} // End of group camPayloadsSend

		group camPayloadsRecv {

		template (present) Payload mdw_payload_signed_cam(
		in template (present) CAM p_camPayload
		) modifies mw_payload_unsecured_cam := {
		type_ := e_signed
		} // End of template mdw_payload_signed_cam

		template (present) Payload mdw_payload_encrypted_cam(
		in template (present) CAM p_camPayload
		) modifies mw_payload_unsecured_cam := {
		type_ := e_encrypted
		} // End of template mdw_payload_encrypted_cam

		template (present) Payload mdw_payload_signed_encrypted_cam(
		in template (present) CAM p_camPayload
		) modifies mw_payload_unsecured_cam := {
		type_ := e_signed_and_encrypted
		} // End of template mdw_payload_signed_encrypted_cam

		} // End of group camPayloadsRecv

		} // End of group camPayloads

		group denmPayloads {

		group denmPayloadsSend {

		template (value) Payload m_payload_unsecured_denm(
		in template (value) DENM p_denmPayload
		) := {
		type_ := e_unsecured,
		data := {
		denmPayload := p_denmPayload
		} // End of field data
		} // End of template m_payload_unsecured_denm

		template (value) Payload md_payload_signed_denm(
		in template (value) DENM p_denmPayload
		) modifies m_payload_unsecured_denm := {
		type_ := e_signed
		} // End of template md_payload_signed_denm

		template (value) Payload md_payload_encrypted_denm(
		in template (value) DENM p_denmPayload
		) modifies m_payload_unsecured_denm := {
		type_ := e_encrypted
		} // End of template md_payload_encrypted_denm

		template (value) Payload md_payload_signed_encrypted_denm(
		in template (value) DENM p_denmPayload
		) modifies m_payload_unsecured_denm := {
		type_ := e_signed_and_encrypted
		} // End of template md_payload_signed_encrypted_denm

		} // End of group denmPayloadsSend

		group denmPayloadsRecv {

		template (present) Payload mw_payload_unsecured_denm(
		in template (present) DENM p_denmPayload
		) := {
		type_ := e_unsecured,
		data := {
		denmPayload := p_denmPayload
		} // End of field data
		} // End of template mw_payload_unsecured_denm

		template (present) Payload mdw_payload_signed_denm(
		in template (present) DENM p_denmPayload
		) modifies mw_payload_unsecured_denm := {
		type_ := e_signed
		} // End of template mdw_payload_signed_denm

		template (present) Payload mdw_payload_encrypted_denm(
		in template (present) DENM p_denmPayload
		) modifies mw_payload_unsecured_denm := {
		type_ := e_encrypted
		} // End of template mdw_payload_encrypted_denm

		template (present) Payload mdw_payload_signed_encrypted_denm(
		in template (present) DENM p_denmPayload
		) modifies mw_payload_unsecured_denm := {
		type_ := e_signed_and_encrypted
		} // End of template mdw_payload_signed_encrypted_denm

		} // End of group denmPayloadsRecv

		} // End of group denmPayloads

		// group camPayloads {
		//
		// group camPayloadsSend {
		//
		// template (value) Payload m_payload_unsecured_cam(
		// in template (value) CAM p_camPayload
		// ) := {
		// type_ := e_unsecured,
		// data := {
		// camPayload := p_camPayload
		// } // End of field data
		// } // End of template m_payload_unsecured_cam
		//
		// template (value) Payload md_payload_signed_cam(
		// in template (value) CAM p_camPayload
		// ) modifies m_payload_unsecured_cam := {
		// type_ := e_signed
		// } // End of template md_payload_signed_cam
		//
		// template (value) Payload md_payload_encrypted_cam(
		// in template (value) CAM p_camPayload
		// ) modifies m_payload_unsecured_cam := {
		// type_ := e_encrypted
		// } // End of template md_payload_encrypted_cam
		//
		// template (value) Payload md_payload_signed_encrypted_cam(
		// in template (value) CAM p_camPayload
		// ) modifies m_payload_unsecured_cam := {
		// type_ := e_signed_and_encrypted
		// } // End of template md_payload_signed_encrypted_cam
		//
		// template (present) Payload mw_payload_unsecured_cam(
		// in template (present) CAM p_camPayload
		// ) := {
		// type_ := e_unsecured,
		// data := {
		// camPayload := p_camPayload
		// } // End of field data
		// } // End of template mw_payload_unsecured_cam
		//
		// } // End of group camPayloadsSend
		//
		// group camPayloadsRecv {
		//
		// template (present) Payload mdw_payload_signed_cam(
		// in template (present) CAM p_camPayload
		// ) modifies mw_payload_unsecured_cam := {
		// type_ := e_signed
		// } // End of template mdw_payload_signed_cam
		//
		// template (present) Payload mdw_payload_encrypted_cam(
		// in template (present) CAM p_camPayload
		// ) modifies mw_payload_unsecured_cam := {
		// type_ := e_encrypted
		// } // End of template mdw_payload_encrypted_cam
		//
		// template (present) Payload mdw_payload_signed_encrypted_cam(
		// in template (present) CAM p_camPayload
		// ) modifies mw_payload_unsecured_cam := {
		// type_ := e_signed_and_encrypted
		// } // End of template mdw_payload_signed_encrypted_cam
		//
		// } // End of group camPayloadsRecv
		//
		// } // End of group camPayloads
		//
		// group denmPayloads {
		//
		// group denmPayloadsSend {
		//
		// template (value) Payload m_payload_unsecured_denm(
		// in template (value) DENM p_denmPayload
		// ) := {
		// type_ := e_unsecured,
		// data := {
		// denmPayload := p_denmPayload
		// } // End of field data
		// } // End of template m_payload_unsecured_denm
		//
		// template (value) Payload md_payload_signed_denm(
		// in template (value) DENM p_denmPayload
		// ) modifies m_payload_unsecured_denm := {
		// type_ := e_signed
		// } // End of template md_payload_signed_denm
		//
		// template (value) Payload md_payload_encrypted_denm(
		// in template (value) DENM p_denmPayload
		// ) modifies m_payload_unsecured_denm := {
		// type_ := e_encrypted
		// } // End of template md_payload_encrypted_denm
		//
		// template (value) Payload md_payload_signed_encrypted_denm(
		// in template (value) DENM p_denmPayload
		// ) modifies m_payload_unsecured_denm := {
		// type_ := e_signed_and_encrypted
		// } // End of template md_payload_signed_encrypted_denm
		//
		// } // End of group denmPayloadsSend
		//
		// group denmPayloadsRecv {
		//
		// template (present) Payload mw_payload_unsecured_denm(
		// in template (present) DENM p_denmPayload
		// ) := {
		// type_ := e_unsecured,
		// data := {
		// denmPayload := p_denmPayload
		// } // End of field data
		// } // End of template mw_payload_unsecured_denm
		//
		// template (present) Payload mdw_payload_signed_denm(
		// in template (present) DENM p_denmPayload
		// ) modifies mw_payload_unsecured_denm := {
		// type_ := e_signed
		// } // End of template mdw_payload_signed_denm
		//
		// template (present) Payload mdw_payload_encrypted_denm(
		// in template (present) DENM p_denmPayload
		// ) modifies mw_payload_unsecured_denm := {
		// type_ := e_encrypted
		// } // End of template mdw_payload_encrypted_denm
		//
		// template (present) Payload mdw_payload_signed_encrypted_denm(
		// in template (present) DENM p_denmPayload
		// ) modifies mw_payload_unsecured_denm := {
		// type_ := e_signed_and_encrypted
		// } // End of template mdw_payload_signed_encrypted_denm
		//
		// } // End of group denmPayloadsRecv
		//
		// } // End of group denmPayloads
		//
		} // End of group payloads

		group headerFields {
		@@ -1140,9 +1138,23 @@ module LibItsSecurity_Templates {
		group securityProfilesCAMsSend {

		/**
		* @desc Generic send template for Security profile for CAMs
		* @desc Generic send template for Security profile for CAMs with a single payload
		*/
		template (value) SecuredMessage md_secureMessageCAMs(
		in template (value) HeaderFields p_header_fields,
		in template (value) Payload p_payload_fields,
		in template (value) TrailerFields p_trailer_fields
		) modifies m_secureMessageCAMs_dummy := {
		security_profile := c_security_profileCAMs,
		header_fields := p_header_fields,
		payload_fields := { p_payload_fields },
		trailer_fields := p_trailer_fields
		} // End of template md_secureMessageCAMs

		/**
		* @desc Generic send template for Security profile for CAMs with several payloads
		*/
		template (value) SecuredMessage md_secureMessageCAMs_multiple_payloads(
		in template (value) HeaderFields p_header_fields,
		in template (value) Payloads p_payload_fields,
		in template (value) TrailerFields p_trailer_fields
		@@ -1153,14 +1165,6 @@ module LibItsSecurity_Templates {
		trailer_fields := p_trailer_fields
		} // End of template md_secureMessageCAMs

		template (value) HeaderField m_header_field_signer_info_ecdsa(
		in template (value) SignerInfo p_signer
		) modifies m_header_field_signer_info := {
		headerField := {
		signer := p_signer
		}
		} // End of template m_header_field_signer_info_ecdsa

		} // End of group securityProfilesCAMsSend

		group securityProfilesCAMsRecv {

ttcn/Security/LibItsSecurity_TypesAndValues.ttcn3

+24 −23

Original line number	Diff line number	Diff line
		@@ -19,14 +19,14 @@ module LibItsSecurity_TypesAndValues {
		Oct2, Oct3, Oct8, Oct12, Oct20, Oct0to31, Oct0to255
		}

		// LibIts
		import from CAM_PDU_Descriptions language "ASN.1:1997" {
		type CAM
		}
		import from DENM_PDU_Descriptions language "ASN.1:1997" {
		type DENM
		}

		// // LibIts
		// import from CAM_PDU_Descriptions language "ASN.1:1997" {
		// type CAM
		// }
		// import from DENM_PDU_Descriptions language "ASN.1:1997" {
		// type DENM
		// }
		//
		group basicFormatElements {

		/**
		@@ -480,23 +480,24 @@ module LibItsSecurity_TypesAndValues {
		*/
		type record Payload {
		PayloadType type_,
		PayloadContainer data optional
		octetstring data optional
		// PayloadContainer data optional
		} // End of type Payload

		/**
		* @desc Payload data container
		* @member camPayload CAM message
		* @member denmPayload DENM message
		* @member rawPayload Other message
		*
		* @see Draft ETSI TS 103 097 V1.1.6 Clause 5.2 Payload
		*/
		type union PayloadContainer {
		CAM camPayload,
		DENM denmPayload,
		octetstring rawPayload
		} // End of type PayloadContainer

		// /**
		// * @desc Payload data container
		// * @member camPayload CAM message
		// * @member denmPayload DENM message
		// * @member rawPayload Other message
		// *
		// * @see Draft ETSI TS 103 097 V1.1.6 Clause 5.2 Payload
		// */
		// type union PayloadContainer {
		// CAM camPayload,
		// DENM denmPayload,
		// octetstring rawPayload
		// } // End of type PayloadContainer
		//
		/**
		* @desc Supported types of payloads
		*

Admin message