Commit ba11c35f authored by tepelmann's avatar tepelmann
Browse files

Changed modulepar definition to edition 3 syntax.

parent 5527030f
Loading
Loading
Loading
Loading
+2 −2
Original line number Original line Diff line number Diff line
@@ -797,8 +797,8 @@ group ipSecFns {
		}
		}
		else {
		else {
			vc_ikeSad[0] := {
			vc_ikeSad[0] := {
				spiInitiator := PX_IKE_SPI,
				spiInitiator := int2oct(float2int(int2float(20000-5000)*rnd())+5000, 8),
				spiResponder := PX_IKE_SPI,
				spiResponder := int2oct(float2int(int2float(20000-5000)*rnd())+5000, 8),
				messageIdTn := 0,
				messageIdTn := 0,
				messageIdIut := 0,
				messageIdIut := 0,
				ikeEncryptionAlgo := PX_IKE_ENCALGO,
				ikeEncryptionAlgo := PX_IKE_ENCALGO,
+24 −29
Original line number Original line Diff line number Diff line
@@ -4,7 +4,7 @@
 *	@desc		- Here all module parameters from every RFC shall be collected.
 *	@desc		- Here all module parameters from every RFC shall be collected.
 *  
 *  
 */
 */
module LibIpv6_ModuleParameters {
module LibIpv6_ModuleParameters language "TTCN-3:2005" {
	
	
	//LibCommon
	//LibCommon
	import from LibCommon_DataStrings all;
	import from LibCommon_DataStrings all;
@@ -18,119 +18,114 @@ module LibIpv6_ModuleParameters {
	 * @desc Length of Source Link-Layer and Target Link-Layer options
	 * @desc Length of Source Link-Layer and Target Link-Layer options
	 * @remark Length is specified in units of 8 octets including type+length field
	 * @remark Length is specified in units of 8 octets including type+length field
	*/
	*/
	modulepar {UInt8 PX_MAC_OPTION_LEN := 1}
	modulepar UInt8 PX_MAC_OPTION_LEN := 1;


	/*
	/*
	 * @desc What time does the IUT need to build its global address?
	 * @desc What time does the IUT need to build its global address?
	*/
	*/
	modulepar {float PX_T_BUILD_GLA := 15.0}
	modulepar float PX_T_BUILD_GLA := 15.0;


group security {
group security {
	/*
	/*
	 * @desc Shall IPSEC be tested?
	 * @desc Shall IPSEC be tested?
	*/
	*/
	modulepar { IpSecSwitch PX_USE_IPSEC_FOR_MIP  := e_securityOff }
	modulepar IpSecSwitch PX_USE_IPSEC_FOR_MIP  := e_securityOff;


	/*
	/*
	 * @desc Which protocol mode shall be used in vc_sad[c_saRes]?
	 * @desc Which protocol mode shall be used in vc_sad[c_saRes]?
	*/
	*/
	modulepar { IpSecProtocolMode PX_IPSEC_PROTOCOL_MODE := e_transportMode }
	modulepar IpSecProtocolMode PX_IPSEC_PROTOCOL_MODE := e_transportMode;


	/*
	/*
	 * @desc Which Algo mode shall be used for Encryption in vc_sad[c_saRes]?
	 * @desc Which Algo mode shall be used for Encryption in vc_sad[c_saRes]?
	*/
	*/
	modulepar { EncryptionAlgo PX_ENCRYPTION_ALGO := e_encr_3Des }
	modulepar EncryptionAlgo PX_ENCRYPTION_ALGO := e_encr_3Des;


	/*
	/*
	 * @desc Which Algo mode shall be used for Integrity in vc_sad[c_saRes]?
	 * @desc Which Algo mode shall be used for Integrity in vc_sad[c_saRes]?
	*/
	*/
	modulepar { IntegrityAlgo PX_INTEGRITY_ALGO := e_auth_hmacSha1_96 }
	modulepar IntegrityAlgo PX_INTEGRITY_ALGO := e_auth_hmacSha1_96;
	
	
	/*
	/*
	 * @desc Key for integrity vc_sad[c_saRes]
	 * @desc Key for integrity vc_sad[c_saRes]
	*/
	*/
	modulepar {octetstring PX_INTEGRITY_KEY := '000102030405'O }
	modulepar octetstring PX_INTEGRITY_KEY := '000102030405'O;
	
	
	/*
	/*
	 * @desc Key for encryption in vc_sad[c_saRes]
	 * @desc Key for encryption in vc_sad[c_saRes]
	*/
	*/
	modulepar {octetstring PX_ESP_ENCR_KEY := 'A1A2A3A4'O}
	modulepar octetstring PX_ESP_ENCR_KEY := 'A1A2A3A4'O;


} // end group security
} // end group security


group ikeSecurity
group ikeSecurity
	{
	{
	/*
	 * @desc Which SPI shall be used for testing IKE?
	*/
	modulepar {Oct8 PX_IKE_SPI := '0000000000000001'O}  //SMU this can be random, no pixit needed, delete later

	/*
	/*
	 * @desc Which protocol (ESP or AH) shall be requested in IKE_AUTH messages when testing IKE?
	 * @desc Which protocol (ESP or AH) shall be requested in IKE_AUTH messages when testing IKE?
	*/
	*/
	modulepar {UInt8 PX_AH_OR_ESP := c_protocolEsp}  
	modulepar UInt8 PX_AH_OR_ESP := c_protocolEsp;  


	/*
	/*
	 * @desc Which encryption algorithm shall be used for testing IKE?
	 * @desc Which encryption algorithm shall be used for testing IKE?
	*/
	*/
	modulepar {EncryptionAlgo PX_IKE_ENCALGO := e_encr_3Des}
	modulepar EncryptionAlgo PX_IKE_ENCALGO := e_encr_3Des;


	/*
	/*
	 * @desc Which pseudo random function shall be used for testing IKE?
	 * @desc Which pseudo random function shall be used for testing IKE?
	*/
	*/
	modulepar {PseudoRandomFunction PX_IKE_PSEUDORANDOM_FCT := e_prfHmacMd5} 
	modulepar PseudoRandomFunction PX_IKE_PSEUDORANDOM_FCT := e_prfHmacMd5; 


	/*
	/*
	 * @desc Which integrity algorithm shall be used for testing IKE?
	 * @desc Which integrity algorithm shall be used for testing IKE?
	*/
	*/
	modulepar {IntegrityAlgo PX_IKE_INTALGO := e_auth_hmacMd5_96}
	modulepar IntegrityAlgo PX_IKE_INTALGO := e_auth_hmacMd5_96;


	/*
	/*
	 * @desc Which Diffie-Hellman group shall be used for testing IKE?
	 * @desc Which Diffie-Hellman group shall be used for testing IKE?
	*/
	*/
	modulepar {DiffieHellmanGroup PX_IKE_DIFFIEHELLMAN_GROUP := e_group2ModP1024Bit} 
	modulepar DiffieHellmanGroup PX_IKE_DIFFIEHELLMAN_GROUP := e_group2ModP1024Bit; 


	/*
	/*
	 * @desc Which private key for the Diffie-Hellman exchange shall be used for testing IKE?
	 * @desc Which private key for the Diffie-Hellman exchange shall be used for testing IKE?
	*/
	*/
	modulepar {octetstring PX_IKE_DIFFIEHELLMAN_PRIVKEY := '0123456789ABCDEF'O}
	modulepar octetstring PX_IKE_DIFFIEHELLMAN_PRIVKEY := '0123456789ABCDEF'O;


	/*
	/*
	 * @desc Are security parameters configured manually or is IKE used to negotiate security parameters?
	 * @desc Are security parameters configured manually or is IKE used to negotiate security parameters?
	*/
	*/
	modulepar {IpSecControl PX_IPSEC_CONTROL := e_useIKEforSecParamsSetup }
	modulepar IpSecControl PX_IPSEC_CONTROL := e_useIKEforSecParamsSetup;


	/*
	/*
	 * @desc Which pre-shared secret shall be used for calculating the AUTH value?
	 * @desc Which pre-shared secret shall be used for calculating the AUTH value?
    */
    */
	modulepar {octetstring PX_PRE_SHARED_KEY := '0123456789ABCDEF'O}
	modulepar octetstring PX_PRE_SHARED_KEY := '0123456789ABCDEF'O;


	group UnacceptableSecurityParams {
	group UnacceptableSecurityParams {
	
	
	/*
	/*
	 * @desc Which IKE_SA encryption algorithm is not acceptable for the IUT?
	 * @desc Which IKE_SA encryption algorithm is not acceptable for the IUT?
	*/
	*/
	modulepar {EncryptionAlgo PX_IKE_ENCALGO_UNACCEPTABLE := e_encr_idea}
	modulepar EncryptionAlgo PX_IKE_ENCALGO_UNACCEPTABLE := e_encr_idea;


	/*
	/*
	 * @desc Which IKE_SA pseudo random function is not acceptable for the IUT?
	 * @desc Which IKE_SA pseudo random function is not acceptable for the IUT?
	*/
	*/
	modulepar {PseudoRandomFunction PX_IKE_PSEUDORNDFCT_UNACCEPTABLE := e_prfAes128Xcbc} 
	modulepar PseudoRandomFunction PX_IKE_PSEUDORNDFCT_UNACCEPTABLE := e_prfAes128Xcbc; 


	/*
	/*
	 * @desc Which IKE_SA integrity algorithm is not acceptable for the IUT?
	 * @desc Which IKE_SA integrity algorithm is not acceptable for the IUT?
	*/
	*/
	modulepar {IntegrityAlgo PX_IKE_INTALGO_UNACCEPTABLE := e_auth_aesXcbc_96}
	modulepar IntegrityAlgo PX_IKE_INTALGO_UNACCEPTABLE := e_auth_aesXcbc_96;


	/*
	/*
	 * @desc Which SA encryption algorithm is not acceptable for the IUT?
	 * @desc Which SA encryption algorithm is not acceptable for the IUT?
	*/
	*/
	modulepar { EncryptionAlgo PX_ENCALGO_UNACCEPTABLE := e_encr_idea }
	modulepar EncryptionAlgo PX_ENCALGO_UNACCEPTABLE := e_encr_idea;


	/*
	/*
	 * @desc Which SA integrity algorithm is not acceptable for the IUT?
	 * @desc Which SA integrity algorithm is not acceptable for the IUT?
	*/
	*/
	modulepar { IntegrityAlgo PX_INTALGO_UNACCEPTABLE := e_auth_kpdkMd5 }
	modulepar IntegrityAlgo PX_INTALGO_UNACCEPTABLE := e_auth_kpdkMd5;


	} // end group UnacceptableSecurityParams {
	} // end group UnacceptableSecurityParams {


@@ -141,12 +136,12 @@ group ikeUdpPorts {
	/*
	/*
	 * @desc UDP Port used by IUT for IKE exchanges
	 * @desc UDP Port used by IUT for IKE exchanges
	*/	
	*/	
	modulepar {UInt16 PX_UDP_PORT_IUT_1 := 500}
	modulepar UInt16 PX_UDP_PORT_IUT_1 := 500;


	/*
	/*
	 * @desc UDP Port used by HS02 for IKE exchanges
	 * @desc UDP Port used by HS02 for IKE exchanges
	*/	
	*/	
	modulepar {UInt16 PX_UDP_PORT_HS02 := 500}
	modulepar UInt16 PX_UDP_PORT_HS02 := 500;
	
	
} // end group ikeUdpPorts
} // end group ikeUdpPorts