Fix div input calculation during key link resolving

Maxhy · Maxhy · commit 1f8db8a5fa34 · 2025-07-28T16:54:24.000+02:00
diff --git a/KeyManager.Library.KeyStore.NXP_SAM/SAMKeyStore.cs b/KeyManager.Library.KeyStore.NXP_SAM/SAMKeyStore.cs
@@ -1,4 +1,5 @@
-﻿using LibLogicalAccess;
+﻿using Leosac.KeyManager.Library.Crypto;
+using LibLogicalAccess;
 
 namespace Leosac.KeyManager.Library.KeyStore.NXP_SAM
 {
@@ -669,26 +670,25 @@ public LibLogicalAccess.Card.DESFireKey GetAuthenticationKey()
             key.setKeyVersion(GetSAMProperties().AuthenticateKeyVersion);
             if (!string.IsNullOrEmpty(Properties?.Secret))
             {
-                key.fromString(KeyMaterial.GetValueAsString(Properties.Secret, KeyValueStringFormat.HexStringWithSpace));
+                var kv = Properties.Secret;
+                if (GetSAMProperties().AuthenticationDivInput.Count > 0)
+                {
+                    var divContext = new DivInput.DivInputContext
+                    {
+                        KeyStore = this
+                    };
+                    var input = ComputeDivInput(divContext, GetSAMProperties().AuthenticationDivInput);
+                    if (!string.IsNullOrEmpty(input))
+                    {
+                        kv = AN10922KeyDiversification.Diversify(kv, input);
+                    }
+                }
+                key.fromString(KeyMaterial.GetValueAsString(kv, KeyValueStringFormat.HexStringWithSpace));
             }
             else
             {
                 key.fromString("00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00");
             }
-            if (GetSAMProperties().AuthenticationDivInput.Count > 0)
-            {
-                var divContext = new DivInput.DivInputContext
-                {
-                    KeyStore = this
-                };
-                var div = new LibLogicalAccess.Card.NXPAV2KeyDiversification();
-                var input = ComputeDivInput(divContext, GetSAMProperties().AuthenticationDivInput);
-                if (!string.IsNullOrEmpty(input))
-                {
-                    div.setDivInput([.. Convert.FromHexString(input)]);
-                    key.setKeyDiversification(div);
-                }
-            }
             return key;
         }
 
diff --git a/KeyManager.Library.UI/DivInputTestControl.xaml b/KeyManager.Library.UI/DivInputTestControl.xaml
diff --git a/KeyManager.Library.UI/DivInputTestControl.xaml.cs b/KeyManager.Library.UI/DivInputTestControl.xaml.cs
diff --git a/KeyManager.Library.UI/Domain/KeyEntriesControlViewModel.cs b/KeyManager.Library.UI/Domain/KeyEntriesControlViewModel.cs
@@ -234,6 +234,10 @@ protected KeyEntryDialogViewModel CreateKeyEntryDialogViewModel()
         protected KeyEntryDialogViewModel CreateKeyEntryDialogViewModel(bool keClone)
         {
             var model = new KeyEntryDialogViewModel(KeyEntryClass);
+            if (_keyStore != null)
+            {
+                LinkDialogViewModel.KeyStoreAttributes = _keyStore.Attributes;
+            }
             model.SetKeyEntry(KeyStore?.GetDefaultKeyEntry(KeyEntryClass, keClone));
             model.ShowKeyEntryLabel = (KeyStore?.CanDefineKeyEntryLabel).GetValueOrDefault(true);
             return model;
diff --git a/KeyManager.Library.UI/Domain/KeyEntryLinkDialogViewModel.cs b/KeyManager.Library.UI/Domain/KeyEntryLinkDialogViewModel.cs
@@ -13,7 +13,11 @@ public override async Task RunLinkImpl(KeyStore.KeyStore ks)
         {
             if (KeyEntryLink != null)
             {
-                LinkResult = await ks.ResolveKeyEntryLink(KeyEntryLink.KeyIdentifier, Class, DivInputResult, KeyEntryLink.WrappingKey, null);
+                var divContext = new DivInput.DivInputContext
+                {
+                    AdditionalKeyStoreAttributes = KeyStoreAttributes
+                };
+                LinkResult = await ks.ResolveKeyEntryLink(KeyEntryLink.KeyIdentifier, Class, KeyStore.KeyStore.ComputeDivInput(divContext, KeyEntryLink.DivInput), KeyEntryLink.WrappingKey, null);
             }
         }
     }
diff --git a/KeyManager.Library.UI/Domain/KeyLinkDialogViewModel.cs b/KeyManager.Library.UI/Domain/KeyLinkDialogViewModel.cs
@@ -26,7 +26,11 @@ public override async Task RunLinkImpl(KeyStore.KeyStore ks)
         {
             if (KeyLink != null)
             {
-                LinkResult = await ks.ResolveKeyLink(KeyLink.KeyIdentifier, Class, KeyLink.ContainerSelector, DivInputResult);
+                var divContext = new DivInput.DivInputContext
+                {
+                    AdditionalKeyStoreAttributes = KeyStoreAttributes
+                };
+                LinkResult = await ks.ResolveKeyLink(KeyLink.KeyIdentifier, Class, KeyLink.ContainerSelector, KeyStore.KeyStore.ComputeDivInput(divContext, KeyLink.DivInput));
             }
         }
     }
diff --git a/KeyManager.Library.UI/Domain/LinkDialogViewModel.cs b/KeyManager.Library.UI/Domain/LinkDialogViewModel.cs
@@ -29,6 +29,8 @@ protected LinkDialogViewModel()
             _class = KeyEntryClass.Symmetric;
         }
 
+        public static IDictionary<string, string>? KeyStoreAttributes { get; set; }
+
         private Link? _link;
         public Link? Link
 
@@ -59,13 +61,6 @@ public string? LinkError
             set => SetProperty(ref _linkError, value);
         }
 
-        private string? _divInputResult;
-        public string? DivInputResult
-        {
-            get => _divInputResult;
-            set => SetProperty(ref _divInputResult, value);
-        }
-
         private bool _allowImport;
 
         public bool AllowImport
diff --git a/KeyManager.Library.UI/KeyEntryLinkDialog.xaml b/KeyManager.Library.UI/KeyEntryLinkDialog.xaml
@@ -29,7 +29,6 @@
                     <TextBlock Margin="5" VerticalAlignment="Center" Text="{x:Static properties:Resources.LinkError}" />
                     <TextBlock Margin="5" VerticalAlignment="Center" Text="{Binding LinkError}" />
                 </WrapPanel>
-                <local:DivInputTestControl DivInput="{Binding Link.DivInput}" DivInputResult="{Binding DivInputResult}" />
                 <StackPanel Margin="15" HorizontalAlignment="Center" Orientation="Horizontal">
                     <Button  Margin="5" VerticalAlignment="Center" Command="{x:Static materialDesign:DrawerHost.CloseDrawerCommand}" CommandParameter="{x:Static Dock.Bottom}" Content="{x:Static properties:Resources.CloseCaps}" Style="{StaticResource MaterialDesignFlatButton}" />
                 </StackPanel>
diff --git a/KeyManager.Library.UI/KeyLinkDialog.xaml b/KeyManager.Library.UI/KeyLinkDialog.xaml
@@ -34,7 +34,6 @@
                     <TextBlock Margin="5" VerticalAlignment="Center" Text="{x:Static properties:Resources.LinkError}" />
                     <TextBlock Margin="5" VerticalAlignment="Center" Text="{Binding LinkError}" />
                 </WrapPanel>
-                <local:DivInputTestControl DivInput="{Binding Link.DivInput}" DivInputResult="{Binding DivInputResult}" />
                 <StackPanel Margin="15" HorizontalAlignment="Center" Orientation="Horizontal">
                     <Button Margin="5" VerticalAlignment="Center"
                             Command="{Binding ImportResultCommand}"
diff --git a/KeyManager.Library/DivInput/DivInputContext.cs b/KeyManager.Library/DivInput/DivInputContext.cs
@@ -6,6 +6,8 @@ public class DivInputContext
 
         public KeyStore.KeyStore? KeyStore { get; set; }
 
+        public IDictionary<string, string>? AdditionalKeyStoreAttributes { get; set; }
+
         public KeyStore.KeyEntry? KeyEntry { get; set; }
 
         public KeyContainer? KeyContainer { get; set; }
diff --git a/KeyManager.Library/DivInput/KeyEntryIdDivInputFragment.cs b/KeyManager.Library/DivInput/KeyEntryIdDivInputFragment.cs
@@ -13,8 +13,13 @@ public override object Clone()
 
         public override string GetFragment(DivInputContext context)
         {
+            if (string.IsNullOrEmpty(context.KeyEntry?.Identifier.Id))
+            {
+                throw new Exception("Missing Key Entry definition on div input context.");
+            }
+
             // TODO: we may want to have a property to define the input conversion (eg. to use decimal string as byte value, ...)
-            return Convert.ToHexString(Encoding.UTF8.GetBytes(context.KeyEntry!.Identifier.Id!));
+            return Convert.ToHexString(Encoding.UTF8.GetBytes(context.KeyEntry.Identifier.Id));
         }
     }
 }
diff --git a/KeyManager.Library/DivInput/KeyStoreAttributeDivInputFragment.cs b/KeyManager.Library/DivInput/KeyStoreAttributeDivInputFragment.cs
@@ -26,12 +26,16 @@ public override object Clone()
 
         public override string GetFragment(DivInputContext context)
         {
-            if (context.KeyStore != null && context.KeyStore.Attributes.ContainsKey(Attribute))
+            var a = Attribute.ToLowerInvariant();
+            if (context.KeyStore == null || !context.KeyStore.Attributes.ContainsKey(a))
             {
-                return context.KeyStore.Attributes[Attribute];
+                if (context.AdditionalKeyStoreAttributes != null && context.AdditionalKeyStoreAttributes.ContainsKey(a))
+                    return context.AdditionalKeyStoreAttributes[a];
+
+                throw new Exception("Missing Key Store attribute on div input context.");
             }
 
-            return string.Empty;
+            return context.KeyStore.Attributes[a];
         }
     }
 }
diff --git a/KeyManager.Library/KeyStore/KeyStore.cs b/KeyManager.Library/KeyStore/KeyStore.cs

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,11 @@ public override async Task RunLinkImpl(KeyStore.KeyStore ks)`
`13`	`13`	`{`
`14`	`14`	`if (KeyEntryLink != null)`
`15`	`15`	`{`
`16`		`- LinkResult = await ks.ResolveKeyEntryLink(KeyEntryLink.KeyIdentifier, Class, DivInputResult, KeyEntryLink.WrappingKey, null);`
	`16`	`+ var divContext = new DivInput.DivInputContext`
	`17`	`+ {`
	`18`	`+ AdditionalKeyStoreAttributes = KeyStoreAttributes`
	`19`	`+ };`
	`20`	`+ LinkResult = await ks.ResolveKeyEntryLink(KeyEntryLink.KeyIdentifier, Class, KeyStore.KeyStore.ComputeDivInput(divContext, KeyEntryLink.DivInput), KeyEntryLink.WrappingKey, null);`
`17`	`21`	`}`
`18`	`22`	`}`
`19`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,11 @@ public override async Task RunLinkImpl(KeyStore.KeyStore ks)`
`26`	`26`	`{`
`27`	`27`	`if (KeyLink != null)`
`28`	`28`	`{`
`29`		`- LinkResult = await ks.ResolveKeyLink(KeyLink.KeyIdentifier, Class, KeyLink.ContainerSelector, DivInputResult);`
	`29`	`+ var divContext = new DivInput.DivInputContext`
	`30`	`+ {`
	`31`	`+ AdditionalKeyStoreAttributes = KeyStoreAttributes`
	`32`	`+ };`
	`33`	`+ LinkResult = await ks.ResolveKeyLink(KeyLink.KeyIdentifier, Class, KeyLink.ContainerSelector, KeyStore.KeyStore.ComputeDivInput(divContext, KeyLink.DivInput));`
`30`	`34`	`}`
`31`	`35`	`}`
`32`	`36`	`}`