Commit 734e7279 authored by fetke's avatar fetke
Browse files

No commit message

No commit message
parent e23b66a4
Loading
Loading
Loading
Loading
+10 −7
Original line number Diff line number Diff line
@@ -75,7 +75,10 @@ module ePassport_Types {
				Instruction ins(e_manageSecurityEnvironment),
				ManageSecurityEnvironmentParams params,
				ManageSecurityEnvironmentPayload payload optional // presence depends on crtTag (present if 0xa4, 0xa6, 0xaa, 0xb4, 0xb6, 0xb8)
			} with {variant "isPdu;present=bits(5,8,0x22);"};
			} with {
				variant "isPdu;present=bits(5,8,0x22);"
				variant (payload) "fieldPresent=readTag(crtTag)"  // TODO
			}

			type record CommandExternalOrMutualAuthenticate {
				Class class,
@@ -489,7 +492,7 @@ module ePassport_Types {
					MseComputationDeciphermentIntAuthKeyAgreement mseComputationDeciphermentIntAuthKeyAgreement,
					MseVerificationEnciphermentExtAuthKeyAgreement mseVerificationEnciphermentExtAuthKeyAgreement,
					MseFunction mseFunction,
					MseCrtTag crtTag
					MseCrtTag crtTag  // TODO: this must set the tag
				}

				type enumerated MseSecureMessagingInCommandDataField {
@@ -544,10 +547,10 @@ module ePassport_Types {
					CrtDST crtDST
					//CrtCT crtCT
				} with {
					// TODO: fill this stub
					variant (crtAT)		"fieldPresent=bits(1,1)";
					variant (crtKAT)	"fieldPresent=bits(1,0)";
					variant (CrtDST)	"fieldPresent=bits(1,0)";
					// TODO: fix the annotation syntax here
					variant (crtAT)		"fieldPresent=readTag(crtTag=0xa4)";
					variant (crtKAT)	"fieldPresent=readTag(crtTag=0xa6)";
					variant (CrtDST)	"fieldPresent=readTag(crtTag=0xb6)";
				}

			} // end ManageSecurityEnvironmentMsg
@@ -747,7 +750,7 @@ module ePassport_Types {
					TlvLength tlvLength,
					octetstring tlvValue
				} with {
				    // TODO: chech that this is meant by 0x89 -> 0x8D
				    // TODO: check that this is meant by 0x89 -> 0x8D
				    variant "present=(bytes(0,0x89)||bytes(0,0x8a)||bytes(0,0x8b)||bytes(0,0x8c)||bytes(0,0x8d))&&bytes(1,4,0x00000000)"
				}