Commit 6f139176 authored by fetke's avatar fetke
Browse files

fixed typo in keyword for codec generator (isPDU)

parent 7a516dbe

ePassport/ttcn/ePassport_Types.ttcn

+84 −84
Original line number Diff line number Diff line
@@ -97,8 +97,8 @@ module ePassport_Types { 
				GenericPayload payload,

				LengthE lengthE optional

			} with {

				variant "isPdu"

				variant (lengthC) "intTag='lengthC'"

				variant "isPDU";

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

			}



			type record CommandManageSecurityEnvironment {
@@ -111,8 +111,8 @@ module ePassport_Types { 
				//     (present if 0xa4, 0xa6, 0xaa, 0xb4, 0xb6, 0xb8)

				LengthE lengthE optional

			} with {

				variant "isPdu;present=bytes(1,1,0x22);"

				variant (lengthC)	"intTag='lengthC'"

				variant "isPDU;present=bytes(1,1,0x22);";

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

				variant (payload)	"fieldPresent="

									"getIntTag('crtTag')==0xa4||"

									"getIntTag('crtTag')==0xa6||"
@@ -130,8 +130,8 @@ module ePassport_Types { 
				ExternalOrMutualAuthenticatePayload payload,

				LengthE lengthE optional

			} with {

				variant "isPdu;present=bytes(1,1,0x82);"

				variant (lengthC) "intTag='lengthC'"

				variant "isPDU;present=bytes(1,1,0x82);";

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

			}



			type record CommandGetChallenge {
@@ -142,8 +142,8 @@ module ePassport_Types { 
				GetChallengePayload payload,

				LengthE lengthE optional

			} with {

				variant "isPdu;present=bytes(1,1,0x84);"

				variant (lengthC) "intTag='lengthC'"

				variant "isPDU;present=bytes(1,1,0x84);";

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

			}



			type record CommandInternalAuthenticate {
@@ -154,8 +154,8 @@ module ePassport_Types { 
				InternalAuthenticatePayload payload,

				LengthE lengthE optional

			} with {

				variant "isPdu;present=bytes(1,1,0x88);"

				variant (lengthC) "intTag='lengthC'"

				variant "isPDU;present=bytes(1,1,0x88);";

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

			};



			type record CommandSelect {
@@ -166,8 +166,8 @@ module ePassport_Types { 
				SelectPayload payload,

				LengthE lengthE optional

			} with {

				variant "isPdu;present=bytes(1,1,0xA4);"

				variant (lengthC) "intTag='lengthC'"

				variant "isPDU;present=bytes(1,1,0xA4);";

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

			};



			type record CommandReadBinary {
@@ -178,8 +178,8 @@ module ePassport_Types { 
				ReadBinaryPayload payload,

				LengthE lengthE optional

			} with {

				variant "isPdu;present=bytes(1,1,0xB0);"

				variant (lengthC) "intTag='lengthC'"

				variant "isPDU;present=bytes(1,1,0xB0);";

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

			};



			type record CommandReadBinaryWithOffsetDataObject {
@@ -190,74 +190,74 @@ module ePassport_Types { 
				ReadBinaryWithOffsetDataObjectPayload payload,

				LengthE lengthE optional

			} with {

				variant "isPdu;present=bytes(1,1,0xB1)"

				variant (lengthC) "intTag='lengthC'"

				variant "isPDU;present=bytes(1,1,0xB1)";

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

			}



			type CommandGeneric CommandDeactivateFile

				with {variant "isPdu;present=bytes(1,1,0x04);"};

				with {variant "isPDU;present=bytes(1,1,0x04);"};

			type CommandGeneric CommandEraseRecords

				with {variant "isPdu;present=bytes(1,1,0x0C);"};

				with {variant "isPDU;present=bytes(1,1,0x0C);"};

			type CommandGeneric CommandEraseBinary

				with {variant "isPdu;present=bytes(1,1,0x0E)||bytes(1,1,0x0F);"};

				with {variant "isPDU;present=bytes(1,1,0x0E)||bytes(1,1,0x0F);"};

			type CommandGeneric CommandPerformScqlOperation

				with {variant "isPdu;present=bytes(1,1,0x10);"};

				with {variant "isPDU;present=bytes(1,1,0x10);"};

			type CommandGeneric CommandPerformTransactionOperation

				with {variant "isPdu;present=bytes(1,1,0x12);"};

				with {variant "isPDU;present=bytes(1,1,0x12);"};

			type CommandGeneric CommandPerformUserOperation

				with {variant "isPdu;present=bytes(1,1,0x14);"};

				with {variant "isPDU;present=bytes(1,1,0x14);"};

			type CommandGeneric CommandVerify

				with {variant "isPdu;present=bytes(1,1,0x20)||bytes(1,1,0x21);"};

				with {variant "isPDU;present=bytes(1,1,0x20)||bytes(1,1,0x21);"};

			type CommandGeneric CommandChangeReferenceData

				with {variant "isPdu;present=bytes(1,1,0x24);"};

				with {variant "isPDU;present=bytes(1,1,0x24);"};

			type CommandGeneric CommandDisableVerificationRequirement

				with {variant "isPdu;present=bytes(1,1,0x26);"};

				with {variant "isPDU;present=bytes(1,1,0x26);"};

			type CommandGeneric CommandEnableVerificationRequirement

				with {variant "isPdu;present=bytes(1,1,0x28);"};

				with {variant "isPDU;present=bytes(1,1,0x28);"};

			type CommandGeneric CommandPerformSecurityOperation

				with {variant "isPdu;present=bytes(1,1,0x2A);"};

				with {variant "isPDU;present=bytes(1,1,0x2A);"};

			type CommandGeneric CommandResetRetryCounter

				with {variant "isPdu;present=bytes(1,1,0x2C);"};

				with {variant "isPDU;present=bytes(1,1,0x2C);"};

			type CommandGeneric CommandActivateFile

				with {variant "isPdu;present=bytes(1,1,0x44);"};

				with {variant "isPDU;present=bytes(1,1,0x44);"};

			type CommandGeneric CommandGenerateAsymmetricKeyPair

				with {variant "isPdu;present=bytes(1,1,0x46);"};

				with {variant "isPDU;present=bytes(1,1,0x46);"};

			type CommandGeneric CommandManageChannel

				with {variant "isPdu;present=bytes(1,1,0x70);"};

				with {variant "isPDU;present=bytes(1,1,0x70);"};

			type CommandGeneric CommandGeneralAuthenticate

				with {variant "isPdu;present=bytes(1,1,0x87);"};

				with {variant "isPDU;present=bytes(1,1,0x87);"};

			type CommandGeneric CommandSearchBinary

				with {variant "isPdu;present=bytes(1,1,0xA0)||bytes(1,1,0xA1);"};

				with {variant "isPDU;present=bytes(1,1,0xA0)||bytes(1,1,0xA1);"};

			type CommandGeneric CommandSearchRecord

				with {variant "isPdu;present=bytes(1,1,0xA2);"};

				with {variant "isPDU;present=bytes(1,1,0xA2);"};

			type CommandGeneric CommandReadRecords

				with {variant "isPdu;present=bytes(1,1,0xB2)||bytes(1,1,0xB3);"};

				with {variant "isPDU;present=bytes(1,1,0xB2)||bytes(1,1,0xB3);"};

			type CommandGeneric CommandGetResponse

				with {variant "isPdu;present=bytes(1,1,0xC0);"};

				with {variant "isPDU;present=bytes(1,1,0xC0);"};

			type CommandGeneric CommandEnvelope

				with {variant "isPdu;present=bytes(1,1,0xC2)||bytes(1,1,0xC3);"};

				with {variant "isPDU;present=bytes(1,1,0xC2)||bytes(1,1,0xC3);"};

			type CommandGeneric CommandGetData

				with {variant "isPdu;present=bytes(1,1,0xCA);"};

				with {variant "isPDU;present=bytes(1,1,0xCA);"};

			type CommandGeneric CommandWriteBinary

				with {variant "isPdu;present=bytes(1,1,0xD0)||bytes(1,1,0xD1);"};

				with {variant "isPDU;present=bytes(1,1,0xD0)||bytes(1,1,0xD1);"};

			type CommandGeneric CommandWriteRecord

				with {variant "isPdu;present=bytes(1,1,0xD2);"};

				with {variant "isPDU;present=bytes(1,1,0xD2);"};

			type CommandGeneric CommandUpdateBinary

				with {variant "isPdu;present=bytes(1,1,0xD6)||bytes(1,1,0xD7);"};

				with {variant "isPDU;present=bytes(1,1,0xD6)||bytes(1,1,0xD7);"};

			type CommandGeneric CommandPutDataWith

				with {variant "isPdu;present=bytes(1,1,0xDA)||bytes(1,1,0xDB);"};

				with {variant "isPDU;present=bytes(1,1,0xDA)||bytes(1,1,0xDB);"};

			type CommandGeneric CommandUpdateRecord

				with {variant "isPdu;present=bytes(1,1,0xDC)||bytes(1,1,0xDD);"};

				with {variant "isPDU;present=bytes(1,1,0xDC)||bytes(1,1,0xDD);"};

			type CommandGeneric CommandCreateFile

				with {variant "isPdu;present=bytes(1,1,0xE0);"};

				with {variant "isPDU;present=bytes(1,1,0xE0);"};

			type CommandGeneric CommandAppendRecord

				with {variant "isPdu;present=bytes(1,1,0xE2);"};

				with {variant "isPDU;present=bytes(1,1,0xE2);"};

			type CommandGeneric CommandDeleteFile

				with {variant "isPdu;present=bytes(1,1,0xE4);"};

				with {variant "isPDU;present=bytes(1,1,0xE4);"};

			type CommandGeneric CommandTerminateDF

				with {variant "isPdu;present=bytes(1,1,0xE6)||bytes(1,1,0xE8);"};

				with {variant "isPDU;present=bytes(1,1,0xE6)||bytes(1,1,0xE8);"};

			type CommandGeneric CommandTerminateCardUsage

				with {variant "isPdu;present=bytes(1,1,0xFE);"};

				with {variant "isPDU;present=bytes(1,1,0xFE);"};



			group Header {
@@ -286,7 +286,7 @@ module ePassport_Types { 


				type integer FirstLogicalChannelNumber (0..3)

				with {

					variant "length=2;unsigned;"

					variant "length=2;unsigned;";

				}

				type integer FurtherLogicalChannelNumber (4..19)

				with {
@@ -541,7 +541,7 @@ module ePassport_Types { 
				type record ReadBinaryWithOffsetDataObjectData {

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

				} with {

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

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

				}



			} // end ReadBinaryWithOffsetDataObjectMsg
@@ -639,7 +639,7 @@ module ePassport_Types { 
					MseFunction mseFunction,

					MseCrtTag crtTag

				} with {

					variant (crtTag) "intTag='crtTag'"

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

				}



				type enumerated MseSecureMessagingInCommandDataField {
@@ -859,7 +859,7 @@ module ePassport_Types { 
					TlvLength tlvLength,

					octetstring tlvValue

				} with {

					variant "present=bytes(1,0x80)"

					variant "present=bytes(1,0x80)";

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

					variant (tlvValue)	"length=getIntTag('tlvLength');unsigned;";

				}
@@ -870,7 +870,7 @@ module ePassport_Types { 
					TlvLength tlvLength,

					octetstring tlvValue

				} with {

					variant "present=bytes(1,0x81)"

					variant "present=bytes(1,0x81)";

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

					variant (tlvValue)	"length=getIntTag('tlvLength');unsigned;";

				}
@@ -880,7 +880,7 @@ module ePassport_Types { 
					TlvLength tlvLength,

					octetstring tlvValue

				} with {

					variant "present=bytes(1,0x82)"

					variant "present=bytes(1,0x82)";

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

					variant (tlvValue)	"length=getIntTag('tlvLength');unsigned;";

				}
@@ -890,7 +890,7 @@ module ePassport_Types { 
					TlvLength tlvLength,

					octetstring tlvValue

				} with {

					variant "present=bytes(1,0x83)"

					variant "present=bytes(1,0x83)";

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

					variant (tlvValue)	"length=getIntTag('tlvLength');unsigned;";

				}
@@ -900,7 +900,7 @@ module ePassport_Types { 
					TlvLength tlvLength,

					octetstring tlvValue

				} with {

					variant "present=bytes(1,0x84)"

					variant "present=bytes(1,0x84)";

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

					variant (tlvValue)	"length=getIntTag('tlvLength');unsigned;";

				}
@@ -910,7 +910,7 @@ module ePassport_Types { 
					TlvLength tlvLength,

					octetstring tlvValue

				} with {

					variant "present=bytes(1,0xA3)"

					variant "present=bytes(1,0xA3)";

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

					variant (tlvValue)	"length=getIntTag('tlvLength');unsigned;";

				}
@@ -921,7 +921,7 @@ module ePassport_Types { 
					TlvLength tlvLength,

					octetstring tlvValue

				} with {

					variant "present=bytes(1,0x85)"

					variant "present=bytes(1,0x85)";

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

					variant (tlvValue)	"length=getIntTag('tlvLength');unsigned;";

				}
@@ -931,7 +931,7 @@ module ePassport_Types { 
					TlvLength tlvLength,

					octetstring tlvValue

				} with {

					variant "present=bytes(1,0x86)"

					variant "present=bytes(1,0x86)";

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

					variant (tlvValue)	"length=getIntTag('tlvLength');unsigned;";

				}
@@ -941,7 +941,7 @@ module ePassport_Types { 
					TlvLength tlvLength,

					octetstring tlvValue

				} with {

					variant "present=bytes(1,0x87)&&bytes(1,4,0x00000000)"

					variant "present=bytes(1,0x87)&&bytes(1,4,0x00000000)";

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

					variant (tlvValue)	"length=getIntTag('tlvLength');unsigned;";

				}
@@ -951,7 +951,7 @@ module ePassport_Types { 
					TlvLength tlvLength,

					octetstring tlvValue

				} with {

					variant "present=bytes(1,0x87)&&!bytes(1,4,0x00000000)"

					variant "present=bytes(1,0x87)&&!bytes(1,4,0x00000000)";

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

					variant (tlvValue)	"length=getIntTag('tlvLength');unsigned;";

				}
@@ -962,7 +962,7 @@ module ePassport_Types { 
					TlvLength tlvLength,

					octetstring tlvValue

				} with {

					variant "present=bytes(1,0x88)&&bytes(1,4,0x00000000)"

					variant "present=bytes(1,0x88)&&bytes(1,4,0x00000000)";

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

					variant (tlvValue)	"length=getIntTag('tlvLength');unsigned;";

				}
@@ -972,7 +972,7 @@ module ePassport_Types { 
					TlvLength tlvLength,

					octetstring tlvValue

				} with {

					variant "present=bytes(1,0x88)&&!bytes(1,4,0x00000000)"

					variant "present=bytes(1,0x88)&&!bytes(1,4,0x00000000)";

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

					variant (tlvValue)	"length=getIntTag('tlvLength');unsigned;";

				}
@@ -982,7 +982,7 @@ module ePassport_Types { 
					TlvLength tlvLength,

					octetstring tlvValue

				} with {

					variant "present=bytesRange(0,1,0x89,0x8d)&&bytes(1,4,0x00000000)"

					variant "present=bytesRange(0,1,0x89,0x8d)&&bytes(1,4,0x00000000)";

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

					variant (tlvValue)	"length=getIntTag('tlvLength');unsigned;";

				}
@@ -992,7 +992,7 @@ module ePassport_Types { 
					TlvLength tlvLength,

					octetstring tlvValue

				} with {

					variant "present=bytesRange(0,1,0x89,0x8d)&&!bytes(1,4,0x00000000)"

					variant "present=bytesRange(0,1,0x89,0x8d)&&!bytes(1,4,0x00000000)";

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

					variant (tlvValue)	"length=getIntTag('tlvLength');unsigned;";

				}
@@ -1003,7 +1003,7 @@ module ePassport_Types { 
					octetstring tlvValue

				} with {

					// 0x90 L>0 does not exist; codec behavior in this case is undefined

					variant "present=bytes(1,0x90)&&bytes(1,4,0x00000000)"

					variant "present=bytes(1,0x90)&&bytes(1,4,0x00000000)";

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

					variant (tlvValue)	"length=getIntTag('tlvLength');unsigned;";

				}
@@ -1013,7 +1013,7 @@ module ePassport_Types { 
					TlvLength tlvLength,

					octetstring tlvValue

				} with {

					variant "present=bytes(1,0x91)&&bytes(1,4,0x00000000)"

					variant "present=bytes(1,0x91)&&bytes(1,4,0x00000000)";

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

					variant (tlvValue)	"length=getIntTag('tlvLength');unsigned;";

				}
@@ -1023,7 +1023,7 @@ module ePassport_Types { 
					TlvLength tlvLength,

					octetstring tlvValue

				} with {

					variant "present=bytes(1,0x91)&&!bytes(1,4,0x00000000)"

					variant "present=bytes(1,0x91)&&!bytes(1,4,0x00000000)";

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

					variant (tlvValue)	"length=getIntTag('tlvLength');unsigned;";

				}
@@ -1033,7 +1033,7 @@ module ePassport_Types { 
					TlvLength tlvLength,

					octetstring tlvValue

				} with {

					variant "present=bytes(1,0x92)&&!bytes(1,4,0x00000000)"

					variant "present=bytes(1,0x92)&&!bytes(1,4,0x00000000)";

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

					variant (tlvValue)	"length=getIntTag('tlvLength');unsigned;";

				}
@@ -1043,7 +1043,7 @@ module ePassport_Types { 
					TlvLength tlvLength,

					octetstring tlvValue

				} with {

					variant "present=bytes(1,0x92)&&!bytes(1,4,0x00000000)"

					variant "present=bytes(1,0x92)&&!bytes(1,4,0x00000000)";

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

					variant (tlvValue)	"length=getIntTag('tlvLength');unsigned;";

				}
@@ -1054,7 +1054,7 @@ module ePassport_Types { 
					TlvLength tlvLength,

					octetstring tlvValue

				} with {

					variant "present=bytes(1,0x93)&&bytes(1,4,0x00000000)"

					variant "present=bytes(1,0x93)&&bytes(1,4,0x00000000)";

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

					variant (tlvValue)	"length=getIntTag('tlvLength');unsigned;";

				}
@@ -1064,7 +1064,7 @@ module ePassport_Types { 
					TlvLength tlvLength,

					octetstring tlvValue

				} with {

					variant "present=bytes(1,0x93)&&!bytes(1,4,0x00000000)"

					variant "present=bytes(1,0x93)&&!bytes(1,4,0x00000000)";

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

					variant (tlvValue)	"length=getIntTag('tlvLength');unsigned;";

				}
@@ -1074,7 +1074,7 @@ module ePassport_Types { 
					TlvLength tlvLength,

					octetstring tlvValue

				} with {

					variant "present=bytes(1,0x94)"

					variant "present=bytes(1,0x94)";

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

					variant (tlvValue)	"length=getIntTag('tlvLength');unsigned;";

				}
@@ -1084,7 +1084,7 @@ module ePassport_Types { 
					TlvLength tlvLength,

					octetstring tlvValue

				} with {

					variant "present=bytes(1,0x95)"

					variant "present=bytes(1,0x95)";

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

					variant (tlvValue)	"length=getIntTag('tlvLength');unsigned;";

				}
@@ -1094,7 +1094,7 @@ module ePassport_Types { 
					TlvLength tlvLength,

					octetstring tlvValue

				} with {

					variant "present=bytes(1,0x8e)"

					variant "present=bytes(1,0x8e)";

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

					variant (tlvValue)	"length=getIntTag('tlvLength');unsigned;";

				}
@@ -1110,7 +1110,7 @@ module ePassport_Types { 
				ResponseData responseData optional,

				W1W2Status w1w2

			} with {

				variant "isPdu;"

				variant "isPDU;"

				"use=com.testingtech.ttcn.tci.helper.EPassportCodecHelper;"

				"encode=EPassportCodecHelper.encodeResponse();"

				"decode=EPassportCodecHelper.decodeResponse();"
@@ -1135,9 +1135,9 @@ module ePassport_Types { 
			octetstring tlvValue

		}

		with {

			variant "present=bytes(1,0x86)||bytes(1,0x87)"

			variant (tlvLength) "intTag='tlvLength'"

			variant (tlvValue) "length=(getIntTag('tlvLength')-1)"

			variant "present=bytes(1,0x86)||bytes(1,0x87)";

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

			variant (tlvValue) "length=(getIntTag('tlvLength')-1)";

		}



		type record LengthETLV {
@@ -1146,8 +1146,8 @@ module ePassport_Types { 
			TlvLengthE tlvValue

		}

		with {

			variant "present=bytes(1,0x96)||bytes(1,0x97)"

			variant (tlvLength) "intTag='tlvLength'"

			variant "present=bytes(1,0x96)||bytes(1,0x97)";

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

			variant (tlvValue)	"length=getIntTag('tlvLength');unsigned;"

								"intTag='lengthEFromSMData'"

		}
@@ -1164,9 +1164,9 @@ module ePassport_Types { 
			octetstring tlvValue

		}

		with {

			variant "present=bytes(1,0x8e)"

			variant (tlvLength) "intTag='tlvLength'"

			variant (tlvValue) "length=getIntTag('tlvLength')"

			variant "present=bytes(1,0x8e)";

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

			variant (tlvValue) "length=getIntTag('tlvLength')";

		}



		type set SMData {