Fix Change Key parameter usage on CreateApplicationEV1 and CreateApplicationEV2 commands

Maxhy · Maxhy · commit c2e39c5d4470 · 2025-04-04T11:23:21.000+02:00
diff --git a/CredentialProvisioning.Encoding.LLA/Chip/DESFire/CreateApplicationEV1.cs b/CredentialProvisioning.Encoding.LLA/Chip/DESFire/CreateApplicationEV1.cs
@@ -7,9 +7,9 @@ public class CreateApplicationEV1(Leosac.CredentialProvisioning.Encoding.Chip.DE
         public override void Run(DESFireEV1Commands cmd, EncodingContext encodingCtx, LLACardContext cardCtxdeviceCtx)
         {
             if (Properties.FidSupport == Encoding.Chip.DESFire.FidSupport.Enabled)
-                cmd.createApplication(Properties.AID, (DESFireKeySettings)Properties.KeySettings, Properties.MaxNbKeys, (DESFireKeyType)Properties.KeyType, (FidSupport)Properties.FidSupport, Properties.IsoFID.GetValueOrDefault(0), Properties.IsoDFName?.ToByteVector() ?? []);
+                cmd.createApplication(Properties.AID, (DESFireKeySettings)((byte)Properties.KeySettings | (Properties.ChangeKey << 4)), Properties.MaxNbKeys, (DESFireKeyType)Properties.KeyType, (FidSupport)Properties.FidSupport, Properties.IsoFID.GetValueOrDefault(0), Properties.IsoDFName?.ToByteVector() ?? []);
             else
-                cmd.createApplication(Properties.AID, (DESFireKeySettings)Properties.KeySettings, Properties.MaxNbKeys, (DESFireKeyType)Properties.KeyType, (FidSupport)Properties.FidSupport);
+                cmd.createApplication(Properties.AID, (DESFireKeySettings)((byte)Properties.KeySettings | (Properties.ChangeKey << 4)), Properties.MaxNbKeys, (DESFireKeyType)Properties.KeyType, (FidSupport)Properties.FidSupport);
         }
     }
 }
diff --git a/CredentialProvisioning.Encoding.LLA/Chip/DESFire/CreateApplicationEV2.cs b/CredentialProvisioning.Encoding.LLA/Chip/DESFire/CreateApplicationEV2.cs
@@ -6,7 +6,7 @@ public class CreateApplicationEV2(Leosac.CredentialProvisioning.Encoding.Chip.DE
     {
         public override void Run(DESFireEV2Commands cmd, EncodingContext encodingCtx, LLACardContext cardCtxdeviceCtx)
         {
-            cmd.createApplication(Properties.AID, (DESFireKeySettings)Properties.KeySettings, Properties.MaxNbKeys, (DESFireKeyType)Properties.KeyType, (FidSupport)Properties.FidSupport, Properties.IsoFID.GetValueOrDefault(0), Properties.IsoDFName?.ToByteVector() ?? [], Properties.NumberKeySets, Properties.MaxKeySize, Properties.ActualKeySetVersion, Properties.RollKeyNo, Properties.SpecificCapabilityData, Properties.SpecificVCKeys);
+            cmd.createApplication(Properties.AID, (DESFireKeySettings)((byte)Properties.KeySettings | (Properties.ChangeKey << 4)), Properties.MaxNbKeys, (DESFireKeyType)Properties.KeyType, (FidSupport)Properties.FidSupport, Properties.IsoFID.GetValueOrDefault(0), Properties.IsoDFName?.ToByteVector() ?? [], Properties.NumberKeySets, Properties.MaxKeySize, Properties.ActualKeySetVersion, Properties.RollKeyNo, Properties.SpecificCapabilityData, Properties.SpecificVCKeys);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,9 @@ public class CreateApplicationEV1(Leosac.CredentialProvisioning.Encoding.Chip.DE`
`7`	`7`	`public override void Run(DESFireEV1Commands cmd, EncodingContext encodingCtx, LLACardContext cardCtxdeviceCtx)`
`8`	`8`	`{`
`9`	`9`	`if (Properties.FidSupport == Encoding.Chip.DESFire.FidSupport.Enabled)`
`10`		`- cmd.createApplication(Properties.AID, (DESFireKeySettings)Properties.KeySettings, Properties.MaxNbKeys, (DESFireKeyType)Properties.KeyType, (FidSupport)Properties.FidSupport, Properties.IsoFID.GetValueOrDefault(0), Properties.IsoDFName?.ToByteVector() ?? []);`
	`10`	`+ cmd.createApplication(Properties.AID, (DESFireKeySettings)((byte)Properties.KeySettings \| (Properties.ChangeKey << 4)), Properties.MaxNbKeys, (DESFireKeyType)Properties.KeyType, (FidSupport)Properties.FidSupport, Properties.IsoFID.GetValueOrDefault(0), Properties.IsoDFName?.ToByteVector() ?? []);`
`11`	`11`	`else`
`12`		`- cmd.createApplication(Properties.AID, (DESFireKeySettings)Properties.KeySettings, Properties.MaxNbKeys, (DESFireKeyType)Properties.KeyType, (FidSupport)Properties.FidSupport);`
	`12`	`+ cmd.createApplication(Properties.AID, (DESFireKeySettings)((byte)Properties.KeySettings \| (Properties.ChangeKey << 4)), Properties.MaxNbKeys, (DESFireKeyType)Properties.KeyType, (FidSupport)Properties.FidSupport);`
`13`	`13`	`}`
`14`	`14`	`}`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ public class CreateApplicationEV2(Leosac.CredentialProvisioning.Encoding.Chip.DE`
`6`	`6`	`{`
`7`	`7`	`public override void Run(DESFireEV2Commands cmd, EncodingContext encodingCtx, LLACardContext cardCtxdeviceCtx)`
`8`	`8`	`{`
`9`		`- cmd.createApplication(Properties.AID, (DESFireKeySettings)Properties.KeySettings, Properties.MaxNbKeys, (DESFireKeyType)Properties.KeyType, (FidSupport)Properties.FidSupport, Properties.IsoFID.GetValueOrDefault(0), Properties.IsoDFName?.ToByteVector() ?? [], Properties.NumberKeySets, Properties.MaxKeySize, Properties.ActualKeySetVersion, Properties.RollKeyNo, Properties.SpecificCapabilityData, Properties.SpecificVCKeys);`
	`9`	`+ cmd.createApplication(Properties.AID, (DESFireKeySettings)((byte)Properties.KeySettings \| (Properties.ChangeKey << 4)), Properties.MaxNbKeys, (DESFireKeyType)Properties.KeyType, (FidSupport)Properties.FidSupport, Properties.IsoFID.GetValueOrDefault(0), Properties.IsoDFName?.ToByteVector() ?? [], Properties.NumberKeySets, Properties.MaxKeySize, Properties.ActualKeySetVersion, Properties.RollKeyNo, Properties.SpecificCapabilityData, Properties.SpecificVCKeys);`
`10`	`10`	`}`
`11`	`11`	`}`
`12`	`12`	`}`