Misc changes (56c4c151) · Commits · TTCN-3 Libraries / LibIPv6

ttcn3/EtsiLibrary/LibIpv6/LibSec/LibIpv6_Rfc4306Ikev2_Functions.ttcn

+1 −1

Original line number	Diff line number	Diff line
		@@ -373,7 +373,7 @@ module LibIpv6_Rfc4306Ikev2_Functions {
		v_ret := f_getPayload(v_ikePayloadList,v_nextPayload,c_keyExchange,v_ikePayload);
		if (v_ret == e_success)
		{ v_keyExchangeData := v_ikePayload.keyExchange.data;
		v_dhGroup := v_ikePayload.keyExchange.dhGroup; }
		vc_ikeSad[0].diffieHellmanGroup := v_ikePayload.keyExchange.dhGroup; }
		else
		{ log("** f_waitForIkeSaInitreq: ERROR: No Key Exchange payload in payload list ** ") }

ttcn3/EtsiLibrary/LibIpv6/LibSec/LibIpv6_Rfc4306Ikev2_Templates.ttcn

+1 −1

Original line number	Diff line number	Diff line
		@@ -215,7 +215,7 @@ group ikeKeyExchangePayloadTemplates {
		};

		template KeyExchangePayload m_keyExchangePL (UInt8 p_nextPayload,
		UInt16 p_dhGroup,
		DiffieHellmanGroup p_dhGroup,
		octetstring p_data) := {

		nextPayload := p_nextPayload,

ttcn3/EtsiLibrary/LibIpv6/LibSec/LibIpv6_Rfc4306Ikev2_TypesAndValues.ttcn

+96 −48

Original line number	Diff line number	Diff line
		@@ -12,8 +12,6 @@
		import from LibCommon_BasicTypesAndValues all;
		import from LibCommon_DataStrings all;
		//LibIpv6
		// import from LibIpv6_Rfc2460Root_TypesAndValues all;
		// import from LibIpv6_MultiRfcs_TypesAndValues all ;
		import from LibIpv6_CommonRfcs_TypesAndValues all;

		group IkeRfc4306CommonConstants {
		@@ -24,36 +22,6 @@
		const UInt8 c_protocolEsp := 3;
		} // end group IkeRfc4306ProtocolsIds

		group IkeRfc4306EncrAlgorithms {
		const UInt8 c_encrAlgoDesIv64 := 1;
		const UInt8 c_encrAlgoDes := 2;
		const UInt8 c_encrAlgo3Des := 3;
		const UInt8 c_encrAlgoRc5 := 4;
		const UInt8 c_encrAlgoIdea := 5;
		const UInt8 c_encrAlgoCast := 6;
		const UInt8 c_encrAlgoBlowfish := 7;
		const UInt8 c_encrAlgo3Idea := 8;
		const UInt8 c_encrAlgoDesIv32 := 9;
		const UInt8 c_encrAlgoNull := 11;
		const UInt8 c_encrAlgoAesCbc := 12;
		const UInt8 c_encrAlgoAesCtr := 13;
		} // end group IkeRfc4306EncrAlgorithms

		group IkeRfc4306PseudoRandomFunctions {
		const UInt8 c_prfHmacMd5 := 1;
		const UInt8 c_prfHmacSha1 := 2;
		const UInt8 c_prfHmacTiger := 3;
		const UInt8 c_prfAes128Xcbc := 4;
		} // end group IkeRfc4306PseudoRandomFunctions

		group IkeRfc4306IntegAlgorithms {
		const UInt8 c_integAlgoHmacMd596 := 1;
		const UInt8 c_integAlgoHmacSha196 := 2;
		const UInt8 c_integAlgoDesMac := 3;
		const UInt8 c_integAlgoKpdkMd5 := 4;
		const UInt8 c_integAlgoAesXcbc96 := 5;
		} // end group IkeRfc4306IntegAlgorithms

		group IkeRfc4306CertEncodings {
		const UInt8 c_certEncodingPkcs7wrappedX509Certificate := 1;
		const UInt8 c_certEncodingPgpCertificate := 2;
		@@ -273,8 +241,8 @@
		UInt16 transformLength,
		UInt8 transformType,
		UInt8 reserved2,
		UInt16 transformId,
		SaTransformAttributeList saTransformAttributeList optional
		TransformId transformId,
		SaTransformAttributeList saTransformAttributeList
		}
		with {
		variant (transformLength) "intTag='transformLength';";
		@@ -282,12 +250,6 @@
		variant (saTransformAttributeList) "fieldPresent=getIntTag('transformLength')>0;";
		}

		group IkeRfc4306ExtentedSequenceNumbers {
		const UInt8 c_extentedSequenceNumbersNo := 0;
		const UInt8 c_extentedSequenceNumbersYes := 1;
		} // end group IkeRfc4306ExtentedSequenceNumbers


		const UInt8 c_maxIkeSaTransforms := 10; //FIXME

		/*
		@@ -345,6 +307,92 @@

		} // end group IkeRfc4306SaProposal

		group IkeRfc4306SaTransformIDs {
		type union TransformId
		{
		IkeEncryptionAlgo ikeEncryptionAlgo,
		IkePseudoRandomFunction pseudoRandomFunctions,
		IkeIntegrityAlgo integAlgorithms,
		DiffieHellmanGroup diffieHellman,
		ExtentedSequenceNumbers extentedSequenceNumbers
		}

		group IkeRfc4306EncrAlgorithms {

		type enumerated IkeEncryptionAlgo {
		e_reserved(0),
		e_encrAlgoDesIv64(1),
		e_encrAlgoDes(2),
		e_encrAlgo3Des(3),
		e_encrAlgoRc5(4),
		e_encrAlgoIdea(5),
		e_encrAlgoCast(6),
		e_encrAlgoBlowfish(7),
		e_encrAlgo3Idea(8),
		e_encrAlgoDesIv32(9),
		e_encrAlgoNull(11),
		e_encrAlgoAesCbc(12),
		e_encrAlgoAesCtr(13)
		}
		with {
		variant "use=com.testingtech.ttcn.tci.LibIpv6_Interface_TypesAndValues.*;";
		}
		} // end group IkeRfc4306EncrAlgorithms

		group IkeRfc4306PseudoRandomFunctions {

		type enumerated IkePseudoRandomFunction {
		e_reserved(0),
		e_prfHmacMd5(1),
		e_prfHmacSha1(2),
		e_prfHmacTiger(3),
		e_prfAes128Xcbc(4)
		}
		with {
		variant "use=com.testingtech.ttcn.tci.LibIpv6_Interface_TypesAndValues.*;";
		}
		} // end group IkeRfc4306PseudoRandomFunctions

		group IkeRfc4306IntegAlgorithms {

		type enumerated IkeIntegrityAlgo {
		e_none(0),
		e_integAlgoHmacMd596(1),
		e_integAlgoHmacSha196(2),
		e_integAlgoDesMac(3),
		e_integAlgoKpdkMd5(4),
		e_integAlgoAesXcbc96(5)
		}
		with {
		variant "use=com.testingtech.ttcn.tci.LibIpv6_Interface_TypesAndValues.*;";
		}
		} // end group IkeRfc4306IntegAlgorithms

		group IkeRfc4306DiffieHellman {

		type enumerated DiffieHellmanGroup {
		e_none(0),
		e_group1ModP768Bit(1),
		e_group2ModP1024Bit(2),
		e_group5ModP1536Bit(5),
		e_group14ModP2048Bit(14),
		e_group15ModP3072Bit(15),
		e_group16ModP4096Bit(16),
		e_group17ModP6144Bit(17),
		e_group18ModP8192Bit(18)
		}
		with {
		variant "use=com.testingtech.ttcn.tci.LibIpv6_Interface_TypesAndValues.*;";
		}
		} // end group IkeRfc4306DiffieHellman

		group IkeRfc4306ExtentedSequenceNumbers {
		type enumerated ExtentedSequenceNumbers {
		e_extentedSequenceNumbersNo(0),
		e_extentedSequenceNumbersYes(1)
		}
		} // end group IkeRfc4306ExtentedSequenceNumbers
		} // end group IkeRfc4306SaTransformIDs
		} // end group IkeRfc4306SecurityAssociationPayload


		@@ -358,7 +406,7 @@
		UInt1 criticalFlag,
		UInt7 reserved1,
		UInt16 payloadLength,
		UInt16 dhGroup,
		DiffieHellmanGroup dhGroup,
		UInt16 reserved2,
		octetstring data
		}