Commit ab09e288 authored by schmitting's avatar schmitting
Browse files

template removed from function call

parent 14167028

ttcn3/EtsiLibrary/LibIpv6/LibCommonRfcs/LibIpv6_CommonRfcs_Functions.ttcn

+3 −3
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ group ipSecFns { 
	}



	//in units of octets

	function f_getIntegrKeyLen( in IntegrityAlgo p_integrityAlgo, out template UInt8 p_keyLen)

	function f_getIntegrKeyLen( in IntegrityAlgo p_integrityAlgo, out UInt8 p_keyLen)

	return FncRetCode {



		if(p_integrityAlgo == e_auth_hmacMd5_96){
@@ -394,7 +394,7 @@ group ipSecFns { 
	}//end function f_getIntegrKeyLen



	//in units of octets

	function f_getPrfKeyLen( in PseudoRandomFunction p_pseudoRandomFunction, out template UInt8 p_keyLen)

	function f_getPrfKeyLen( in PseudoRandomFunction p_pseudoRandomFunction, out UInt8 p_keyLen)

	return FncRetCode {



		if(p_pseudoRandomFunction == e_prfHmacMd5){
@@ -488,7 +488,7 @@ group ipSecFns { 
	}



	//in units of octets

	function f_getEncrKeyLen( in EncryptionAlgo p_encryptionAlgo, out template UInt8 p_keyLen)

	function f_getEncrKeyLen( in EncryptionAlgo p_encryptionAlgo, out UInt8 p_keyLen)

	return FncRetCode {



		if(p_encryptionAlgo == e_encr_desIv64){

ttcn3/EtsiLibrary/LibIpv6/LibSec/LibIpv6_Rfc4306Ikev2_Functions.ttcn

+6 −5
Original line number Diff line number Diff line
@@ -753,10 +753,11 @@ module LibIpv6_Rfc4306Ikev2_Functions { 
					{ if (vc_ikeSad[0].diffieHellmanGroup != v_ikePayload.keyExchange.dhGroup)

						{ v_ret := e_error;

						  log("**** f_waitForIkeSaInitRsp: ERROR: Key Exchange payload indicates wrong Diffie-Hellman group **** "); }

						// calculate shared Diffie-Hellman secret

					  else

						{ // calculate shared Diffie-Hellman secret

						  vc_ikeSad[0].diffieHellmanSharedSecret := fx_dHSharedSecret(vc_ikeSad[0].diffieHellmanGroup,

																					  PX_IKE_DIFFIEHELLMAN_PRIVKEY,

																					v_ikePayload.keyExchange.data);					

																					  v_ikePayload.keyExchange.data);}				

					}

					else

					{ log("**** f_waitForIkeSaInitRsp: ERROR: No Key Exchange payload in payload list **** ");