wismna/modernkeepass
1
0
Fork 0
mirror of https://github.com/wismna/ModernKeePass.git synced 2025-10-04 08:00:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Correct implementation of SHA512 with WinRT in KeepassLib

Browse Source
This commit is contained in:
Geoffroy Bonneville
2017-10-23 10:29:07 +02:00
committed by BONNEVILLE Geoffroy
parent e95e62f184
commit a11d209280
15 changed files with 101 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ModernKeePassLib/Serialization/HashedBlockStream.cs
View File

@@ -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;

6
ModernKeePassLib/Serialization/KdbxFile.cs
View File

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