Correct implementation of SHA512 with WinRT in KeepassLib

ModernKeePassLib.Test/Serialization/KdbxFileTests.cs

@@ -1,6 +1,7 @@
 using NUnit.Framework;
 using System;
 using System.Drawing;
+using System.Globalization;
 using System.IO;
 using System.Text;
 using System.Text.RegularExpressions;
@@ -40,15 +41,15 @@ namespace ModernKeePassLib.Test.Shared.Serialization
           "\t<Meta>\r\n" +
           "\t\t<Generator>" + testLocalizedAppName + "</Generator>\r\n" +
           "\t\t<DatabaseName>" + testDatabaseName + "</DatabaseName>\r\n" +
-          "\t\t<DatabaseNameChanged>2015-03-14T03:15:26Z</DatabaseNameChanged>\r\n" +
+          "\t\t<DatabaseNameChanged>2017-10-23T08:03:55Z</DatabaseNameChanged>\r\n" +
           "\t\t<DatabaseDescription>" + testDatabaseDescription + "</DatabaseDescription>\r\n" +
-          "\t\t<DatabaseDescriptionChanged>2015-03-14T03:15:26Z</DatabaseDescriptionChanged>\r\n" +
+          "\t\t<DatabaseDescriptionChanged>2017-10-23T08:03:55Z</DatabaseDescriptionChanged>\r\n" +
           "\t\t<DefaultUserName>" + testDefaultUserName + "</DefaultUserName>\r\n" +
-          "\t\t<DefaultUserNameChanged>2015-03-14T03:15:26Z</DefaultUserNameChanged>\r\n" +
+          "\t\t<DefaultUserNameChanged>2017-10-23T08:03:55Z</DefaultUserNameChanged>\r\n" +
           "\t\t<MaintenanceHistoryDays>365</MaintenanceHistoryDays>\r\n" +
           //"\t\t<Color>" + testColor + "</Color>\r\n" +
           "\t\t<Color></Color>\r\n" +
-          "\t\t<MasterKeyChanged>2015-03-14T03:15:26Z</MasterKeyChanged>\r\n" +
+          "\t\t<MasterKeyChanged>2017-10-23T08:03:55Z</MasterKeyChanged>\r\n" +
           "\t\t<MasterKeyChangeRec>-1</MasterKeyChangeRec>\r\n" +
           "\t\t<MasterKeyChangeForce>-1</MasterKeyChangeForce>\r\n" +
           "\t\t<MemoryProtection>\r\n" +
@@ -60,9 +61,9 @@ namespace ModernKeePassLib.Test.Shared.Serialization
           "\t\t</MemoryProtection>\r\n" +
           "\t\t<RecycleBinEnabled>True</RecycleBinEnabled>\r\n" +
           "\t\t<RecycleBinUUID>AAAAAAAAAAAAAAAAAAAAAA==</RecycleBinUUID>\r\n" +
-          "\t\t<RecycleBinChanged>2015-03-14T03:15:26Z</RecycleBinChanged>\r\n" +
+          "\t\t<RecycleBinChanged>2017-10-23T08:03:55Z</RecycleBinChanged>\r\n" +
           "\t\t<EntryTemplatesGroup>AAAAAAAAAAAAAAAAAAAAAA==</EntryTemplatesGroup>\r\n" +
-          "\t\t<EntryTemplatesGroupChanged>2015-03-14T03:15:26Z</EntryTemplatesGroupChanged>\r\n" +
+          "\t\t<EntryTemplatesGroupChanged>2017-10-23T08:03:55Z</EntryTemplatesGroupChanged>\r\n" +
           "\t\t<HistoryMaxItems>10</HistoryMaxItems>\r\n" +
           "\t\t<HistoryMaxSize>6291456</HistoryMaxSize>\r\n" +
           "\t\t<LastSelectedGroup>AAAAAAAAAAAAAAAAAAAAAA==</LastSelectedGroup>\r\n" +
@@ -77,13 +78,13 @@ namespace ModernKeePassLib.Test.Shared.Serialization
           "\t\t\t<Notes>" + testRootGroupNotes + "</Notes>\r\n" +
           "\t\t\t<IconID>49</IconID>\r\n" +
           "\t\t\t<Times>\r\n" +
-          "\t\t\t\t<CreationTime>2015-03-14T03:15:26Z</CreationTime>\r\n" +
+          "\t\t\t\t<CreationTime>2017-10-23T08:03:55Z</CreationTime>\r\n" +
-          "\t\t\t\t<LastModificationTime>2015-03-14T03:15:26Z</LastModificationTime>\r\n" +
+          "\t\t\t\t<LastModificationTime>2017-10-23T08:03:55Z</LastModificationTime>\r\n" +
-          "\t\t\t\t<LastAccessTime>2015-03-14T03:15:26Z</LastAccessTime>\r\n" +
+          "\t\t\t\t<LastAccessTime>2017-10-23T08:03:55Z</LastAccessTime>\r\n" +
-          "\t\t\t\t<ExpiryTime>2015-03-14T03:15:26Z</ExpiryTime>\r\n" +
+          "\t\t\t\t<ExpiryTime>2017-10-23T08:03:55Z</ExpiryTime>\r\n" +
           "\t\t\t\t<Expires>False</Expires>\r\n" +
           "\t\t\t\t<UsageCount>0</UsageCount>\r\n" +
-          "\t\t\t\t<LocationChanged>2015-03-14T03:15:26Z</LocationChanged>\r\n" +
+          "\t\t\t\t<LocationChanged>2017-10-23T08:03:55Z</LocationChanged>\r\n" +
           "\t\t\t</Times>\r\n" +
           "\t\t\t<IsExpanded>True</IsExpanded>\r\n" +
           "\t\t\t<DefaultAutoTypeSequence>" + testRootGroupDefaultAutoTypeSequence + "</DefaultAutoTypeSequence>\r\n" +
@@ -95,7 +96,7 @@ namespace ModernKeePassLib.Test.Shared.Serialization
           "\t</Root>\r\n" +
           "</KeePassFile>";
 
-        const string testDate = "2015-03-14T03:15:26Z";
+        const string testDate = "2017-10-23T08:03:55Z";
 
         [Test()]
         public void TestLoad()
@@ -120,7 +121,8 @@ namespace ModernKeePassLib.Test.Shared.Serialization
             {
                 var database = new PwDatabase();
                 database.New(new IOConnectionInfo(), new CompositeKey());
-                var date = DateTime.Parse(testDate);
+                var date = DateTime.Parse(testDate, CultureInfo.CurrentCulture, DateTimeStyles.AdjustToUniversal);
+                //var date = DateTime.UtcNow;
                 PwDatabase.LocalizedAppName = testLocalizedAppName;
                 database.Name = testDatabaseName;
                 database.NameChanged = date;

ModernKeePassLib/Cryptography/Cipher/StandardAesEngine.cs

@@ -39,6 +39,11 @@ namespace ModernKeePassLib.Cryptography.Cipher
 	/// </summary>
 	public sealed class StandardAesEngine : ICipherEngine
 	{
+#if !ModernKeePassLib && !KeePassUAP
+		private const CipherMode m_rCipherMode = CipherMode.CBC;
+		private const PaddingMode m_rCipherPadding = PaddingMode.PKCS7;
+#endif
+
 		private static PwUuid g_uuidAes = null;
 
 		/// <summary>
@@ -115,18 +120,43 @@ namespace ModernKeePassLib.Cryptography.Cipher
 
 			byte[] pbLocalKey = new byte[32];
 			Array.Copy(pbKey, pbLocalKey, 32);
-			AesEngine aes = new AesEngine();
-			CbcBlockCipher cbc = new CbcBlockCipher(aes);
-			PaddedBufferedBlockCipher bc = new PaddedBufferedBlockCipher(cbc,
-				new Pkcs7Padding());
-			KeyParameter kp = new KeyParameter(pbLocalKey);
-			ParametersWithIV prmIV = new ParametersWithIV(kp, pbLocalIV);
-			bc.Init(bEncrypt, prmIV);
 
-			IBufferedCipher cpRead = (bEncrypt ? null : bc);
+#if ModernKeePassLib
-			IBufferedCipher cpWrite = (bEncrypt ? bc : null);
+		    AesEngine aes = new AesEngine();
-			return new CipherStream(s, cpRead, cpWrite);
+		    CbcBlockCipher cbc = new CbcBlockCipher(aes);
-        }
+		    PaddedBufferedBlockCipher bc = new PaddedBufferedBlockCipher(cbc,
+		        new Pkcs7Padding());
+		    KeyParameter kp = new KeyParameter(pbLocalKey);
+		    ParametersWithIV prmIV = new ParametersWithIV(kp, pbLocalIV);
+		    bc.Init(bEncrypt, prmIV);
+
+		    IBufferedCipher cpRead = (bEncrypt ? null : bc);
+		    IBufferedCipher cpWrite = (bEncrypt ? bc : null);
+		    return new CipherStream(s, cpRead, cpWrite);
+#elif KeePassUAP
+			return StandardAesEngineExt.CreateStream(s, bEncrypt, pbLocalKey, pbLocalIV);
+#else
+			SymmetricAlgorithm a = CryptoUtil.CreateAes();
+			if(a.BlockSize != 128) // AES block size
+			{
+				Debug.Assert(false);
+				a.BlockSize = 128;
+			}
+
+			a.IV = pbLocalIV;
+			a.KeySize = 256;
+			a.Key = pbLocalKey;
+			a.Mode = m_rCipherMode;
+			a.Padding = m_rCipherPadding;
+
+			ICryptoTransform iTransform = (bEncrypt ? a.CreateEncryptor() : a.CreateDecryptor());
+			Debug.Assert(iTransform != null);
+			if(iTransform == null) throw new SecurityException("Unable to create AES transform!");
+
+			return new CryptoStream(s, iTransform, bEncrypt ? CryptoStreamMode.Write :
+				CryptoStreamMode.Read);
+#endif
+		}
 
 		public Stream EncryptStream(Stream sPlainText, byte[] pbKey, byte[] pbIV)
 		{

ModernKeePassLib/Cryptography/CryptoRandom.cs

@@ -120,9 +120,9 @@ namespace ModernKeePassLib.Cryptography
 			{
 #if ModernKeePassLib
 
-                var sha256 = HashAlgorithmProvider.OpenAlgorithm(HashAlgorithmNames.Sha256);
+			    var h = HashAlgorithmProvider.OpenAlgorithm(HashAlgorithmNames.Sha256)
-                var buffer = sha256.HashData(CryptographicBuffer.CreateFromByteArray(pbEntropy));
+			        .HashData(CryptographicBuffer.CreateFromByteArray(pbEntropy));
-                CryptographicBuffer.CopyToByteArray(buffer, out pbNewData);
+                CryptographicBuffer.CopyToByteArray(h, out pbNewData);
 #else
 #if KeePassLibSD
 				using(SHA256Managed shaNew = new SHA256Managed())
@@ -147,9 +147,9 @@ namespace ModernKeePassLib.Cryptography
 				MemUtil.ZeroByteArray(m_pbEntropyPool);
 
 #if ModernKeePassLib
-                var sha256 = HashAlgorithmProvider.OpenAlgorithm(HashAlgorithmNames.Sha256);
+                var h = HashAlgorithmProvider.OpenAlgorithm(HashAlgorithmNames.Sha256)
-                var buffer = sha256.HashData(CryptographicBuffer.CreateFromByteArray(pbCmp));
+                    .HashData(CryptographicBuffer.CreateFromByteArray(pbCmp));
-                CryptographicBuffer.CopyToByteArray(buffer, out m_pbEntropyPool);
+                CryptographicBuffer.CopyToByteArray(h, out m_pbEntropyPool);
 #else
 #if KeePassLibSD
 				using(SHA256Managed shaPool = new SHA256Managed())

ModernKeePassLib/Cryptography/CryptoRandomStream.cs

@@ -98,10 +98,10 @@ namespace ModernKeePassLib.Cryptography
 				byte[] pbKey32 = new byte[32];
 				byte[] pbIV12 = new byte[12];
 #if ModernKeePassLib
-                var sha256 = HashAlgorithmProvider.OpenAlgorithm(HashAlgorithmNames.Sha256);
+                var h = HashAlgorithmProvider.OpenAlgorithm(HashAlgorithmNames.Sha512)
-			    var buffer = sha256.HashData(CryptographicBuffer.CreateFromByteArray(pbKey));
+                    .HashData(CryptographicBuffer.CreateFromByteArray(pbKey));
 			    byte[] pbHash;
-			    CryptographicBuffer.CopyToByteArray(buffer, out pbHash);
+			    CryptographicBuffer.CopyToByteArray(h, out pbHash);
                 
 				Array.Copy(pbHash, pbKey32, 32);
 				Array.Copy(pbHash, 32, pbIV12, 0, 12);

ModernKeePassLib/Cryptography/CryptoUtil.cs

@@ -52,15 +52,16 @@ namespace ModernKeePassLib.Cryptography
 
 			byte[] pbHash;
 
-/*#if ModernKeePassLib
+#if ModernKeePassLib
-            var h = HashAlgorithmProvider.OpenAlgorithm(HashAlgorithmNames.Sha256).CreateHash();
+		    var h = HashAlgorithmProvider.OpenAlgorithm(HashAlgorithmNames.Sha256)
-            CryptographicBuffer.CopyToByteArray(h.GetValueAndReset(), out pbHash);
+		        .HashData(CryptographicBuffer.CreateFromByteArray(pbData));
-#else*/
+            CryptographicBuffer.CopyToByteArray(h, out pbHash);
+#else
 			using(SHA256Managed h = new SHA256Managed())
 			{
 				pbHash = h.ComputeHash(pbData, iOffset, cbCount);
 			}
-//#endif
+#endif
 
 #if DEBUG
 			// Ensure the data has not been modified
@@ -90,15 +91,16 @@ namespace ModernKeePassLib.Cryptography
 			if(cbOut <= 32) pbHash = HashSha256(pbIn, iInOffset, cbIn);
 			else
 			{
-/*#if ModernKeePassLib
+#if ModernKeePassLib
-                var h = HashAlgorithmProvider.OpenAlgorithm(HashAlgorithmNames.Sha512).CreateHash();
+			    var h = HashAlgorithmProvider.OpenAlgorithm(HashAlgorithmNames.Sha512)
-			    CryptographicBuffer.CopyToByteArray(h.GetValueAndReset(), out pbHash);
+			        .HashData(CryptographicBuffer.CreateFromByteArray(pbIn));
-#else*/
+			    CryptographicBuffer.CopyToByteArray(h, out pbHash);
+#else
 				using(SHA512Managed h = new SHA512Managed())
 				{
 					pbHash = h.ComputeHash(pbIn, iInOffset, cbIn);
 				}
-//#endif
+#endif
 			}
 
 			if(cbOut == pbHash.Length) return pbHash;

ModernKeePassLib/Cryptography/Hash/Blake2b.cs

@@ -270,11 +270,15 @@ namespace ModernKeePassLib.Cryptography.Hash
 	        Reset();
 	    }
 
-        internal byte[] ComputeHash(byte[] pbOutBuffer)
+        internal byte[] ComputeHash(byte[] value)
         {
-            byte[] result = new byte[pbOutBuffer.Length];
+            if (value == null) throw new ArgumentNullException(nameof(value));
-            DoFinal(result, 0);
+
-            return result;
+            byte[] resBuf = new byte[m_cbHashLength];
+            BlockUpdate(value, 0, value.Length);
+            DoFinal(resBuf, 0);
+
+            return resBuf;
         }
     }
 }

ModernKeePassLib/Cryptography/Hash/DigestManaged.cs

@@ -1,26 +0,0 @@
-using System;
-using Org.BouncyCastle.Crypto;
-
-namespace ModernKeePassLib.Cryptography.Hash
-{
-    public abstract class DigestManaged : IDisposable
-    {
-        protected IDigest _hash;
-
-        public byte[] ComputeHash(byte[] value, int offset, int length)
-        {
-            if (value == null) throw new ArgumentNullException(nameof(value));
-
-            byte[] resBuf = new byte[_hash.GetDigestSize()];
-            _hash.BlockUpdate(value, offset, length);
-            _hash.DoFinal(resBuf, 0);
-
-            return resBuf;
-        }
-
-        public void Dispose()
-        {
-            _hash.Reset();
-        }
-    }
-}

ModernKeePassLib/Cryptography/Hash/SHA256Managed.cs

@@ -1,13 +0,0 @@
-using System;
-using Org.BouncyCastle.Crypto.Digests;
-
-namespace ModernKeePassLib.Cryptography.Hash
-{
-    public class SHA256Managed : DigestManaged
-    {
-        public SHA256Managed()
-        {
-            _hash = new Sha256Digest();
-        }
-    }
-}

ModernKeePassLib/Cryptography/Hash/SHA512Managed.cs

@@ -1,13 +0,0 @@
-using System;
-using Org.BouncyCastle.Crypto.Digests;
-
-namespace ModernKeePassLib.Cryptography.Hash
-{
-    public class SHA512Managed : DigestManaged
-    {
-        public SHA512Managed()
-        {
-            _hash = new Sha512Digest();
-        }
-    }
-}

ModernKeePassLib/Cryptography/PasswordGenerator/PwGenerator.cs

@@ -83,10 +83,10 @@ namespace ModernKeePassLib.Cryptography.PasswordGenerator
 			if((pbAdditionalEntropy != null) && (pbAdditionalEntropy.Length > 0))
 			{
 #if ModernKeePassLib
-                var sha256 = HashAlgorithmProvider.OpenAlgorithm(HashAlgorithmNames.Sha256);
+                var h = HashAlgorithmProvider.OpenAlgorithm(HashAlgorithmNames.Sha512)
-			    var buffer = sha256.HashData(CryptographicBuffer.CreateFromByteArray(pbAdditionalEntropy));
+                    .HashData(CryptographicBuffer.CreateFromByteArray(pbAdditionalEntropy));
 			    byte[] pbHash;
-                CryptographicBuffer.CopyToByteArray(buffer, out pbHash);
+                CryptographicBuffer.CopyToByteArray(h, out pbHash);
 			    MemUtil.XorArray(pbHash, 0, pbKey, 0, pbHash.Length);
 
 #else

ModernKeePassLib/ModernKeePassLib.csproj

@@ -61,10 +61,7 @@
     <Compile Include="Cryptography\Cipher\ICipherEngine.cs" />
     <Compile Include="Cryptography\CryptoUtil.cs" />
     <Compile Include="Cryptography\Hash\Blake2b.cs" />
-    <Compile Include="Cryptography\Hash\DigestManaged.cs" />
     <Compile Include="Cryptography\Hash\HMACSHA256.cs" />
-    <Compile Include="Cryptography\Hash\SHA256Managed.cs" />
-    <Compile Include="Cryptography\Hash\SHA512Managed.cs" />
     <Compile Include="Cryptography\HmacOtp.cs" />
     <Compile Include="Cryptography\KeyDerivation\AesKdf.cs" />
     <Compile Include="Cryptography\KeyDerivation\AesKdf.GCrypt.cs" />

ModernKeePassLib/ModernKeePassLib.nuspec

@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>ModernKeePassLib</id>
-    <version>2.37.1000</version>
+    <version>2.37.2000</version>
     <title>ModernKeePassLib</title>
     <authors>Geoffroy Bonneville</authors>
     <owners>Geoffroy Bonneville</owners>

ModernKeePassLib/Properties/AssemblyInfo.cs

@@ -40,5 +40,5 @@ using System.Runtime.InteropServices;
 #endif
 
 // Assembly version information
-[assembly: AssemblyVersion("2.37.0.1000")]
+[assembly: AssemblyVersion("2.37.0.2000")]
-[assembly: AssemblyFileVersion("2.37.0.1000")]
+[assembly: AssemblyFileVersion("2.37.0.2000")]

ModernKeePassLib/Serialization/HashedBlockStream.cs

@@ -18,20 +18,18 @@
 */
 
 using System;
-using System.IO;
-#if ModernKeePassLib
-using System.Linq;
-using Windows.Security.Cryptography;
-#else
-using System.Security.Cryptography;
-#endif
 using System.Diagnostics;
+using System.IO;
 using System.Text;
-
+#if ModernKeePassLib
 using ModernKeePassLib.Native;
 using ModernKeePassLib.Utility;
-using Windows.Security.Cryptography.Core;
 using ModernKeePassLib.Cryptography;
+#else
+using KeePassLib.Cryptography;
+using KeePassLib.Native;
+using KeePassLib.Utility;
+#endif
 
 #if KeePassLibSD
 using KeePassLibSD;

ModernKeePassLib/Serialization/KdbxFile.cs

@@ -399,9 +399,9 @@ namespace ModernKeePassLib.Serialization
 
 				pbCmp[64] = 1;
 #if ModernKeePassLib
-			    var sha256 = HashAlgorithmProvider.OpenAlgorithm(HashAlgorithmNames.Sha256);
+			    var h = HashAlgorithmProvider.OpenAlgorithm(HashAlgorithmNames.Sha512)
-			    var buffer = sha256.HashData(CryptographicBuffer.CreateFromByteArray(pbCmp));
+                    .HashData(CryptographicBuffer.CreateFromByteArray(pbCmp));
-			    CryptographicBuffer.CopyToByteArray(buffer, out pbHmacKey64);
+			    CryptographicBuffer.CopyToByteArray(h, out pbHmacKey64);
 #else
                 using(SHA512Managed h = new SHA512Managed())
 				{