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

Added more tests

Browse Source 
Code cleanup in Lib
WIP new VM for OpendatabaseControl
WIP KDBX4 file save - still not working
This commit is contained in:
bg45
2017-11-04 12:11:30 -04:00
committed by BONNEVILLE Geoffroy
parent 278b2759d5
commit 53a54252e3
23 changed files with 103 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ModernKeePassLib/Cryptography/CryptoRandom.cs
View File

@@ -165,7 +165,7 @@ namespace ModernKeePassLib.Cryptography
pb = MemUtil.Int64ToBytes(DateTime.UtcNow.ToBinary());
MemUtil.Write(ms, pb);
#if (!ModernKeePassLib && !KeePassLibSD && !KeePassRT)
#if (!ModernKeePassLib && !KeePassLibSD)
// In try-catch for systems without GUI;
// https://sourceforge.net/p/keepass/discussion/329221/thread/20335b73/
try

50
ModernKeePassLib/Cryptography/CryptographicHashExtensions.cs
View File

@@ -1,50 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.InteropServices.WindowsRuntime;
using System.Text;
using System.Threading.Tasks;
using Windows.Security.Cryptography.Core;
namespace ModernKeePassLib.Cryptography
{
public static class CryptographicHashExtensions
{
public static int TransformBlock(this CryptographicHash hash, byte[] inputBuffer, int inputOffset, int inputCount, byte[] outputBuffer, int outputOffset)
{
byte[] buffer;
if (inputCount < inputBuffer.Length)
{
buffer = new byte[inputCount];
Array.Copy(inputBuffer, inputOffset, buffer, 0, inputCount);
}
else
{
buffer = inputBuffer;
}
hash.Append(buffer.AsBuffer());
if (outputBuffer != null)
{
Array.Copy(inputBuffer, inputOffset, outputBuffer, outputOffset, inputCount);
}
return inputCount;
}
public static byte[] TransformFinalBlock(this CryptographicHash hash, byte[] inputBuffer, int inputOffset, int inputCount)
{
hash.TransformBlock(inputBuffer, inputOffset, inputCount, null, 0);
if (inputCount == inputBuffer.Length)
{
return inputBuffer;
}
else
{
var buffer = new byte[inputCount];
Array.Copy(inputBuffer, inputOffset, buffer, 0, inputCount);
return buffer;
}
}
}
}

6
ModernKeePassLib/Cryptography/Hash/HMAC.cs
View File

@@ -40,9 +40,13 @@ namespace ModernKeePassLib.Cryptography.Hash
Buffer.BlockCopy(inputBuffer, inputOffset, outputBuffer, outputOffset, inputCount);
}
public void TransformFinalBlock(byte[] inputBuffer, int inputOffset, int inputCount)
public byte[] TransformFinalBlock(byte[] inputBuffer, int inputOffset, int inputCount)
{
Hmac.BlockUpdate(inputBuffer, inputOffset, inputCount);
byte[] outputBytes = new byte[inputCount];
if (inputCount != 0)
Buffer.BlockCopy(inputBuffer, inputOffset, outputBytes, 0, inputCount);
return outputBytes;
}
public void Initialize()

11
ModernKeePassLib/Cryptography/Hash/DigestManaged.cs → ModernKeePassLib/Cryptography/Hash/HashAlgorithm.cs
View File

@@ -3,7 +3,7 @@ using Org.BouncyCastle.Crypto;
namespace ModernKeePassLib.Cryptography.Hash
{
public abstract class DigestManaged: IDisposable
public abstract class HashAlgorithm: IDisposable
{
protected IDigest Digest;
@@ -17,6 +17,9 @@ namespace ModernKeePassLib.Cryptography.Hash
}
}
public bool CanReuseTransform => true;
public bool CanTransformMultipleBlocks => true;
public byte[] ComputeHash(byte[] value)
{
return ComputeHash(value, 0, value.Length);
@@ -41,9 +44,13 @@ namespace ModernKeePassLib.Cryptography.Hash
Buffer.BlockCopy(inputBuffer, inputOffset, outputBuffer, outputOffset, inputCount);
}
public void TransformFinalBlock(byte[] inputBuffer, int inputOffset, int inputCount)
public byte[] TransformFinalBlock(byte[] inputBuffer, int inputOffset, int inputCount)
{
Digest.BlockUpdate(inputBuffer, inputOffset, inputCount);
byte[] outputBytes = new byte[inputCount];
if (inputCount != 0)
Buffer.BlockCopy(inputBuffer, inputOffset, outputBytes, 0, inputCount);
return outputBytes;
}
public void Dispose()

2
ModernKeePassLib/Cryptography/Hash/SHA256Managed.cs
View File

@@ -2,7 +2,7 @@
namespace ModernKeePassLib.Cryptography.Hash
{
public class SHA256Managed : DigestManaged
public class SHA256Managed : HashAlgorithm
{
public SHA256Managed()
{

2
ModernKeePassLib/Cryptography/Hash/SHA512Managed.cs
View File

@@ -2,7 +2,7 @@
namespace ModernKeePassLib.Cryptography.Hash
{
public class SHA512Managed: DigestManaged
public class SHA512Managed: HashAlgorithm
{
public SHA512Managed()
{

37
ModernKeePassLib/Cryptography/HashingStreamEx.cs
View File

@@ -22,13 +22,8 @@ using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Text;
#if ModernKeePassLib
using Windows.Security.Cryptography;
using Windows.Security.Cryptography.Core;
using Org.BouncyCastle.Crypto;
using Org.BouncyCastle.Crypto.Digests;
using Org.BouncyCastle.Crypto.Tls;
using ModernKeePassLib.Cryptography.Hash;
#elif !KeePassUAP
using System.Security.Cryptography;
#endif
@@ -41,11 +36,7 @@ namespace ModernKeePassLib.Cryptography
{
private readonly Stream m_sBaseStream;
private readonly bool m_bWriting;
#if ModernKeePassLib
private IDigest m_hash;
#else
private HashAlgorithm m_hash;
#endif
private byte[] m_pbFinalHash = null;
@@ -80,19 +71,14 @@ namespace ModernKeePassLib.Cryptography
set { Debug.Assert(false); throw new NotSupportedException(); }
}
#if ModernKeePassLib
public HashingStreamEx(Stream sBaseStream, bool bWriting, IDigest hashAlgorithm)
#else
public HashingStreamEx(Stream sBaseStream, bool bWriting, HashAlgorithm hashAlgorithm)
#endif
{
if(sBaseStream == null) throw new ArgumentNullException("sBaseStream");
m_sBaseStream = sBaseStream;
m_bWriting = bWriting;
#if ModernKeePassLib
m_hash = hashAlgorithm ?? new Sha256Digest();
#elif !KeePassLibSD
#if !KeePassLibSD
m_hash = (hashAlgorithm ?? new SHA256Managed());
#else // KeePassLibSD
m_hash = null;
@@ -105,14 +91,11 @@ namespace ModernKeePassLib.Cryptography
if(m_hash == null) { Debug.Assert(false); return; }
// Validate hash algorithm
#if ModernKeePassLib
#else
if(!m_hash.CanReuseTransform || !m_hash.CanTransformMultipleBlocks)
{
Debug.Assert(false);
m_hash = null;
}
#endif
}
protected override void Dispose(bool disposing)
@@ -123,15 +106,9 @@ namespace ModernKeePassLib.Cryptography
{
try
{
#if ModernKeePassLib
m_pbFinalHash = new byte[32];
m_hash.DoFinal(m_pbFinalHash, 0);
m_hash.Reset();
#else
m_hash.TransformFinalBlock(MemUtil.EmptyByteArray, 0, 0);
m_pbFinalHash = m_hash.Hash;
#endif
}
catch(Exception) { Debug.Assert(false); }
@@ -178,11 +155,7 @@ namespace ModernKeePassLib.Cryptography
#endif
if((m_hash != null) && (nRead > 0))
#if ModernKeePassLib
m_hash.BlockUpdate(pbBuffer, nOffset, nRead);
#else
m_hash.TransformBlock(pbBuffer, nOffset, nRead, pbBuffer, nOffset);
#endif
#if DEBUG
Debug.Assert(MemUtil.ArraysEqual(pbBuffer, pbOrg));
@@ -201,11 +174,7 @@ namespace ModernKeePassLib.Cryptography
#endif
if((m_hash != null) && (nCount > 0))
#if ModernKeePassLib
m_hash.BlockUpdate(pbBuffer, nOffset, nCount);
#else
m_hash.TransformBlock(pbBuffer, nOffset, nCount, pbBuffer, nOffset);
#endif
#if DEBUG
Debug.Assert(MemUtil.ArraysEqual(pbBuffer, pbOrg));

3
ModernKeePassLib/ModernKeePassLib.csproj
View File

@@ -55,13 +55,12 @@
<Compile Include="Cryptography\Cipher\CtrBlockCipher.cs" />
<Compile Include="Cryptography\Cipher\Salsa20Cipher.cs" />
<Compile Include="Cryptography\Cipher\StandardAesEngine.cs" />
<Compile Include="Cryptography\CryptographicHashExtensions.cs" />
<Compile Include="Cryptography\CryptoRandom.cs" />
<Compile Include="Cryptography\CryptoRandomStream.cs" />
<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\HashAlgorithm.cs" />
<Compile Include="Cryptography\Hash\HMAC.cs" />
<Compile Include="Cryptography\Hash\HMACSHA1.cs" />
<Compile Include="Cryptography\Hash\HMACSHA256.cs" />

2
ModernKeePassLib/Serialization/BinaryReaderEx.cs
View File

@@ -75,7 +75,7 @@ namespace ModernKeePassLib.Serialization
if(m_sCopyTo != null) m_sCopyTo.Write(pb, 0, pb.Length);
return pb;
}
catch(Exception ex)
catch(Exception)
{
if(!string.IsNullOrEmpty(m_strReadExcp))
throw new IOException(m_strReadExcp);

6
ModernKeePassLib/Serialization/FileTransactionEx.cs
View File

@@ -147,7 +147,7 @@ namespace ModernKeePassLib.Serialization
{
bool bMadeUnhidden = UrlUtil.UnhideFile(m_iocBase.Path);
#if (!ModernKeePassLib && !KeePassLibSD && !KeePassRT)
#if (!ModernKeePassLib && !KeePassLibSD)
FileSecurity bkSecurity = null;
bool bEfsEncrypted = false;
#endif
@@ -161,7 +161,7 @@ namespace ModernKeePassLib.Serialization
if(IOConnection.FileExists(m_iocBase))
{
#if (!ModernKeePassLib && !KeePassLibSD && !KeePassRT)
#if (!ModernKeePassLib && !KeePassLibSD)
if(m_iocBase.IsLocalFile())
{
try
@@ -183,7 +183,7 @@ namespace ModernKeePassLib.Serialization
IOConnection.RenameFile(m_iocTemp, m_iocBase);
#if (!ModernKeePassLib && !KeePassLibSD && !KeePassRT)
#if (!ModernKeePassLib && !KeePassLibSD)
if(m_iocBase.IsLocalFile())
{
try

2
ModernKeePassLib/Serialization/HashedBlockStream.cs
View File

@@ -283,7 +283,7 @@ namespace ModernKeePassLib.Serialization
if(m_nBufferPos > 0)
{
byte[] pbHash = CryptoUtil.HashSha256(m_pbBuffer.Where((x, i) => i < m_nBufferPos).ToArray(), 0, m_nBufferPos);
byte[] pbHash = CryptoUtil.HashSha256(m_pbBuffer, 0, m_nBufferPos);
// For KeePassLibSD:
// SHA256Managed sha256 = new SHA256Managed();

1
ModernKeePassLib/Serialization/HmacBlockStream.cs
View File

@@ -21,6 +21,7 @@ using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Text;
#if ModernKeePassLib