From 1ff848678b070a07d01191cdf427b0415c2e8165 Mon Sep 17 00:00:00 2001
From: Maxhy <maxime.chamley@leosac.com>
Date: Tue, 24 Oct 2023 22:23:35 +0200
Subject: [PATCH] Move from KeyCeremonyType enum to SecretSharing classes,
 implements missing logic (share generation) and add related unit tests

---
 .../Wizard/SAMAccessControlWizardFactory.cs   |   2 +-
 .../SAMKeyStore.cs                            |   3 +
 .../ConcatSecretSharingTests.cs               |  61 +++++++++
 .../KeyGenerationTests.cs                     |   4 +-
 KeyManager.Library.Tests/KeyTests.cs          |   6 +-
 .../ShamirsSecretSharingTests.cs              |  48 +++++++
 .../XorSecretSharingTests.cs                  |  60 +++++++++
 .../Domain/KeyChecksumConverter.cs            |   5 +
 .../Domain/KeyLeakUriConverter.cs             |   7 +
 .../KeyCeremonyBeginControl.xaml              |   4 +-
 .../KeyCeremonyFragmentControl.xaml           |   2 +-
 .../KeyCeremonySetupControl.xaml              |  16 ++-
 .../KeyCeremonySetupControl.xaml.cs           | 125 ++++++------------
 KeyManager.Library.UI/KeyCeremonyType.cs      |  14 --
 KeyManager.Library.UI/KeyEntriesControl.xaml  |   2 +-
 .../KeyManager.Library.UI.csproj              |   1 -
 .../Properties/Resources.Designer.cs          |   2 +-
 .../Properties/Resources.fr.resx              |   2 +-
 .../Properties/Resources.resx                 |   2 +-
 .../SymmetricKeyGenerationDialog.xaml.cs      |   4 +-
 KeyManager.Library/Key.cs                     |   4 -
 KeyManager.Library/KeyChecksum.cs             |   7 +-
 KeyManager.Library/KeyGeneration.cs           |  15 +--
 KeyManager.Library/KeyManager.Library.csproj  |   1 +
 KeyManager.Library/KeyStore/KeyStore.cs       |   2 +-
 .../SecretSharing/ConcatSecretSharing.cs      |  38 ++++++
 .../SecretSharing/SecretSharingBase.cs        |  21 +++
 .../SecretSharing/ShamirsSecretSharing.cs     |  40 ++++++
 .../SecretSharing/XorSecretSharing.cs         |  64 +++++++++
 29 files changed, 428 insertions(+), 134 deletions(-)
 create mode 100644 KeyManager.Library.Tests/ConcatSecretSharingTests.cs
 create mode 100644 KeyManager.Library.Tests/ShamirsSecretSharingTests.cs
 create mode 100644 KeyManager.Library.Tests/XorSecretSharingTests.cs
 delete mode 100644 KeyManager.Library.UI/KeyCeremonyType.cs
 create mode 100644 KeyManager.Library/SecretSharing/ConcatSecretSharing.cs
 create mode 100644 KeyManager.Library/SecretSharing/SecretSharingBase.cs
 create mode 100644 KeyManager.Library/SecretSharing/ShamirsSecretSharing.cs
 create mode 100644 KeyManager.Library/SecretSharing/XorSecretSharing.cs

diff --git a/KeyManager.Library.KeyStore.NXP_SAM.UI/Wizard/SAMAccessControlWizardFactory.cs b/KeyManager.Library.KeyStore.NXP_SAM.UI/Wizard/SAMAccessControlWizardFactory.cs
index 9ec64c9..08eedd1 100644
--- a/KeyManager.Library.KeyStore.NXP_SAM.UI/Wizard/SAMAccessControlWizardFactory.cs
+++ b/KeyManager.Library.KeyStore.NXP_SAM.UI/Wizard/SAMAccessControlWizardFactory.cs
@@ -67,7 +67,7 @@ private static SAMSymmetricKeyEntry CreateKeyEntry(string id, string label, bool
                     if (ke.Variant.KeyContainers[i] is KeyVersion keyVersion)
                     {
                         keyVersion.Version = i;
-                        keyVersion.Key.Materials[0].Value = KeyGeneration.Random(keyVersion.Key.KeySize);
+                        keyVersion.Key.Materials[0].SetValueBinary(KeyGeneration.Random(keyVersion.Key.KeySize));
                     }
                 }
             }
diff --git a/KeyManager.Library.KeyStore.NXP_SAM/SAMKeyStore.cs b/KeyManager.Library.KeyStore.NXP_SAM/SAMKeyStore.cs
index 77d78c7..daf94b6 100644
--- a/KeyManager.Library.KeyStore.NXP_SAM/SAMKeyStore.cs
+++ b/KeyManager.Library.KeyStore.NXP_SAM/SAMKeyStore.cs
@@ -428,6 +428,7 @@ public override Task Update(IChangeKeyEntry change, bool ignoreIfMissing)
                         };
                         if (!containers[1].Key.IsEmpty())
                         {
+                            log.Info("Updating value for key version A.");
                             updateSettings.keyVa = 1;
                         }
                         if (containers[0] is KeyVersion keyVersionA)
@@ -438,6 +439,7 @@ public override Task Update(IChangeKeyEntry change, bool ignoreIfMissing)
                         {
                             if (!containers[1].Key.IsEmpty())
                             {
+                                log.Info("Updating value for key version B.");
                                 updateSettings.keyVb = 1;
                             }
                             keys.Add(new LibLogicalAccess.ByteVector(containers[1].Key.GetAggregatedValueBinary(true)));
@@ -450,6 +452,7 @@ public override Task Update(IChangeKeyEntry change, bool ignoreIfMissing)
                             {
                                 if (!containers[2].Key.IsEmpty())
                                 {
+                                    log.Info("Updating value for key version C.");
                                     updateSettings.keyVc = 1;
                                 }
                                 keys.Add(new LibLogicalAccess.ByteVector(containers[2].Key.GetAggregatedValueBinary(true)));
diff --git a/KeyManager.Library.Tests/ConcatSecretSharingTests.cs b/KeyManager.Library.Tests/ConcatSecretSharingTests.cs
new file mode 100644
index 0000000..ea1f5af
--- /dev/null
+++ b/KeyManager.Library.Tests/ConcatSecretSharingTests.cs
@@ -0,0 +1,61 @@
+using Leosac.KeyManager.Library.SecretSharing;
+
+namespace Leosac.KeyManager.Library.Tests
+{
+    [TestClass]
+    public class ConcatSecretSharingTests
+    {
+        private readonly ConcatSecretSharing _sharing;
+
+        public ConcatSecretSharingTests()
+        {
+            _sharing = new ConcatSecretSharing();
+        }
+
+        [TestMethod]
+        public void Test_ComputeTwoFragments()
+        {
+            var key = _sharing.ComputeFragments(new[]
+            {
+                "0011223344556677",
+                "8899AABBCCDDEEFF"
+            });
+            Assert.IsNotNull(key);
+            Assert.AreEqual("00112233445566778899AABBCCDDEEFF", Convert.ToHexString(key), true);
+        }
+
+        [TestMethod]
+        public void Test_ComputeThreeFragments()
+        {
+            var key = _sharing.ComputeFragments(new[]
+            {
+                "00112233445",
+                "566778899AA",
+                "BBCCDDEEFF"
+            });
+            Assert.IsNotNull(key);
+            Assert.AreEqual("00112233445566778899AABBCCDDEEFF", Convert.ToHexString(key), true);
+        }
+
+        [TestMethod]
+        public void Test_CreateTwoFragments()
+        {
+            var fragments = _sharing.CreateFragments(Convert.FromHexString("00112233445566778899AABBCCDDEEFF"), 2);
+            Assert.IsNotNull(fragments);
+            Assert.IsTrue(fragments.Length == 2);
+            Assert.AreEqual("0011223344556677", fragments[0], true);
+            Assert.AreEqual("8899AABBCCDDEEFF", fragments[1], true);
+        }
+
+        [TestMethod]
+        public void Test_CreateThreeFragments()
+        {
+            var fragments = _sharing.CreateFragments(Convert.FromHexString("00112233445566778899AABBCCDDEEFF"), 3);
+            Assert.IsNotNull(fragments);
+            Assert.IsTrue(fragments.Length == 3);
+            Assert.AreEqual("00112233445", fragments[0], true);
+            Assert.AreEqual("566778899AA", fragments[1], true);
+            Assert.AreEqual("BBCCDDEEFF", fragments[2], true);
+        }
+    }
+}
diff --git a/KeyManager.Library.Tests/KeyGenerationTests.cs b/KeyManager.Library.Tests/KeyGenerationTests.cs
index e9c55c1..582f368 100644
--- a/KeyManager.Library.Tests/KeyGenerationTests.cs
+++ b/KeyManager.Library.Tests/KeyGenerationTests.cs
@@ -10,7 +10,7 @@ public class KeyGenerationTests
         public void Test_Random(int keySize)
         {
             var key1 = KeyGeneration.Random((uint)keySize);
-            Assert.AreEqual(keySize * 2, key1.Length);
+            Assert.AreEqual(keySize, key1.Length);
 
             var key2 = KeyGeneration.Random((uint)keySize);
             Assert.AreNotEqual(key1, key2);
@@ -22,7 +22,7 @@ public void Test_Random(int keySize)
         [DataRow(32)]
         public void Test_FromPassword(int keySize)
         {
-            var key = KeyGeneration.FromPassword("test", "Security Freedom", keySize);
+            var key = Convert.ToHexString(KeyGeneration.FromPassword("test", "Security Freedom", keySize));
             var rkey = "E088566240571EAD486818BE1199F53EB407411014BA1E36101C242FC34DEBAF"[..(keySize * 2)];
             Assert.AreEqual(rkey, key, true);
         }
diff --git a/KeyManager.Library.Tests/KeyTests.cs b/KeyManager.Library.Tests/KeyTests.cs
index 4ae9f31..c4be6c4 100644
--- a/KeyManager.Library.Tests/KeyTests.cs
+++ b/KeyManager.Library.Tests/KeyTests.cs
@@ -6,7 +6,7 @@ public class KeyTests
         [TestMethod]
         public void OneMaterial_GetAggregatedValue_HexString()
         {
-            var key = new Key(null, "00112233445566778899AABBCCDDEEFF");
+            var key = new Key(null, 16, "00112233445566778899AABBCCDDEEFF");
             var v = key.GetAggregatedValueString();
             Assert.AreEqual("00112233445566778899AABBCCDDEEFF", v, true);
         }
@@ -22,7 +22,7 @@ public void OneMaterial_SetAggregatedValue_HexString()
         [TestMethod]
         public void OneMaterial_GetAggregatedValue_Binary()
         {
-            var key = new Key(null, "00112233445566778899AABBCCDDEEFF");
+            var key = new Key(null, 16, "00112233445566778899AABBCCDDEEFF");
             var v = key.GetAggregatedValueBinary();
             Assert.IsNotNull(v);
             Assert.AreEqual("00112233445566778899AABBCCDDEEFF", Convert.ToHexString(v), true);
@@ -31,7 +31,7 @@ public void OneMaterial_GetAggregatedValue_Binary()
         [TestMethod]
         public void OneMaterial_GetAggregatedValue_HexStringWithSpace()
         {
-            var key = new Key(null, "00112233445566778899AABBCCDDEEFF");
+            var key = new Key(null, 16, "00112233445566778899AABBCCDDEEFF");
             var v = key.GetAggregatedValueString(KeyValueStringFormat.HexStringWithSpace);
             Assert.AreEqual("00 11 22 33 44 55 66 77 88 99 AA BB CC DD EE FF", v, true);
         }
diff --git a/KeyManager.Library.Tests/ShamirsSecretSharingTests.cs b/KeyManager.Library.Tests/ShamirsSecretSharingTests.cs
new file mode 100644
index 0000000..6f6233e
--- /dev/null
+++ b/KeyManager.Library.Tests/ShamirsSecretSharingTests.cs
@@ -0,0 +1,48 @@
+using Leosac.KeyManager.Library.SecretSharing;
+
+namespace Leosac.KeyManager.Library.Tests
+{
+    [TestClass]
+    public class ShamirsSecretSharingTests
+    {
+        private readonly ShamirsSecretSharing _sharing;
+
+        public ShamirsSecretSharingTests()
+        {
+            _sharing = new ShamirsSecretSharing();
+        }
+
+        [TestMethod]
+        public void Test_ComputeTwoFragments()
+        {
+            var key = _sharing.ComputeFragments(new[]
+            {
+                "01-34E95FCCCA0B73B74DEC515D2EA4B988A582D6EF55B6EFC0638B2B3CBBE171A30BD85DC2ABEB16F93991ADCCB2107F421F2C3BAEE69EFE271CE81A93C1E1EF3D9700",
+                "03-9C99DBFED7788C37D891A0A0F1304F9AC48783CF0123CF422BA282B431A555EA2288194703C344EBADB3086618327DC75D84B10AB4DCFB7754B850B944A5CFB9C501"
+            });
+            Assert.IsNotNull(key);
+            Assert.AreEqual("00112233445566778899AABBCCDDEEFF", Convert.ToHexString(key), true);
+        }
+
+        [TestMethod]
+        public void Test_ComputeThreeFragments()
+        {
+            var key = _sharing.ComputeFragments(new[]
+            {
+                "01-34E95FCCCA0B73B74DEC515D2EA4B988A582D6EF55B6EFC0638B2B3CBBE171A30BD85DC2ABEB16F93991ADCCB2107F421F2C3BAEE69EFE271CE81A93C1E1EF3D9700",
+                "02-68C19D6551C27FF7123FF9FE8F6A84113505ADDFAB6CDF81C716577876C3E34617B0BB8457D72DF273225B996521FE843E58765CCD3DFD4F38D0352683C3DF7B2E01",
+                "03-9C99DBFED7788C37D891A0A0F1304F9AC48783CF0123CF422BA282B431A555EA2288194703C344EBADB3086618327DC75D84B10AB4DCFB7754B850B944A5CFB9C501"
+            });
+            Assert.IsNotNull(key);
+            Assert.AreEqual("00112233445566778899AABBCCDDEEFF", Convert.ToHexString(key), true);
+        }
+
+        [TestMethod]
+        public void Test_CreateThreeFragments()
+        {
+            var fragments = _sharing.CreateFragments(Convert.FromHexString("00112233445566778899AABBCCDDEEFF"), 3);
+            Assert.IsNotNull(fragments);
+            Assert.IsTrue(fragments.Length == 3);
+        }
+    }
+}
diff --git a/KeyManager.Library.Tests/XorSecretSharingTests.cs b/KeyManager.Library.Tests/XorSecretSharingTests.cs
new file mode 100644
index 0000000..4f89aa7
--- /dev/null
+++ b/KeyManager.Library.Tests/XorSecretSharingTests.cs
@@ -0,0 +1,60 @@
+using Leosac.KeyManager.Library.SecretSharing;
+
+namespace Leosac.KeyManager.Library.Tests
+{
+    [TestClass]
+    public class XorSecretSharingTests
+    {
+        private readonly XorSecretSharing _sharing;
+
+        public XorSecretSharingTests()
+        {
+            _sharing = new XorSecretSharing();
+        }
+
+        [TestMethod]
+        public void Test_ComputeTwoFragments()
+        {
+            var key = _sharing.ComputeFragments(new[]
+            {
+                "C37CAE51E95AF034DE05EEFA1AF48CF8",
+                "C36D8C62AD0F9643569C4441D6296207"
+            });
+            Assert.IsNotNull(key);
+            Assert.AreEqual("00112233445566778899AABBCCDDEEFF", Convert.ToHexString(key), true);
+        }
+
+        [TestMethod]
+        public void Test_ComputeThreeFragments()
+        {
+            var key = _sharing.ComputeFragments(new[]
+            {
+                "77BE07C2B01AE24B7D20E1988898107A",
+                "F84B15A46502C6B4589CD51579A4B23F",
+                "8FE43055914D4288AD259E363DE14CBA"
+            });
+            Assert.IsNotNull(key);
+            Assert.AreEqual("00112233445566778899AABBCCDDEEFF", Convert.ToHexString(key), true);
+        }
+
+        [TestMethod]
+        public void Test_CreateTwoFragments()
+        {
+            var fragments = _sharing.CreateFragments(Convert.FromHexString("00112233445566778899AABBCCDDEEFF"), 2);
+            Assert.IsNotNull(fragments);
+            Assert.IsTrue(fragments.Length == 2);
+            Assert.AreEqual(fragments[0].Length, fragments[1].Length);
+            Assert.AreNotEqual(fragments[0], fragments[1], true);
+        }
+
+        [TestMethod]
+        public void Test_CreateThreeFragments()
+        {
+            var fragments = _sharing.CreateFragments(Convert.FromHexString("00112233445566778899AABBCCDDEEFF"), 3);
+            Assert.IsNotNull(fragments);
+            Assert.IsTrue(fragments.Length == 3);
+            Assert.AreEqual(fragments[0].Length, fragments[1].Length);
+            Assert.AreEqual(fragments[1].Length, fragments[2].Length);
+        }
+    }
+}
diff --git a/KeyManager.Library.UI/Domain/KeyChecksumConverter.cs b/KeyManager.Library.UI/Domain/KeyChecksumConverter.cs
index 606355e..73c840e 100644
--- a/KeyManager.Library.UI/Domain/KeyChecksumConverter.cs
+++ b/KeyManager.Library.UI/Domain/KeyChecksumConverter.cs
@@ -12,6 +12,11 @@ public object Convert(object[] values, Type targetType, object parameter, Cultur
                 return Binding.DoNothing;
             }
 
+            if (value2.KeySize == 0)
+            {
+                return string.Empty;
+            }
+
             if (string.IsNullOrEmpty(value2.GetAggregatedValueString()))
             {
                 return Binding.DoNothing;
diff --git a/KeyManager.Library.UI/Domain/KeyLeakUriConverter.cs b/KeyManager.Library.UI/Domain/KeyLeakUriConverter.cs
index 3af887a..02c3ed8 100644
--- a/KeyManager.Library.UI/Domain/KeyLeakUriConverter.cs
+++ b/KeyManager.Library.UI/Domain/KeyLeakUriConverter.cs
@@ -14,6 +14,13 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
                 return Binding.DoNothing;
             }
 
+            if (key.KeySize == 0)
+            {
+#pragma warning disable CS8603 // Possible null reference return.
+                return null;
+#pragma warning restore CS8603 // Possible null reference return.
+            }
+
             var checksum = new Sha256Checksum();
             string uri = string.Format("https://leak.leosac.com/key/{0}", checksum.ComputeKCV(key, "53656375726974792046726565646f6d"));
             if (targetType == typeof(ImageSource))
diff --git a/KeyManager.Library.UI/KeyCeremonyBeginControl.xaml b/KeyManager.Library.UI/KeyCeremonyBeginControl.xaml
index 4168290..86db4b3 100644
--- a/KeyManager.Library.UI/KeyCeremonyBeginControl.xaml
+++ b/KeyManager.Library.UI/KeyCeremonyBeginControl.xaml
@@ -9,8 +9,8 @@
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="500">
     <StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center">
-        <TextBlock Text="{x:Static properties:Resources.KeyCeremonyWizardStart1}" FontSize="18" />
-        <TextBlock Text="{x:Static properties:Resources.KeyCeremonyWizardStart2}" FontSize="18" />
+        <TextBlock Text="{x:Static properties:Resources.KeyCeremonyWizardStart1}" TextWrapping="Wrap" FontSize="18" Margin="5" />
+        <TextBlock Text="{x:Static properties:Resources.KeyCeremonyWizardStart2}" FontSize="18" Margin="5 20 5 5" />
         <Button Margin="48"
               Command="{x:Static materialDesign:Transitioner.MoveNextCommand}"
               Style="{StaticResource MaterialDesignFloatingActionButton}">
diff --git a/KeyManager.Library.UI/KeyCeremonyFragmentControl.xaml b/KeyManager.Library.UI/KeyCeremonyFragmentControl.xaml
index 498f6ee..8249c63 100644
--- a/KeyManager.Library.UI/KeyCeremonyFragmentControl.xaml
+++ b/KeyManager.Library.UI/KeyCeremonyFragmentControl.xaml
@@ -64,7 +64,7 @@
                     </DockPanel>
                 </materialDesign:Flipper.BackContent>
             </materialDesign:Flipper>
-            <materialDesign:Flipper Style="{StaticResource MaterialDesignCardFlipper}" Visibility="{Binding IsReunification, ElementName=userControl, Converter={StaticResource ReverseBoolToVisibleConverter}}" Margin="3">
+            <materialDesign:Flipper Style="{StaticResource MaterialDesignCardFlipper}" Visibility="{Binding IsReunification, Converter={StaticResource ReverseBoolToVisibleConverter}}" Margin="3">
                 <materialDesign:Flipper.FrontContent>
                     <Button Width="200" MinHeight="100" Margin="8" Command="{x:Static materialDesign:Flipper.FlipCommand}" Style="{StaticResource MaterialDesignFlatButton}">
                         <StackPanel Orientation="Vertical" VerticalAlignment="Center">
diff --git a/KeyManager.Library.UI/KeyCeremonySetupControl.xaml b/KeyManager.Library.UI/KeyCeremonySetupControl.xaml
index 04c32d9..a4f6305 100644
--- a/KeyManager.Library.UI/KeyCeremonySetupControl.xaml
+++ b/KeyManager.Library.UI/KeyCeremonySetupControl.xaml
@@ -24,11 +24,17 @@
         <TextBlock Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Text="{x:Static properties:Resources.KeyCeremonyHelper}" Margin="10"/>
         <wpfappctrls:NumericUpDownControl Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Hint="{x:Static properties:Resources.KeyCeremonyFragments}" HelperText="{x:Static properties:Resources.KeyCeremonyFragmentsHelper}" HorizontalAlignment="Stretch" MaxValue="255" MinValue="2" CurrentValue="{Binding Fragments, Mode=TwoWay, ElementName=userControl}" VerticalAlignment="Center" Margin="10"/>
         <ComboBox Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Margin="10"
-                  ItemsSource="{Binding CeremonyTypes, ElementName=userControl}"
-                  SelectedItem="{Binding SelectedCeremonyType, ElementName=userControl}"
+                  ItemsSource="{Binding SecretSharings, ElementName=userControl}"
+                  SelectedItem="{Binding SelectedSecretSharing, ElementName=userControl}"
                   materialDesign:HintAssist.HelperText="{x:Static properties:Resources.KeyCeremonyTypeHelper}"
-                  materialDesign:HintAssist.Hint="{x:Static properties:Resources.KeyCeremonyType}" />
-        <Button x:Name="btnUnionCeremony" Grid.Row="3" Grid.Column="0" Height="50" Margin="10" Click="BtnUnionCeremony_Click">
+                  materialDesign:HintAssist.Hint="{x:Static properties:Resources.KeyCeremonyType}">
+            <ComboBox.ItemTemplate>
+                <DataTemplate>
+                    <TextBlock Text="{Binding Name}" />
+                </DataTemplate>
+            </ComboBox.ItemTemplate>
+        </ComboBox>
+        <Button x:Name="btnUnionCeremony" Grid.Row="3" Grid.Column="0" Height="50" Margin="10" materialDesign:ButtonAssist.CornerRadius="25" Click="BtnUnionCeremony_Click">
             <Grid>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="40" />
@@ -38,7 +44,7 @@
                 <TextBlock Grid.Column="1" Text="{x:Static properties:Resources.StartUnionKeyCeremony}" Width="160" TextWrapping="Wrap" VerticalAlignment="Center" TextAlignment="Center"/>
             </Grid>
         </Button>
-        <Button x:Name="btnSharingCeremony" Grid.Row="3" Grid.Column="1" Height="50" Margin="10" Click="BtnSharingCeremony_Click">
+        <Button x:Name="btnSharingCeremony" Grid.Row="3" Grid.Column="1" Height="50" Margin="10" materialDesign:ButtonAssist.CornerRadius="25" Click="BtnSharingCeremony_Click">
             <Grid>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="40" />
diff --git a/KeyManager.Library.UI/KeyCeremonySetupControl.xaml.cs b/KeyManager.Library.UI/KeyCeremonySetupControl.xaml.cs
index 6c79daa..0542db6 100644
--- a/KeyManager.Library.UI/KeyCeremonySetupControl.xaml.cs
+++ b/KeyManager.Library.UI/KeyCeremonySetupControl.xaml.cs
@@ -1,8 +1,5 @@
 using Leosac.KeyManager.Library.UI.Domain;
-using SecretSharingDotNet.Cryptography;
-using SecretSharingDotNet.Math;
 using System.Collections.ObjectModel;
-using System.Numerics;
 using System.Windows;
 using System.Windows.Controls;
 
@@ -17,21 +14,21 @@ public partial class KeyCeremonySetupControl : UserControl
 
         public KeyCeremonySetupControl()
         {
-            CeremonyTypes = new ObservableCollection<KeyCeremonyType>(Enum.GetValues<KeyCeremonyType>());
+            SecretSharings = new ObservableCollection<SecretSharing.SecretSharingBase>(SecretSharing.SecretSharingBase.GetAll());
+            SelectedSecretSharing = SecretSharings.FirstOrDefault();
 
             InitializeComponent();
         }
 
-        public ObservableCollection<KeyCeremonyType> CeremonyTypes { get; set; }
+        public ObservableCollection<SecretSharing.SecretSharingBase> SecretSharings { get; set; }
 
-        public KeyCeremonyType SelectedCeremonyType
+        public SecretSharing.SecretSharingBase? SelectedSecretSharing
         {
-            get { return (KeyCeremonyType)GetValue(SelectedCeremonyTypeProperty); }
-            set { SetValue(SelectedCeremonyTypeProperty, value); }
+            get { return (SecretSharing.SecretSharingBase)GetValue(SelectedSecretSharingProperty); }
+            set { SetValue(SelectedSecretSharingProperty, value); }
         }
 
-        public static readonly DependencyProperty SelectedCeremonyTypeProperty = DependencyProperty.Register(nameof(SelectedCeremonyType), typeof(KeyCeremonyType), typeof(KeyCeremonySetupControl),
-            new FrameworkPropertyMetadata(KeyCeremonyType.ShamirSecretSharing));
+        public static readonly DependencyProperty SelectedSecretSharingProperty = DependencyProperty.Register(nameof(SelectedSecretSharing), typeof(SecretSharing.SecretSharingBase), typeof(KeyCeremonySetupControl));
 
         public int Fragments
         {
@@ -52,94 +49,56 @@ public string? KeyValue
 
         private void BtnUnionCeremony_Click(object sender, RoutedEventArgs e)
         {
-            var model = new KeyCeremonyDialogViewModel
+            if (SelectedSecretSharing != null)
             {
-                IsReunification = true,
-                Fragments = new ObservableCollection<string>(new string[Fragments])
-            };
-            var dialog = new KeyCeremonyDialog
-            {
-                DataContext = model
-            };
-            if (dialog.ShowDialog() == true)
-            {
-                try
+                var model = new KeyCeremonyDialogViewModel
                 {
-                    KeyValue = ComputeFragments(SelectedCeremonyType, model.Fragments.ToArray());
-                }
-                catch (Exception ex)
+                    IsReunification = true,
+                    Fragments = new ObservableCollection<string>(new string[Fragments])
+                };
+                var dialog = new KeyCeremonyDialog
+                {
+                    DataContext = model
+                };
+                if (dialog.ShowDialog() == true)
                 {
-                    log.Error("Error during the key ceremony.", ex);
-                    MessageBox.Show(ex.Message, Properties.Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
+                    try
+                    {
+                        var key = SelectedSecretSharing.ComputeFragments(model.Fragments.ToArray());
+                        KeyValue = key != null ? Convert.ToHexString(key) : string.Empty;
+                    }
+                    catch (Exception ex)
+                    {
+                        log.Error("Error during the key ceremony.", ex);
+                        MessageBox.Show(ex.Message, Properties.Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
+                    }
                 }
             }
         }
 
         private void BtnSharingCeremony_Click(object sender, RoutedEventArgs e)
         {
-            var model = new KeyCeremonyDialogViewModel
-            {
-                IsReunification = false
-            };
-            var fragments = CreateFragments(SelectedCeremonyType, KeyValue, Fragments);
-            foreach (var fragment in fragments)
-            {
-                model.Fragments.Add(fragment);
-            }
-
-            var dialog = new KeyCeremonyDialog
-            {
-                DataContext = model
-            };
-            dialog.ShowDialog();
-        }
-
-        private static string[] CreateFragments(KeyCeremonyType ceremonyType, string? keyValue, int nbFragments)
-        {
-            throw new NotImplementedException();
-        }
-
-        private static string ComputeFragments(KeyCeremonyType ceremonyType, string[] fragments)
-        {
-            string keystr = string.Empty;
-            switch (ceremonyType)
+            if (SelectedSecretSharing != null && !string.IsNullOrEmpty(KeyValue))
             {
-                case KeyCeremonyType.Concat:
-                    {
-                        keystr = string.Join("", fragments);
-                    }
-                    break;
-
-                case KeyCeremonyType.Xor:
+                var model = new KeyCeremonyDialogViewModel
+                {
+                    IsReunification = false
+                };
+                var fragments = SelectedSecretSharing.CreateFragments(Convert.FromHexString(KeyValue), Fragments);
+                if (fragments != null)
+                {
+                    foreach (var fragment in fragments)
                     {
-                        if (fragments.Length > 0)
-                        {
-                            var key = new byte[fragments[0].Length];
-                            foreach (string fragment in fragments)
-                            {
-                                var keyb = Convert.FromHexString(fragment);
-                                for (int i = 0; i < key.Length && i < keyb.Length; ++i)
-                                {
-                                    key[i] ^= keyb[i];
-                                }
-                            }
-                            keystr = Convert.ToHexString(key);
-                        }
+                        model.Fragments.Add(fragment);
                     }
-                    break;
 
-                default:
+                    var dialog = new KeyCeremonyDialog
                     {
-                        var gcd = new ExtendedEuclideanAlgorithm<BigInteger>();
-                        var combine = new ShamirsSecretSharing<BigInteger>(gcd);
-                        var shares = string.Join(Environment.NewLine, fragments);
-                        var secret = combine.Reconstruction(shares);
-                        var key = secret.ToByteArray();
-                        keystr = Convert.ToHexString(key);
-                    }
-                    break;
+                        DataContext = model
+                    };
+                    dialog.ShowDialog();
+                }
             }
-            return keystr;
         }
     }
 }
diff --git a/KeyManager.Library.UI/KeyCeremonyType.cs b/KeyManager.Library.UI/KeyCeremonyType.cs
deleted file mode 100644
index fad4f37..0000000
--- a/KeyManager.Library.UI/KeyCeremonyType.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace Leosac.KeyManager.Library.UI
-{
-    public enum KeyCeremonyType
-    {
-        [Display(Name = "Concatenation")]
-        Concat,
-        [Display(Name = "Xor")]
-        Xor,
-        [Display(Name = "Shamir Secret Sharing")]
-        ShamirSecretSharing
-    }
-}
diff --git a/KeyManager.Library.UI/KeyEntriesControl.xaml b/KeyManager.Library.UI/KeyEntriesControl.xaml
index 60ccbb4..344a6b5 100644
--- a/KeyManager.Library.UI/KeyEntriesControl.xaml
+++ b/KeyManager.Library.UI/KeyEntriesControl.xaml
@@ -36,7 +36,7 @@
                         PlacementMode="BottomAndAlignCentres"
                         ToolTip="{x:Static properties:Resources.NewKeyEntry}" Margin="5"
                         Style="{StaticResource MaterialDesignMultiFloatingActionPopupBox}"
-                        Visibility="{Binding KeyStore.CanCreateKeyEntries, Converter={StaticResource BoolToVisibleConverter}}">
+                        IsEnabled="{Binding KeyStore.CanCreateKeyEntries}">
                         <materialDesign:PopupBox.ToggleContent>
                             <materialDesign:PackIcon Kind="KeyAdd" Height="24" Width="24" Cursor="Hand" />
                         </materialDesign:PopupBox.ToggleContent>
diff --git a/KeyManager.Library.UI/KeyManager.Library.UI.csproj b/KeyManager.Library.UI/KeyManager.Library.UI.csproj
index 6d8b608..1ba31bb 100644
--- a/KeyManager.Library.UI/KeyManager.Library.UI.csproj
+++ b/KeyManager.Library.UI/KeyManager.Library.UI.csproj
@@ -34,7 +34,6 @@
     <PackageReference Include="MaterialDesignThemes" Version="4.9.0" />
     <PackageReference Include="Net.Codecrete.QrCodeGenerator" Version="2.0.4" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="SecretSharingDotNet" Version="0.10.2" />
     <PackageReference Include="SkiaSharp" Version="2.88.6" />
   </ItemGroup>
 
diff --git a/KeyManager.Library.UI/Properties/Resources.Designer.cs b/KeyManager.Library.UI/Properties/Resources.Designer.cs
index 4221386..041bda7 100644
--- a/KeyManager.Library.UI/Properties/Resources.Designer.cs
+++ b/KeyManager.Library.UI/Properties/Resources.Designer.cs
@@ -511,7 +511,7 @@ public static string KeyCeremonyWizardEnd2 {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Gather all required individuals and/or prepare all key fragments..
+        ///   Looks up a localized string similar to Gather all required individuals, prepare all key fragments materials, ensure the environment match the minimal security requirements..
         /// </summary>
         public static string KeyCeremonyWizardStart1 {
             get {
diff --git a/KeyManager.Library.UI/Properties/Resources.fr.resx b/KeyManager.Library.UI/Properties/Resources.fr.resx
index d3de976..0ffcd58 100644
--- a/KeyManager.Library.UI/Properties/Resources.fr.resx
+++ b/KeyManager.Library.UI/Properties/Resources.fr.resx
@@ -268,7 +268,7 @@
     <value>Appuyez sur le bouton 'Terminer' afin de terminer la cérémonie.</value>
   </data>
   <data name="KeyCeremonyWizardStart1" xml:space="preserve">
-    <value>Rassemblez tous les individus requis et/ou préparez les fragments de clé.</value>
+    <value>Rassemblez tous les individus requis, préparez les supports des fragments, assurez-vous que l'environnement respecte les exigences de sécurité.</value>
   </data>
   <data name="KeyCeremonyWizardStart2" xml:space="preserve">
     <value>Lorsque vous êtes prêt, allez à l'étape suivante.</value>
diff --git a/KeyManager.Library.UI/Properties/Resources.resx b/KeyManager.Library.UI/Properties/Resources.resx
index 1ffba76..f381b03 100644
--- a/KeyManager.Library.UI/Properties/Resources.resx
+++ b/KeyManager.Library.UI/Properties/Resources.resx
@@ -268,7 +268,7 @@
     <value>Press the 'Finish' button to complete the ceremony.</value>
   </data>
   <data name="KeyCeremonyWizardStart1" xml:space="preserve">
-    <value>Gather all required individuals and/or prepare all key fragments.</value>
+    <value>Gather all required individuals, prepare all key fragments materials, ensure the environment match the minimal security requirements.</value>
   </data>
   <data name="KeyCeremonyWizardStart2" xml:space="preserve">
     <value>When ready, go to the next step.</value>
diff --git a/KeyManager.Library.UI/SymmetricKeyGenerationDialog.xaml.cs b/KeyManager.Library.UI/SymmetricKeyGenerationDialog.xaml.cs
index 6c3e59f..1637c06 100644
--- a/KeyManager.Library.UI/SymmetricKeyGenerationDialog.xaml.cs
+++ b/KeyManager.Library.UI/SymmetricKeyGenerationDialog.xaml.cs
@@ -77,12 +77,12 @@ public int SelectedWordIndex
 
         private void BtnRandom_Click(object sender, RoutedEventArgs e)
         {
-            KeyValue = KeyGeneration.Random((uint)(KeySize > 0 ? KeySize : 16));
+            KeyValue = Convert.ToHexString(KeyGeneration.Random((uint)(KeySize > 0 ? KeySize : 16)));
         }
 
         private void BtnPassword_Click(object sender, RoutedEventArgs e)
         {
-            KeyValue = KeyGeneration.FromPassword(tbxPassword.Password, tbxSalt.Text, KeySize);
+            KeyValue = Convert.ToHexString(KeyGeneration.FromPassword(tbxPassword.Password, tbxSalt.Text, KeySize));
         }
 
         private void BtnImportMnemonic_Click(object sender, RoutedEventArgs e)
diff --git a/KeyManager.Library/Key.cs b/KeyManager.Library/Key.cs
index c912420..7a3e8f1 100644
--- a/KeyManager.Library/Key.cs
+++ b/KeyManager.Library/Key.cs
@@ -50,10 +50,6 @@ public Key(IEnumerable<string>? tags, string value) : this(tags, 0, value)
         public Key(IEnumerable<string>? tags, uint keySize, string value) : this(tags, keySize, 0)
         {
             Materials.Add(new KeyMaterial(value));
-            if (keySize == 0)
-            {
-                KeySize = (uint)Materials[0].GetValueBinary()!.Length;
-            }
         }
 
         public Key(IEnumerable<string>? tags, uint keySize, params KeyMaterial[] materials) : this(tags, keySize, 0)
diff --git a/KeyManager.Library/KeyChecksum.cs b/KeyManager.Library/KeyChecksum.cs
index 7432290..b450072 100644
--- a/KeyManager.Library/KeyChecksum.cs
+++ b/KeyManager.Library/KeyChecksum.cs
@@ -26,7 +26,12 @@ public string ComputeKCV(IEnumerable<string> tags, string key, string? iv)
             {
                 ivb = Convert.FromHexString(iv);
             }
-            return Convert.ToHexString(ComputeKCV(new Key(tags, key), ivb));
+            uint keySize = 0;
+            if (!string.IsNullOrEmpty(key))
+            {
+                keySize = (uint)key.Length / 2;
+            }
+            return Convert.ToHexString(ComputeKCV(new Key(tags, keySize, key), ivb));
         }
 
         public string ComputeKCV(Key key, string? iv)
diff --git a/KeyManager.Library/KeyGeneration.cs b/KeyManager.Library/KeyGeneration.cs
index 88314a1..161a931 100644
--- a/KeyManager.Library/KeyGeneration.cs
+++ b/KeyManager.Library/KeyGeneration.cs
@@ -5,29 +5,24 @@ namespace Leosac.KeyManager.Library
 {
     public static class KeyGeneration
     {
-        public static string Random(uint keySize)
+        public static byte[] Random(uint keySize)
         {
             using var rng = RandomNumberGenerator.Create();
             var key = new byte[keySize];
             rng.GetBytes(key);
-            return Convert.ToHexString(key);
+            return key;
         }
 
-        public static string FromPassword(string password, string salt, int keySize)
+        public static byte[] FromPassword(string password, string salt, int keySize)
         {
             var deriv = new Rfc2898DeriveBytes(password, Encoding.UTF8.GetBytes(salt), 10000, HashAlgorithmName.SHA256);
             var key = deriv.GetBytes(keySize);
-            return Convert.ToHexString(key);
+            return key;
         }
 
         public static byte[] CreateRandomSalt(uint length)
         {
-            byte[] randBytes = (length >= 1) ? new byte[length] : new byte[1];
-            using (var rng = RandomNumberGenerator.Create())
-            {
-                rng.GetBytes(randBytes);
-            }
-            return randBytes;
+            return Random(length >= 1 ? length : 1);
         }
     }
 }
diff --git a/KeyManager.Library/KeyManager.Library.csproj b/KeyManager.Library/KeyManager.Library.csproj
index e968dcb..c6ebbfa 100644
--- a/KeyManager.Library/KeyManager.Library.csproj
+++ b/KeyManager.Library/KeyManager.Library.csproj
@@ -40,6 +40,7 @@
     <PackageReference Include="Crc32.NET" Version="1.2.0" />
     <PackageReference Include="log4net" Version="2.0.15" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="SecretSharingDotNet" Version="0.10.2" />
   </ItemGroup>
 
 </Project>
diff --git a/KeyManager.Library/KeyStore/KeyStore.cs b/KeyManager.Library/KeyStore/KeyStore.cs
index 2c6ea26..5dbbaff 100644
--- a/KeyManager.Library/KeyStore/KeyStore.cs
+++ b/KeyManager.Library/KeyStore/KeyStore.cs
@@ -133,7 +133,7 @@ public virtual async Task<KeyEntryId> Generate(KeyEntry keyEntry)
                     {
                         foreach (var m in kv.Key.Materials)
                         {
-                            m.Value = KeyGeneration.Random(kv.Key.KeySize);
+                            m.SetValueBinary(KeyGeneration.Random(kv.Key.KeySize));
                         }
                     }
                 }
diff --git a/KeyManager.Library/SecretSharing/ConcatSecretSharing.cs b/KeyManager.Library/SecretSharing/ConcatSecretSharing.cs
new file mode 100644
index 0000000..22b77a8
--- /dev/null
+++ b/KeyManager.Library/SecretSharing/ConcatSecretSharing.cs
@@ -0,0 +1,38 @@
+namespace Leosac.KeyManager.Library.SecretSharing
+{
+    public class ConcatSecretSharing : SecretSharingBase
+    {
+        public override string Name => "Concatenation";
+
+        public override string[]? CreateFragments(byte[]? secret, int nbFragments)
+        {
+            if (secret == null || secret.Length == 0)
+            {
+                return null;
+            }
+            if (secret.Length < nbFragments)
+            {
+                throw new ArgumentException("The number of fragments exceed the secret length.", nameof(nbFragments));
+            }
+            if (nbFragments < 2)
+            {
+                throw new ArgumentException("The number of fragments should at least be 2.", nameof(nbFragments));
+            }
+
+            var str = Convert.ToHexString(secret);
+            var fragments = new string[nbFragments];
+            var length = (int)Math.Ceiling((double)str.Length / nbFragments);
+            for (int i = 0; i < nbFragments; i++)
+            {
+                var clength = (i + 1) < nbFragments ? length : (str.Length - i * length);
+                fragments[i] = str.Substring(i * length, clength);
+            }
+            return fragments;
+        }
+
+        public override byte[]? ComputeFragments(string[] fragments)
+        {
+            return Convert.FromHexString(string.Join("", fragments));
+        }
+    }
+}
diff --git a/KeyManager.Library/SecretSharing/SecretSharingBase.cs b/KeyManager.Library/SecretSharing/SecretSharingBase.cs
new file mode 100644
index 0000000..3236fae
--- /dev/null
+++ b/KeyManager.Library/SecretSharing/SecretSharingBase.cs
@@ -0,0 +1,21 @@
+namespace Leosac.KeyManager.Library.SecretSharing
+{
+    public abstract class SecretSharingBase
+    {
+        public abstract string Name { get; }
+
+        public abstract string[]? CreateFragments(byte[]? secret, int nbFragments);
+
+        public abstract byte[]? ComputeFragments(string[] fragments);
+
+        public static IList<SecretSharingBase> GetAll()
+        {
+            return new List<SecretSharingBase>
+            {
+                new ShamirsSecretSharing(),
+                new ConcatSecretSharing(),
+                new XorSecretSharing()
+            };
+        }
+    }
+}
diff --git a/KeyManager.Library/SecretSharing/ShamirsSecretSharing.cs b/KeyManager.Library/SecretSharing/ShamirsSecretSharing.cs
new file mode 100644
index 0000000..9dbfa38
--- /dev/null
+++ b/KeyManager.Library/SecretSharing/ShamirsSecretSharing.cs
@@ -0,0 +1,40 @@
+using System.Numerics;
+
+namespace Leosac.KeyManager.Library.SecretSharing
+{
+    public class ShamirsSecretSharing : SecretSharingBase
+    {
+        public override string Name => "Shamir's Secret Sharing";
+
+        public override string[]? CreateFragments(byte[]? secret, int nbFragments)
+        {
+            if (secret == null || secret.Length == 0)
+            {
+                return null;
+            }
+            if (nbFragments < 3)
+            {
+                throw new ArgumentException("The number of fragments should at least be 3.", nameof(nbFragments));
+            }
+            var min = (int)Math.Ceiling((double)nbFragments * 2 / 3);
+            var gcd = new SecretSharingDotNet.Math.ExtendedEuclideanAlgorithm<BigInteger>();
+            var sss = new SecretSharingDotNet.Cryptography.ShamirsSecretSharing<BigInteger>(gcd);
+            var shares = sss.MakeShares(min, nbFragments, secret);
+            var fragments = new string[shares.Count];
+            for (int i = 0; i < fragments.Length; ++i)
+            {
+                fragments[i] = shares[i].ToString();
+            }
+            return fragments;
+        }
+
+        public override byte[]? ComputeFragments(string[] fragments)
+        {
+            var gcd = new SecretSharingDotNet.Math.ExtendedEuclideanAlgorithm<BigInteger>();
+            var combine = new SecretSharingDotNet.Cryptography.ShamirsSecretSharing<BigInteger>(gcd);
+            var shares = string.Join(Environment.NewLine, fragments);
+            var secret = combine.Reconstruction(shares);
+            return secret.ToByteArray();
+        }
+    }
+}
diff --git a/KeyManager.Library/SecretSharing/XorSecretSharing.cs b/KeyManager.Library/SecretSharing/XorSecretSharing.cs
new file mode 100644
index 0000000..77162de
--- /dev/null
+++ b/KeyManager.Library/SecretSharing/XorSecretSharing.cs
@@ -0,0 +1,64 @@
+namespace Leosac.KeyManager.Library.SecretSharing
+{
+    public class XorSecretSharing : SecretSharingBase
+    {
+        public override string Name => "Xor";
+
+        public override string[]? CreateFragments(byte[]? secret, int nbFragments)
+        {
+            if (secret == null || secret.Length == 0)
+            {
+                return null;
+            }
+            if (secret.Length < nbFragments)
+            {
+                throw new ArgumentException("The number of fragments exceed the secret length.", nameof(nbFragments));
+            }
+            if (nbFragments < 2)
+            {
+                throw new ArgumentException("The number of fragments should at least be 2.", nameof(nbFragments));
+            }
+
+            var chunks = new byte[nbFragments][];
+            for (int c = 0; c < nbFragments; ++c)
+            {
+                chunks[c] = KeyGeneration.Random((uint)secret.Length);
+            }
+            for (int i = 0; i < secret.Length; ++i)
+            {
+                var b = secret[i];
+                for (int c = 1; c < nbFragments; ++c)
+                {
+                    b ^= chunks[c][i];
+                }
+                chunks[0][i] = b;
+            }
+
+            var fragments = new string[nbFragments];
+            for (int c = 0; c < nbFragments; ++c)
+            {
+                fragments[c] = Convert.ToHexString(chunks[c]);
+            }
+            return fragments;
+        }
+
+        public override byte[]? ComputeFragments(string[] fragments)
+        {
+            if (fragments.Length == 0)
+            {
+                return null;
+            }
+
+            var key = new byte[fragments[0].Length / 2];
+            foreach (string fragment in fragments)
+            {
+                var keyb = Convert.FromHexString(fragment);
+                for (int i = 0; i < key.Length && i < keyb.Length; ++i)
+                {
+                    key[i] ^= keyb[i];
+                }
+            }
+            return key;
+        }
+    }
+}