diff --git a/ModernKeePass/ModernKeePass.csproj b/ModernKeePass/ModernKeePass.csproj index d7eba55..bad972b 100644 --- a/ModernKeePass/ModernKeePass.csproj +++ b/ModernKeePass/ModernKeePass.csproj @@ -159,8 +159,8 @@ - - ..\packages\ModernKeePassLib.2.19.0.26356\lib\netstandard1.2\ModernKeePassLib.dll + + ..\packages\ModernKeePassLib.2.19.0.5083\lib\netstandard1.2\ModernKeePassLib.dll True diff --git a/ModernKeePass/packages.config b/ModernKeePass/packages.config index 50214e2..0f7ff5a 100644 --- a/ModernKeePass/packages.config +++ b/ModernKeePass/packages.config @@ -2,7 +2,7 @@ - + diff --git a/ModernKeePassLib/Keys/CompositeKey.cs b/ModernKeePassLib/Keys/CompositeKey.cs index 6e2cdce..f2130bf 100644 --- a/ModernKeePassLib/Keys/CompositeKey.cs +++ b/ModernKeePassLib/Keys/CompositeKey.cs @@ -162,7 +162,7 @@ namespace ModernKeePassLib.Keys /// Creates the composite key from the supplied user key sources (password, /// key file, user account, computer ID, etc.). /// - private async Task CreateRawCompositeKey32() + private byte[] CreateRawCompositeKey32() { ValidateUserKeys(); @@ -185,12 +185,12 @@ namespace ModernKeePassLib.Keys } - public async Task EqualsValue(CompositeKey ckOther) + public bool EqualsValue(CompositeKey ckOther) { if(ckOther == null) throw new ArgumentNullException("ckOther"); - byte[] pbThis = await CreateRawCompositeKey32(); - byte[] pbOther = await ckOther.CreateRawCompositeKey32(); + byte[] pbThis = CreateRawCompositeKey32(); + byte[] pbOther = ckOther.CreateRawCompositeKey32(); bool bResult = MemUtil.ArraysEqual(pbThis, pbOther); Array.Clear(pbOther, 0, pbOther.Length); Array.Clear(pbThis, 0, pbThis.Length); @@ -207,14 +207,14 @@ namespace ModernKeePassLib.Keys /// Number of key transformation rounds. /// Returns a protected binary object that contains the /// resulting 32-bit wide key. - public async Task GenerateKey32(byte[] pbKeySeed32, ulong uNumRounds) + public ProtectedBinary GenerateKey32(byte[] pbKeySeed32, ulong uNumRounds) { Debug.Assert(pbKeySeed32 != null); if(pbKeySeed32 == null) throw new ArgumentNullException("pbKeySeed32"); Debug.Assert(pbKeySeed32.Length == 32); if(pbKeySeed32.Length != 32) throw new ArgumentException("pbKeySeed32"); - byte[] pbRaw32 = await CreateRawCompositeKey32(); + byte[] pbRaw32 = CreateRawCompositeKey32(); if((pbRaw32 == null) || (pbRaw32.Length != 32)) { Debug.Assert(false); return null; } diff --git a/ModernKeePassLib/PwDatabase.cs b/ModernKeePassLib/PwDatabase.cs index 6e57aab..24d63cb 100644 --- a/ModernKeePassLib/PwDatabase.cs +++ b/ModernKeePassLib/PwDatabase.cs @@ -587,7 +587,7 @@ namespace ModernKeePassLib IOConnection ioc = new IOConnection(); Stream s = await ioc.OpenRead(ioSource); - await kdb4.Load(s, Kdb4Format.Default, slLogger); + kdb4.Load(s, Kdb4Format.Default, slLogger); s.Dispose(); diff --git a/ModernKeePassLib/Serialization/Kdb4File.Read.cs b/ModernKeePassLib/Serialization/Kdb4File.Read.cs index 205000f..939f2e0 100644 --- a/ModernKeePassLib/Serialization/Kdb4File.Read.cs +++ b/ModernKeePassLib/Serialization/Kdb4File.Read.cs @@ -57,7 +57,7 @@ namespace ModernKeePassLib.Serialization IOConnectionInfo ioc = IOConnectionInfo.FromPath(strFilePath); IOConnection ioConnection = new IOConnection(); Stream abc = await ioConnection.OpenRead(ioc); - await Load(abc, kdbFormat, slLogger); + Load(abc, kdbFormat, slLogger); } /// @@ -67,7 +67,7 @@ namespace ModernKeePassLib.Serialization /// a KDB4 stream. /// Format specifier. /// Status logger (optional). - public async Task Load(Stream sSource, Kdb4Format kdbFormat, IStatusLogger slLogger) + public void Load(Stream sSource, Kdb4Format kdbFormat, IStatusLogger slLogger) { Debug.Assert(sSource != null); @@ -90,7 +90,7 @@ namespace ModernKeePassLib.Serialization br = new BinaryReaderEx(hashedStream, encNoBom, KLRes.FileCorrupted); ReadHeader(br); - Stream sDecrypted = await AttachStreamDecryptor(hashedStream); + Stream sDecrypted = AttachStreamDecryptor(hashedStream); if((sDecrypted == null) || (sDecrypted == hashedStream)) throw new SecurityException(KLRes.CryptoStreamFailed); @@ -312,7 +312,7 @@ namespace ModernKeePassLib.Serialization m_craInnerRandomStream = (CrsAlgorithm)uID; } - private async Task AttachStreamDecryptor(Stream s) + private Stream AttachStreamDecryptor(Stream s) { MemoryStream ms = new MemoryStream(); @@ -321,7 +321,7 @@ namespace ModernKeePassLib.Serialization throw new FormatException(KLRes.MasterSeedLengthInvalid); ms.Write(m_pbMasterSeed, 0, 32); - Security.ProtectedBinary pb = await m_pwDatabase.MasterKey.GenerateKey32(m_pbTransformSeed, + Security.ProtectedBinary pb = m_pwDatabase.MasterKey.GenerateKey32(m_pbTransformSeed, m_pwDatabase.KeyEncryptionRounds); byte[] pKey32 = pb.ReadData(); diff --git a/ModernKeePassLib/Serialization/Kdb4File.Write.cs b/ModernKeePassLib/Serialization/Kdb4File.Write.cs index 2f9586a..fb64f7b 100644 --- a/ModernKeePassLib/Serialization/Kdb4File.Write.cs +++ b/ModernKeePassLib/Serialization/Kdb4File.Write.cs @@ -71,7 +71,7 @@ namespace ModernKeePassLib.Serialization /// be written. /// Format of the file to create. /// Logger that recieves status information. - public async void Save(Stream sSaveTo, PwGroup pgDataSource, Kdb4Format format, + public void Save(Stream sSaveTo, PwGroup pgDataSource, Kdb4Format format, IStatusLogger slLogger) { Debug.Assert(sSaveTo != null); @@ -105,7 +105,7 @@ namespace ModernKeePassLib.Serialization bw = new BinaryWriter(hashedStream, encNoBom); WriteHeader(bw); // Also flushes bw - Stream sEncrypted = await AttachStreamEncryptor(hashedStream); + Stream sEncrypted = AttachStreamEncryptor(hashedStream); if((sEncrypted == null) || (sEncrypted == hashedStream)) throw new SecurityException(KLRes.CryptoStreamFailed); @@ -193,18 +193,17 @@ namespace ModernKeePassLib.Serialization else bwOut.Write((ushort)0); } - private async Task AttachStreamEncryptor(Stream s) + private Stream AttachStreamEncryptor(Stream s) { using (MemoryStream ms = new MemoryStream()) { - Debug.Assert(m_pbMasterSeed != null); Debug.Assert(m_pbMasterSeed.Length == 32); ms.Write(m_pbMasterSeed, 0, 32); Debug.Assert(m_pwDatabase != null); Debug.Assert(m_pwDatabase.MasterKey != null); - ProtectedBinary pbinKey = await m_pwDatabase.MasterKey.GenerateKey32( + ProtectedBinary pbinKey = m_pwDatabase.MasterKey.GenerateKey32( m_pbTransformSeed, m_pwDatabase.KeyEncryptionRounds); Debug.Assert(pbinKey != null); if (pbinKey == null) diff --git a/packages/ModernKeePassLib.2.19.0.26356/lib/netstandard1.2/ModernKeePassLib.dll b/packages/ModernKeePassLib.2.19.0.26356/lib/netstandard1.2/ModernKeePassLib.dll deleted file mode 100644 index 36deb37..0000000 Binary files a/packages/ModernKeePassLib.2.19.0.26356/lib/netstandard1.2/ModernKeePassLib.dll and /dev/null differ diff --git a/packages/ModernKeePassLib.2.19.0.5083/lib/netstandard1.2/ModernKeePassLib.dll b/packages/ModernKeePassLib.2.19.0.5083/lib/netstandard1.2/ModernKeePassLib.dll new file mode 100644 index 0000000..c1cce29 Binary files /dev/null and b/packages/ModernKeePassLib.2.19.0.5083/lib/netstandard1.2/ModernKeePassLib.dll differ