Added changes after the merge.

.gitattributes

@@ -0,0 +1,63 @@
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+* text=auto
+
+###############################################################################
+# Set default behavior for command prompt diff.
+#
+# This is need for earlier builds of msysgit that does not have it on by
+# default for csharp files.
+# Note: This is only used by command line
+###############################################################################
+#*.cs     diff=csharp
+
+###############################################################################
+# Set the merge driver for project and solution files
+#
+# Merging from the command prompt will add diff markers to the files if there
+# are conflicts (Merging from VS is not affected by the settings below, in VS
+# the diff markers are never inserted). Diff markers may cause the following 
+# file extensions to fail to load in VS. An alternative would be to treat
+# these files as binary and thus will always conflict and require user
+# intervention with every merge. To do so, just uncomment the entries below
+###############################################################################
+#*.sln       merge=binary
+#*.csproj    merge=binary
+#*.vbproj    merge=binary
+#*.vcxproj   merge=binary
+#*.vcproj    merge=binary
+#*.dbproj    merge=binary
+#*.fsproj    merge=binary
+#*.lsproj    merge=binary
+#*.wixproj   merge=binary
+#*.modelproj merge=binary
+#*.sqlproj   merge=binary
+#*.wwaproj   merge=binary
+
+###############################################################################
+# behavior for image files
+#
+# image files are treated as binary by default.
+###############################################################################
+#*.jpg   binary
+#*.png   binary
+#*.gif   binary
+
+###############################################################################
+# diff behavior for common document formats
+# 
+# Convert binary document formats to text before diffing them. This feature
+# is only available from the command line. Turn it on by uncommenting the 
+# entries below.
+###############################################################################
+#*.doc   diff=astextplain
+#*.DOC   diff=astextplain
+#*.docx  diff=astextplain
+#*.DOCX  diff=astextplain
+#*.dot   diff=astextplain
+#*.DOT   diff=astextplain
+#*.pdf   diff=astextplain
+#*.PDF   diff=astextplain
+#*.rtf   diff=astextplain
+#*.RTF   diff=astextplain

Nuget/Package.nuspec

@@ -2,34 +2,50 @@
 <package >
   <metadata>
     <id>HaemmerElectronics.SeppPenner.WindowsHello</id>
-    <version>1.0.2.0</version>
+    <version>1.0.4.0</version>
     <authors>SeppPenner</authors>
     <owners>SeppPenner</owners>
-    <licenseUrl>https://github.com/SeppPenner/WindowsHello/blob/master/License.txt</licenseUrl>
     <projectUrl>https://github.com/SeppPenner/WindowsHello/</projectUrl>
-    <iconUrl>https://github.com/SeppPenner/WindowsHello/blob/master/Windows.ico?raw=true</iconUrl>
+    <summary>
+	  WindowsHello is an assembly/ library to work with Microsoft's Windows Hello in aplications.
+	</summary>
+	<title>AESCryptoLib from SeppPenner</title>
+	<icon>images\Icon.png</icon>
+	<license type="file">License.txt</license>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <description>
-		WindowsHello is an assembly/ library to work with [Microsoft's Windows Hello](https://support.microsoft.com/de-de/help/17215/windows-10-what-is-hello) in aplications.
-		The assembly was written and tested in .Net 4.8.
+	  WindowsHello is an assembly/ library to work with [Microsoft's Windows Hello](https://support.microsoft.com/de-de/help/17215/windows-10-what-is-hello) in aplications.
+	  The assembly was written and tested in .Net 4.8.
 	</description>
     <releaseNotes>
-	    Version 1.0.2.0 (2019-06-23): Added icon to the nuget package.
-		Version 1.0.0.1 (2019-05-05): Updated .Net version to 4.8.
-		Version 1.0.0.0 (2019-02-09): 1.0 release.
+	  Version 1.0.4.0 (2019-11-18): Fixed security bug.
 	</releaseNotes>
     <copyright>Copyright © Hämmer Electronics</copyright>
     <tags>c# csharp windows hello windows-hello</tags>
+	<dependencies>
+      <group targetFramework="net45">   
+      </group>
+	  <group targetFramework="net46">
+      </group>
+	  <group targetFramework="net47">	
+      </group>
+	  <group targetFramework="net48"> 
+      </group>
+	  <group targetFramework="net462">
+      </group>
+	  <group targetFramework="net472">   
+      </group>
+    </dependencies>
   </metadata>
   <files>
-		<file src="README.md" target="lib/" />
-		<file src="License.txt" target="lib/" />
-		<file src="Documentation\**" target="lib\Documentation" />
-		<file src=".Net 4.5\**" target="lib\net45" />
-		<file src=".Net 4.6\**" target="lib\net46" />
-		<file src=".Net 4.6.2\**" target="lib\net462" />
-		<file src=".Net 4.7\**" target="lib\net47" />
-		<file src=".Net 4.7.2\**" target="lib\net472" />
-		<file src=".Net 4.8\**" target="lib\net48" />
-    </files>
+	  <file src="README.md" target="" />
+	  <file src="License.txt" target="" />
+	  <file src="Source\net45\**" target="lib\net45" />
+	  <file src="Source\net46\**" target="lib\net46" />
+	  <file src="Source\net462\**" target="lib\net462" />
+	  <file src="Source\net47\**" target="lib\net47" />
+	  <file src="Source\net472\**" target="lib\net472" />
+	  <file src="Source\net48\**" target="lib\net48" />
+	  <file src="..\Icon.png" target="images\" />
+   </files>
 </package>

Nuget/README.md

@@ -8,10 +8,11 @@ The assembly was written and tested in .Net 4.8.
 [![GitHub issues](https://img.shields.io/github/issues/SeppPenner/WindowsHello.svg)](https://github.com/SeppPenner/WindowsHello/issues)
 [![GitHub forks](https://img.shields.io/github/forks/SeppPenner/WindowsHello.svg)](https://github.com/SeppPenner/WindowsHello/network)
 [![GitHub stars](https://img.shields.io/github/stars/SeppPenner/WindowsHello.svg)](https://github.com/SeppPenner/WindowsHello/stargazers)
-[![GitHub license](https://img.shields.io/badge/license-AGPL-blue.svg)](https://raw.githubusercontent.com/SeppPenner/WindowsHello/master/License.txt)
+[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://raw.githubusercontent.com/SeppPenner/WindowsHello/master/License.txt)
 [![Nuget](https://img.shields.io/badge/WindowsHello-Nuget-brightgreen.svg)](https://www.nuget.org/packages/HaemmerElectronics.SeppPenner.WindowsHello/)
 [![NuGet Downloads](https://img.shields.io/nuget/dt/HaemmerElectronics.SeppPenner.WindowsHello.svg)](https://www.nuget.org/packages/HaemmerElectronics.SeppPenner.WindowsHello/)
 [![Known Vulnerabilities](https://snyk.io/test/github/SeppPenner/WindowsHello/badge.svg)](https://snyk.io/test/github/SeppPenner/WindowsHello)
+[![Gitter](https://badges.gitter.im/WindowsHello2/community.svg)](https://gitter.im/WindowsHello2/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
 ## Available for
 * NetFramework 4.5
@@ -21,7 +22,21 @@ The assembly was written and tested in .Net 4.8.
 * NetFramework 4.7.2
 * NetFramework 4.8
 
-## Basic usage:
+## Basic usage (Version 1.0.4.0 and above):
+```csharp
+public void WindowsHelloTest()
+{
+    var handle = new IntPtr();
+    var data = new byte[] { 0x32, 0x32 };
+    var provider = WinHelloProvider.CreateInstance("Hello", handle);
+	// Set the persistent key name if you want:
+	provider.SetPersistentKeyName("Test");
+    var encryptedData = provider.Encrypt(data);
+    var decryptedData = provider.PromptToDecrypt(encryptedData);
+}
+```
+
+## Basic usage (Before version 1.0.4.0):
 ```csharp
 public void WindowsHelloTest()
 {
@@ -41,6 +56,8 @@ This project is mainly taken from https://github.com/sirAndros/KeePassWinHello.
 Change history
 --------------
 
+* **Version 1.0.4.0 (2019-11-18)** : Fixed security bug (Thanks to [@Angelelz](https://github.com/Angelelz)).
+* **Version 1.0.3.0 (2019-11-08)** : Updated nuget packages.
 * **Version 1.0.2.0 (2019-06-23)** : Added icon to the nuget package.
 * **Version 1.0.0.1 (2019-05-05)** : Updated .Net version to 4.8.
 * **Version 1.0.0.0 (2019-02-09)** : 1.0 release.