Commit 6d9fb7b9 authored by tepelmann's avatar tepelmann
Browse files

SevenSecrets are working now. 

Adapted to new location of IKE enums. Some adaption for codecs.
parent 62b45ae5

ttcn3/EtsiLibrary/LibIpv6/LibCommonRfcs/LibIpv6_Interface_TypesAndValues.ttcn

+6 −1
Original line number Diff line number Diff line
@@ -116,7 +116,8 @@ module LibIpv6_Interface_TypesAndValues { 
			Ipv6Payload			ipv6Payload optional

		}

		with {

			variant "isPDU";

			variant "isPDU;use=com.testingtech.ttcn.tci.codec.helper.*;";

			variant (extHdrList) "fieldPresent=SupportFunctions.isExtensionHeader(valueOf(getTag('nextHeader')));";

		}

	

		//Alias
@@ -1077,6 +1078,10 @@ module LibIpv6_Interface_TypesAndValues { 
				ExtensionHeaderList extHdrList optional,

				Ipv6Payload			ipv6Payload optional

			}

			with {

				variant "use=com.testingtech.ttcn.tci.codec.helper.*;";

				variant (extHdrList) "fieldPresent=SupportFunctions.isExtensionHeader(valueOf(getTag('nextHeader')));";

			}



			const octetstring c_wrongIcv := '8A8B8C'O;

ttcn3/EtsiLibrary/LibIpv6/LibSec/LibIpv6_Rfc4306Ikev2_TypesAndValues.ttcn

+18 −8
Original line number Diff line number Diff line
@@ -242,11 +242,11 @@ 
						UInt8						transformType,

						UInt8						reserved2,

						TransformId					transformId,

						SaTransformAttributeList	saTransformAttributeList

						SaTransformAttributeList	saTransformAttributeList optional

					} 

					with {

						variant (transformLength) "intTag='transformLength';";

						variant (transformType) "intTag='transformLength',getIntTag('transformLength')-8;";

						variant (transformType) "intTag='transformLength',getIntTag('transformLength')-8;tag='transformType'";

						variant (saTransformAttributeList) "fieldPresent=getIntTag('transformLength')>0;";

					}
@@ -316,6 +316,13 @@ 
					DiffieHellmanGroup      diffieHellman,

					ExtentedSequenceNumbers extentedSequenceNumbers

				}

				with {

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

					variant (pseudoRandomFunctions) "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);";

				}



				group IkeRfc4306EncrAlgorithms {
@@ -335,7 +342,7 @@ 
						e_encrAlgoAesCtr(13)

					}

					with {

						variant "use=com.testingtech.ttcn.tci.LibIpv6_Interface_TypesAndValues.*;";

						variant "use=com.testingtech.ttcn.tci.LibIpv6_Rfc4306Ikev2_TypesAndValues.*;length=16;";

					}

				} // end group IkeRfc4306EncrAlgorithms
@@ -349,7 +356,7 @@ 
						e_prfAes128Xcbc(4)

					}

					with {

						variant "use=com.testingtech.ttcn.tci.LibIpv6_Interface_TypesAndValues.*;";

						variant "use=com.testingtech.ttcn.tci.LibIpv6_Rfc4306Ikev2_TypesAndValues.*;length=16;";

					}

			} // end group IkeRfc4306PseudoRandomFunctions
@@ -364,7 +371,7 @@ 
						e_integAlgoAesXcbc96(5)

					}

					with {

						variant "use=com.testingtech.ttcn.tci.LibIpv6_Interface_TypesAndValues.*;";

						variant "use=com.testingtech.ttcn.tci.LibIpv6_Rfc4306Ikev2_TypesAndValues.*;length=16;";

					}

			} // end group IkeRfc4306IntegAlgorithms
@@ -382,7 +389,7 @@ 
						e_group18ModP8192Bit(18)

					}

					with {

						variant "use=com.testingtech.ttcn.tci.LibIpv6_Interface_TypesAndValues.*;";

						variant "use=com.testingtech.ttcn.tci.LibIpv6_Rfc4306Ikev2_TypesAndValues.*;length=16;";

					}

			} // end group IkeRfc4306DiffieHellman
@@ -391,6 +398,9 @@ 
						e_extentedSequenceNumbersNo(0),

						e_extentedSequenceNumbersYes(1)

					}

					with {

						variant "use=com.testingtech.ttcn.tci.LibIpv6_Rfc4306Ikev2_TypesAndValues.*;length=16;";

					}

			} // end group IkeRfc4306ExtentedSequenceNumbers

		} // end group IkeRfc4306SaTransformIDs

		} // end group IkeRfc4306SecurityAssociationPayload
@@ -756,7 +766,7 @@ 
				octetstring		integrityChecksumData optional

			} 

			with {

				variant "TODO";

				variant "decode=EncryptedPayloadCodec.decodeEncryptedPayload();encode=EncryptedPayloadCodec.encodeEncryptedPayload();use=com.testingtech.ttcn.tci.codec.ike.*";

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

			}