From f074eb8c2efb2b49ddb86c718b483265ffe38cd0 Mon Sep 17 00:00:00 2001
From: Ronald Aigner <ronald.aigner@microsoft.com>
Date: Mon, 4 Jun 2018 21:00:08 -0700
Subject: [PATCH] fix crash and new release with fix

---
 HashCalculator/Package.appxmanifest        |  2 +-
 HashCalculator/Views/PermutateHash.xaml    |  6 +++---
 HashCalculator/Views/PermutateHash.xaml.cs | 23 ++++++++++++++++------
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/HashCalculator/Package.appxmanifest b/HashCalculator/Package.appxmanifest
index 2d5cd86..f839a31 100644
--- a/HashCalculator/Package.appxmanifest
+++ b/HashCalculator/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
-  <Identity Name="15288RonaldAigner.TPMPCRCalculator" Publisher="CN=F0305663-AD67-4176-BA71-C858A3680A99" Version="1.2.3.0" />
+  <Identity Name="15288RonaldAigner.TPMPCRCalculator" Publisher="CN=F0305663-AD67-4176-BA71-C858A3680A99" Version="1.3.0.0" />
   <mp:PhoneIdentity PhoneProductId="46ab5a51-8729-472c-b2ac-2e7bebf98a66" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>TPM PCR Calculator</DisplayName>
diff --git a/HashCalculator/Views/PermutateHash.xaml b/HashCalculator/Views/PermutateHash.xaml
index 3bc3f38..306de0f 100644
--- a/HashCalculator/Views/PermutateHash.xaml
+++ b/HashCalculator/Views/PermutateHash.xaml
@@ -74,11 +74,11 @@
                     <TextBox Grid.Row="3" Grid.Column="0" x:Name="ExpectedResultHash" Margin="20,10,10,10" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" PlaceholderText="Insert expected result hash" FontFamily="Consolas" />
                     <Button Grid.Row="3" Grid.Column="1" x:Name="PermutateHashes" Content="Permutate" Margin="10,10,20,10" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Click="PermutateHashes_Click" />
                     <CheckBox Grid.Row="4" Grid.Column="0" x:Name="DontChangeHashOrder" Content="Do not change order of hashes" HorizontalAlignment="Left" VerticalAlignment="Top" Style="{StaticResource BodyTextBlockStyle}" Margin="20,10" ToolTipService.ToolTip="Select this checkbox to only test different initialization values of a PCR."/>
-                    <Button Grid.Row="4" Grid.Column="1" x:Name="Cancel" Content="Cancel" Margin="20,10" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Click="Cancel_Click" />
+                    <Button Grid.Row="4" Grid.Column="1" x:Name="Cancel" Content="Cancel" Margin="10,10,20,10" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Click="Cancel_Click" />
                     <TextBlock Grid.Row="5" Grid.ColumnSpan="2" HorizontalAlignment="Left" Margin="20,10" Text="List of hashes to test with:" Style="{StaticResource BodyTextBlockStyle}" VerticalAlignment="Top" />
-                    <ListView Grid.Row="6" Grid.ColumnSpan="2" x:Name="Hashes" Margin="20,10" HorizontalAlignment="Stretch" VerticalAlignment="Top" FontFamily="Consolas" BorderBrush="{StaticResource ListBoxBorderThemeBrush}"/>
+                    <ListView Grid.Row="6" Grid.ColumnSpan="2" x:Name="Hashes" Margin="20,10" HorizontalAlignment="Stretch" VerticalAlignment="Top" FontFamily="Consolas" />
                     <TextBlock Grid.Row="7" Grid.ColumnSpan="2" HorizontalAlignment="Left" Margin="20,10" Text="Order of hashes used to compute expected value" VerticalAlignment="Top" Style="{StaticResource BodyTextBlockStyle}" />
-                    <ListView Grid.Row="8" Grid.ColumnSpan="2" x:Name="ResultHashes" Margin="20,10" HorizontalAlignment="Stretch" VerticalAlignment="Top" FontFamily="Consolas"  BorderBrush="{StaticResource ListBoxBorderThemeBrush}"/>
+                    <ListView Grid.Row="8" Grid.ColumnSpan="2" x:Name="ResultHashes" Margin="20,10" HorizontalAlignment="Stretch" VerticalAlignment="Top" FontFamily="Consolas" />
                     <ProgressBar Grid.Row="8" Grid.Column="2" x:Name="PercentComputed" Margin="20,10" Visibility="Collapsed" HorizontalAlignment="Stretch" VerticalAlignment="Top" />
                 </Grid>
             </StackPanel>
diff --git a/HashCalculator/Views/PermutateHash.xaml.cs b/HashCalculator/Views/PermutateHash.xaml.cs
index 8b9325d..cb6580f 100644
--- a/HashCalculator/Views/PermutateHash.xaml.cs
+++ b/HashCalculator/Views/PermutateHash.xaml.cs
@@ -140,16 +140,16 @@ protected override void OnNavigatedFrom(NavigationEventArgs e)
 
         private void AddHash_Click(object sender, RoutedEventArgs e)
         {
-            string hash = HashToAdd.Text.Trim();
+            ResultHashes.Items.Clear();
             try
             {
+                string hash = HashToAdd.Text.Trim();
                 Worker.ValidateIsHash((string)ListOfAlgorithms.SelectedItem, hash);
                 Hashes.Items.Add(hash);
                 HashToAdd.Text = "";
             }
             catch (Exception ex)
             {
-                ResultHashes.Items.Clear();
                 ResultHashes.Items.Add(ex.Message);
             }
         }
@@ -165,20 +165,28 @@ private void Reset_Click(object sender, RoutedEventArgs e)
         private async void PermutateHashes_Click(object sender, RoutedEventArgs e)
         {
             bool found = false;
+            ResultHashes.Items.Clear();
             try
             {
-                cts = new CancellationTokenSource();
+                Worker.ValidateIsHash((string)ListOfAlgorithms.SelectedItem, ExpectedResultHash.Text.Trim());
 
-                ResultHashes.Items.Clear();
+                cts = new CancellationTokenSource();
                 found = await CheckAndUpdateAsync(cts.Token);
             }
             catch (OperationCanceledException)
             {
                 ResultHashes.Items.Add("Computation cancelled.");
             }
-            catch (Exception)
+            catch (Exception ex)
             {
-                ResultHashes.Items.Add("Computation failed.");
+                if (string.IsNullOrEmpty(ex.Message))
+                {
+                    ResultHashes.Items.Add("Computation failed.");
+                }
+                else
+                {
+                    ResultHashes.Items.Add(ex.Message);
+                }
             }
             finally
             {
@@ -238,6 +246,9 @@ private async Task<List<string>> CheckAndUpdateAsync(string algorithm, int initi
 
         private async Task<bool> CheckAndUpdateAsync(CancellationToken ct)
         {
+            if (Hashes.Items.Count == 0)
+                return false;
+
             int[] singlePermutation = new int[Hashes.Items.Count];
             for (int i = 0; i < Hashes.Items.Count; i++)
                 singlePermutation[i] = i;