Commit 7c2e9a8f authored by berge's avatar berge
Browse files

Changed types (again...): moved LengthE in Command*

parent 297d0e42

ePassport/ttcn/ePassport_Types.ttcn

+31 −21
Original line number Diff line number Diff line
@@ -43,6 +43,14 @@ module ePassport_Types { 


	}//end enumeratedTypes



	group simuParamsGroup {

		

		type set of Chr ChrList;



		type charstring Chr;

		

	} // end simuParamsGroup



	// Group for EF file definition and Test file Configuration

	group filesGroup {
@@ -74,7 +82,8 @@ module ePassport_Types { 
				Instruction ins,

				GenericParams params,

				LengthC lengthC optional, 

				GenericPayload payload

				GenericPayload payload,

				LengthE lengthE optional

			} with {variant "isPdu;"};



			type record CommandManageSecurityEnvironment {
@@ -82,7 +91,8 @@ module ePassport_Types { 
				Instruction ins(e_manageSecurityEnvironment),

				ManageSecurityEnvironmentParams params,

				LengthC lengthC optional, 

				ManageSecurityEnvironmentPayload payload optional // presence depends on crtTag (present if 0xa4, 0xa6, 0xaa, 0xb4, 0xb6, 0xb8)

				ManageSecurityEnvironmentPayload payload optional, // presence depends on crtTag (present if 0xa4, 0xa6, 0xaa, 0xb4, 0xb6, 0xb8)

				LengthE lengthE optional

			} with {

				variant "isPdu;present=bits(5,8,0x22);"

				variant (payload)
@@ -100,7 +110,8 @@ module ePassport_Types { 
				Instruction ins(e_externalOrMutualAuthenticate),

				ExternalOrMutualAuthenticateParams params,

				LengthC lengthC optional, 

				ExternalOrMutualAuthenticatePayload payload

				ExternalOrMutualAuthenticatePayload payload,

				LengthE lengthE optional

			} with {variant "isPdu;present=bits(5,8,0x82);"};



			type record CommandGetChallenge {
@@ -108,7 +119,8 @@ module ePassport_Types { 
				Instruction ins(e_getChallenge),

				GetChallengeParams params,

				LengthC lengthC optional, 

				GetChallengePayload payload

				GetChallengePayload payload,

				LengthE lengthE optional

			} with {variant "isPdu;present=bits(5,8,0x84);"};



			type record CommandInternalAuthenticate {
@@ -116,7 +128,8 @@ module ePassport_Types { 
				Instruction ins(e_internalAuthenticate),

				InternalAuthenticateParams params,

				LengthC lengthC optional, 

				InternalAuthenticatePayload payload

				InternalAuthenticatePayload payload,

				LengthE lengthE optional

			} with {variant "isPdu;present=bits(5,8,0x88);"};



			type record CommandSelect {
@@ -124,7 +137,8 @@ module ePassport_Types { 
				Instruction ins(e_select),

				SelectParams params,

				LengthC lengthC optional, 

				SelectPayload payload

				SelectPayload payload,

				LengthE lengthE optional

			} with {variant "isPdu;present=bits(5,8,0xA4);"};



			type record CommandReadBinary {
@@ -132,7 +146,8 @@ module ePassport_Types { 
				Instruction	ins(e_readBinary),

				ReadBinaryParams params,

				LengthC lengthC optional, 

				ReadBinaryPayload payload

				ReadBinaryPayload payload,

				LengthE lengthE optional

			} with {variant "isPdu;present=bits(5,8,0xB0);"};



			type record CommandReadBinaryWithOffsetDataObject {
@@ -140,7 +155,8 @@ module ePassport_Types { 
				Instruction	ins(e_readBinaryWithOffsetDataObject),

				ReadBinaryWithOffsetDataObjectParams params,

				LengthC lengthC optional, 

				ReadBinaryWithOffsetDataObjectPayload payload

				ReadBinaryWithOffsetDataObjectPayload payload,

				LengthE lengthE optional

			} with {

				variant "isPdu;present=bits(5,8,0xB1);"

				variant (lengthC) "intTag='lengthC'"
@@ -366,8 +382,7 @@ module ePassport_Types { 
				}



				type record GenericData {

					octetstring data optional,

					LengthE lengthE optional

					octetstring data optional

				}



			} // end GenericMsg
@@ -407,7 +422,8 @@ module ePassport_Types { 
				} with {variant "length=2;unsigned;"}



				type union SelectPayload {

					SelectData selectData, RawPayload rawPayload

					SelectData selectData, 

					RawPayload rawPayload

				} with {

					variant

					"use=com.testingtech.ttcn.tci.helper.EPassportCodecHelper;"
@@ -416,8 +432,7 @@ module ePassport_Types { 
				}



				type record SelectData {

					octetstring	fileId,

					LengthE	lengthE optional

					octetstring	fileId

				}



			} // end SelectMsg
@@ -460,7 +475,6 @@ module ePassport_Types { 
				}



				type record ReadBinaryData {

					LengthE	lengthE

				}



			} // end ReadBinaryMsg
@@ -482,8 +496,7 @@ module ePassport_Types { 
				}



				type record ReadBinaryWithOffsetDataObjectData {

					octetstring data, // FIXME: unfinished; maybe more variants are to be used later

					LengthE	lengthE

					octetstring data // FIXME: unfinished; maybe more variants are to be used later

				} with {

					variant (data) "length=getIntTag('lengthC');unsigned;"

				}
@@ -508,7 +521,6 @@ module ePassport_Types { 
				}



				type record GetChallengeData {

					LengthE	lengthE

				}



			} // end GetChallengeMsg
@@ -542,8 +554,7 @@ module ePassport_Types { 
				}



				type record ExternalOrMutualAuthenticateData {

					octetstring challengeResponse,

					LengthE	lengthE

					octetstring challengeResponse

				}



			} // end ExternalOrMutualAuthenticateMsg
@@ -566,8 +577,7 @@ module ePassport_Types { 
				}



				type record InternalAuthenticateData {

					octetstring challenge,

					LengthE	lengthE

					octetstring challenge

				}



			} // end InternalAuthenticateMsg