Commit cbf6e08f authored by tepelmann's avatar tepelmann
Browse files

Newly generated codec due to new optionality. 

Corrected variant tags.
parent 715e43ee

ttcn3/EtsiLibrary/LibIpv6/LibSec/LibIpv6_Rfc4306Ikev2_TypesAndValues.ttcn

+29 −26
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ 
			variant "present=SupportFunctions.isIKEmsg(dec);use=com.testingtech.ttcn.tci.codec.helper.*;";

			variant (sourcePort) "intTag='sourcePortIKE'";

			variant (destPort) "intTag='destPortIKE'";

			variant (padding) "fieldPresent=(getIntTag('sourcePortIKE') == 4500) && (getIntTag('destPortIKE') == 4500)";

			variant (padding) "fieldPresent=(getIntTag('sourcePortIKE') == 4500) && (getIntTag('destPortIKE') == 4500);mark";

		}



		type record Ikev2Header {
@@ -193,22 +193,22 @@ 
			ExtensibleAuthPayload 		extensibleAuth

		} 

		with {

			variant (securityAssociation) "present=(valueOf(getTag('nextPayload')) == 33);";

			variant (keyExchange) "present=(valueOf(getTag('nextPayload')) == 34);";

			variant (idInitiator) "present=(valueOf(getTag('nextPayload')) == 35);";

			variant (idResponder) "present=(valueOf(getTag('nextPayload')) == 36);";

			variant (certificate) "present=(valueOf(getTag('nextPayload')) == 37);";

			variant (certificateRequest) "present=(valueOf(getTag('nextPayload')) == 38);";

			variant (authentication) "present=(valueOf(getTag('nextPayload')) == 39);";

			variant (nonce) "present=(valueOf(getTag('nextPayload')) == 40);";

			variant (notify) "present=(valueOf(getTag('nextPayload')) == 41);";

			variant (delete) "present=(valueOf(getTag('nextPayload')) == 42);";

			variant (vendorId) "present=(valueOf(getTag('nextPayload')) == 43);";

			variant (tsInitiator) "present=(valueOf(getTag('nextPayload')) == 44);";

			variant (tsResponder) "present=(valueOf(getTag('nextPayload')) == 45);";

			variant (encrypted) "present=(valueOf(getTag('nextPayload')) == 46);";

			variant (configuration) "present=(valueOf(getTag('nextPayload')) == 47);";

			variant (extensibleAuth) "present=(valueOf(getTag('nextPayload')) == 48);";

			variant (securityAssociation) "fieldPresent=(valueOf(getTag('nextPayload')) == 33);";

			variant (keyExchange) "fieldPresent=(valueOf(getTag('nextPayload')) == 34);";

			variant (idInitiator) "fieldPresent=(valueOf(getTag('nextPayload')) == 35);";

			variant (idResponder) "fieldPresent=(valueOf(getTag('nextPayload')) == 36);";

			variant (certificate) "fieldPresent=(valueOf(getTag('nextPayload')) == 37);";

			variant (certificateRequest) "fieldPresent=(valueOf(getTag('nextPayload')) == 38);";

			variant (authentication) "fieldPresent=(valueOf(getTag('nextPayload')) == 39);";

			variant (nonce) "fieldPresent=(valueOf(getTag('nextPayload')) == 40);";

			variant (notify) "fieldPresent=(valueOf(getTag('nextPayload')) == 41);";

			variant (delete) "fieldPresent=(valueOf(getTag('nextPayload')) == 42);";

			variant (vendorId) "fieldPresent=(valueOf(getTag('nextPayload')) == 43);";

			variant (tsInitiator) "fieldPresent=(valueOf(getTag('nextPayload')) == 44);";

			variant (tsResponder) "fieldPresent=(valueOf(getTag('nextPayload')) == 45);";

			variant (encrypted) "fieldPresent=(valueOf(getTag('nextPayload')) == 46);";

			variant (configuration) "fieldPresent=(valueOf(getTag('nextPayload')) == 47);";

			variant (extensibleAuth) "fieldPresent=(valueOf(getTag('nextPayload')) == 48);";

		}



		const UInt8 c_maxIkePayloads  := 10; //FIXME
@@ -321,7 +321,7 @@ 
						} 

						with {

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

							variant (keyLength) "present=bytes(2,0x800E);";

							variant (keyLength) "fieldPresent=bytes(2,0x800E);";

						}



						const UInt8 c_maxIkeSaTransformAttributes  := 10; //FIXME
@@ -365,11 +365,11 @@ 
					ExtentedSequenceNumbers extentedSequenceNumbers

				}

				with {

					variant (encryptionAlgo) "present=(valueOf(getTag('transformType')) == 1);";

					variant (pseudoRandomFunction) "present=(valueOf(getTag('transformType')) == 2);";

					variant (integAlgorithms) "present=(valueOf(getTag('transformType')) == 3);";

					variant (diffieHellman) "present=(valueOf(getTag('transformType')) == 4);";

					variant (extentedSequenceNumbers) "present=(valueOf(getTag('transformType')) == 5);";

					variant (encryptionAlgo) "fieldPresent=(valueOf(getTag('transformType')) == 1);";

					variant (pseudoRandomFunction) "fieldPresent=(valueOf(getTag('transformType')) == 2);";

					variant (integAlgorithms) "fieldPresent=(valueOf(getTag('transformType')) == 3);";

					variant (diffieHellman) "fieldPresent=(valueOf(getTag('transformType')) == 4);";

					variant (extentedSequenceNumbers) "fieldPresent=(valueOf(getTag('transformType')) == 5);";

				}



				group IkeRfc4306EncrAlgorithms {
@@ -773,8 +773,8 @@ 
					TsIpv6TrafficSelector	tsIpv6TrafficSelector

				} 

				with {

					variant (tsIpv4TrafficSelector) "present=bytes(1, 0x07)";

					variant (tsIpv6TrafficSelector) "present=bytes(1, 0x08)";

					variant (tsIpv4TrafficSelector) "fieldPresent=bytes(1, 0x07)";

					variant (tsIpv6TrafficSelector) "fieldPresent=bytes(1, 0x08)";

				}



				const UInt8 c_maxTrafficSelectors  := 10; //FIXME
@@ -871,7 +871,7 @@ 
			} 

			with {

				variant (nextPayload) "tag='nextPayload';";

				variant (payloadLength) "intTag='payloadLengthConf'-8;";

				variant (payloadLength) "intTag='payloadLengthConf',value-8;";

			}	



			group IkeRfc4306ConfigAttribute {
@@ -1069,6 +1069,9 @@ 
			octetstring encKeyResponder,

			octetstring intKeyResponder

		}

		with {

			variant "noCodec";

		}



	group ikeSecurity

	{