Commit 7e3347ef authored by mullers's avatar mullers
Browse files

added 

TC_SEC_6468_01());
TC_SEC_6365_01());
TC_SEC_6393_01());
TC_SEC_6394_01())
parent 6c428001

ttcn3/EtsiLibrary/LibIpv6/LibCommonRfcs/LibIpv6_ExternalFunctions.ttcn

+7 −45
Original line number Diff line number Diff line
@@ -224,45 +224,6 @@ 
									     in octetstring p_receivedKey) 

	return octetstring;



	/* @desc 	This external function runs the IkePayload through Codec and returns 

	 *			the octetstring representing the IkePayload

	 *			

	 * @param 	p_ikePayload Ike Payload to be encoded to octetstring

	 * @return 	octetstring

	*/

	//SMU 2007 to be deleted

//	external function fx_ikePLToOct(IkePayload p_ikePayload)

//	return octetstring;



	/* @desc 	This external function runs the SaProposal through Codec and returns 

	 *			the octetstring representing the SaProposal

	 *			

	 * @param 	p_saProposal SaProposal to be encoded to octetstring

	 * @return 	octetstring

	*/

	//SMU 2007 to be deleted

//	external function fx_saProposalToOct(SaProposal p_saProposal)

//	return octetstring;



	/* @desc 	This external function runs the Transform through Codec and returns 

	 *			the octetstring representing the Transform

	 *			

	 * @param 	p_transform Transform to be encoded to octetstring

	 * @return 	octetstring

	*/

	//SMU 2007 to be deleted

//	external function fx_saTransformToOct(SaTransform p_saTransform)

//	return octetstring;



	/* @desc    This external function calculates the length of an IKE message

	 *			based on the length of the payload(s), length of message is 

	 *          length of payload(s) plus length of IKE header which is 28

	 * @param   p_ikepayload payload portion of IKE message

	 * @return  length of IKE message in bytes

	*/

//	external function fx_ikePayloadListLength( in template IkePayloadList p_ikepayload ) 

//	return UInt32;



	/* @desc 	This external function runs the IkePayloadList through Codec and returns 

	 *			the octetstring representing the IkePayloadList. If encrypted payload is part of the payload list,

	 *			then the ecncrypted octet string is returned.
@@ -290,14 +251,15 @@ 
	external function fx_ikeEncPayloadLength( in template EncryptedPayload p_msg ) 

	return UInt16;



	/* @desc 	This external function runs the Ipv6Payload through Codec and returns 

	 *			the octetstring representing the Ipv6Payload

	

	/* @desc 	This external function runs the ConfigAttributeList through Codec and returns 

	 *			the octetstring representing the ConfigAttributeList

	 *			

	 * @param 	p_ipv6Payload Ipv6Payload to be encoded to octetstring

	 * @param 	p_configAttributeList ConfigAttributeList to be encoded to octetstring

	 * @return 	octetstring

	*/

	//SMU 2007 to be deleted

//	external function fx_ipv6PayloadToOct(Ipv6Payload p_ipv6Payload)

//	return octetstring;

	external function fx_configAttributeListToOct(ConfigAttributeList p_configAttributeList)

	return octetstring;





}// end module LibIpv6_ExternalFunctions

ttcn3/EtsiLibrary/LibIpv6/LibSec/LibIpv6_Rfc4306Ikev2_Templates.ttcn

+61 −2
Original line number Diff line number Diff line
@@ -1363,6 +1363,65 @@ group encrPLTmplts { 


}//end group encrPLTmplts



group cfgPLTmplts {



	template IkePayload m_cfgPL (

		UInt8 							p_nextPayload,

		UInt8							p_configType,

		template ConfigAttributeList 	p_configAttributeList

	) := {

			configuration := {

				nextPayload	 		:= p_nextPayload,

				criticalFlag 		:= 0,

				reserved1	 		:= 0,

				payloadLength 		:= 8 + lengthof(fx_configAttributeListToOct(valueof(p_configAttributeList))),

				configType   		:= p_configType,

				reserved2	 		:= 0,

				configAttributeList := p_configAttributeList

			}

	}



	template IkePayload mw_cfgPL (

		UInt8 							p_nextPayload,

		UInt8							p_configType,

		template ConfigAttributeList	p_configAttributeList

	) := {

			configuration := {

				nextPayload	 		:= p_nextPayload,

				criticalFlag 		:= 0,

				reserved1	 		:= 0,

				payloadLength 		:= ?,

				configType   		:= p_configType,

				reserved2	 		:= 0,

				configAttributeList := p_configAttributeList

			}

	}



	template ConfigAttributeList m_cfgAttrList_1Elem (

		template ConfigAttribute p_configAttribute1

	) := {

		p_configAttribute1

	}



	template ConfigAttribute m_reservedCfgAttr := {

		reserved 		:= 0,

		attributeType 	:= c_configReserved,

		attributeLength := 0,

		attributeValue 	:= omit

	} 



//	template ConfigAttribute m_reservedCfgAttr (

//		UInt15					p_attributeType,

//		template octetstring	p_attributeValue

//	) {

//		reserved 		:= 0,

///		attributeType 	:= p_attributeType,

///		attributeLength := ,

//		attributeValue 	:= p_attributeValue

//	}



}//end cfgPLTmplts



}//end payloadTemplates

ttcn3/EtsiLibrary/LibIpv6/LibSec/LibIpv6_Rfc4306Ikev2_TypesAndValues.ttcn

+6 −5
Original line number Diff line number Diff line
@@ -832,10 +832,10 @@ 
		group IkeRfc4306ConfigurationPayload {



			group IkeRfc4306ConfigurationTypes {

				const UInt8	c_configRequest	:= 1;

				const UInt8	c_configReply 	:= 2;

				const UInt8	c_configSet		:= 3;

				const UInt8	c_configAck		:= 4;

				const UInt8	c_cfgReq	:= 1;

				const UInt8	c_cfgRpl 	:= 2;

				const UInt8	c_cfgSet		:= 3;

				const UInt8	c_cfgAck		:= 4;

			} // end group IkeRfc4306ConfigurationTypes



			/*
@@ -858,6 +858,7 @@ 
			group IkeRfc4306ConfigAttribute {



				group IkeRfc4306AttributeTypes {

					const UInt15 c_configReserved				:= 0;

					const UInt15 c_configInternalIpv4Address	:= 1;

					const UInt15 c_configInternalIpv4Netmask	:= 2;

					const UInt15 c_configInternalIpv4Dns		:= 3;
@@ -881,7 +882,7 @@ 
					UInt1				reserved,

					UInt15				attributeType,

					UInt16				attributeLength,

					octetstring			attributeValue

					octetstring			attributeValue optional

				} 

				with {

					variant "present=getIntTag('payloadLengthConf')!=0;";