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

Update Lib to version 2.44

Browse Source 
Update nuget packages
This commit is contained in:
Geoffroy BONNEVILLE
2020-03-16 15:28:05 +01:00
parent 3a85b60e58
commit b8240d482f
108 changed files with 1102 additions and 595 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ModernKeePassLib/Serialization/BinaryReaderEx.cs
View File

@@ -1,6 +1,6 @@
/*
KeePass Password Safe - The Open-Source Password Manager
Copyright (C) 2003-2019 Dominik Reichl <dominik.reichl@t-online.de>
Copyright (C) 2003-2020 Dominik Reichl <dominik.reichl@t-online.de>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by

2
ModernKeePassLib/Serialization/FileLock.cs
View File

@@ -1,6 +1,6 @@
/*
KeePass Password Safe - The Open-Source Password Manager
Copyright (C) 2003-2019 Dominik Reichl <dominik.reichl@t-online.de>
Copyright (C) 2003-2020 Dominik Reichl <dominik.reichl@t-online.de>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by

82
ModernKeePassLib/Serialization/FileTransactionEx.cs
View File

@@ -1,6 +1,6 @@
/*
KeePass Password Safe - The Open-Source Password Manager
Copyright (C) 2003-2019 Dominik Reichl <dominik.reichl@t-online.de>
Copyright (C) 2003-2020 Dominik Reichl <dominik.reichl@t-online.de>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@ using System.ComponentModel;
using System.Diagnostics;
using System.IO;
using System.Text;
#if (!ModernKeePassLib && !KeePassLibSD && !KeePassRT)
#if (!ModernKeePassLib && !KeePassUAP)
using System.Security.AccessControl;
#endif
@@ -45,9 +45,9 @@ namespace ModernKeePassLib.Serialization
private bool m_bMadeUnhidden = false;
private List<IOConnectionInfo> m_lToDelete = new List<IOConnectionInfo>();
private const string StrTempSuffix = ".tmp";
internal const string StrTempSuffix = ".tmp";
private static readonly string StrTxfTempPrefix = PwDefs.ShortProductName + "_TxF_";
private const string StrTxfTempSuffix = ".tmp";
internal const string StrTxfTempSuffix = ".tmp";
private static Dictionary<string, bool> g_dEnabled =
new Dictionary<string, bool>(StrUtil.CaseIgnoreComparer);
@@ -212,6 +212,7 @@ namespace ModernKeePassLib.Serialization
byte[] pbSec = null;
DateTime? otCreation = null;
SimpleStat sStat = null;
bool bBaseExists = IOConnection.FileExists(m_iocBase);
if(bBaseExists && m_iocBase.IsLocalFile())
@@ -226,6 +227,7 @@ namespace ModernKeePassLib.Serialization
catch(Exception) { Debug.Assert(false); }
#endif
otCreation = File.GetCreationTimeUtc(m_iocBase.Path);
sStat = SimpleStat.Get(m_iocBase.Path);
#if !ModernKeePassLib
// May throw with Mono
FileSecurity sec = File.GetAccessControl(m_iocBase.Path, acs);
@@ -255,6 +257,8 @@ namespace ModernKeePassLib.Serialization
if(otCreation.HasValue && (otCreation.Value.Year >= 1971))
File.SetCreationTimeUtc(m_iocBase.Path, otCreation.Value);
if(sStat != null) SimpleStat.Set(m_iocBase.Path, sStat);
if(bEfsEncrypted)
{
try { File.Encrypt(m_iocBase.Path); }
@@ -328,7 +332,7 @@ namespace ModernKeePassLib.Serialization
{
if(NativeLib.IsUnix()) return;
if(!m_iocBase.IsLocalFile()) return;
if(IsOneDriveWorkaroundRequired()) return;
if(TxfIsUnusable()) return;
string strID = StrUtil.AlphaNumericOnly(Convert.ToBase64String(
CryptoRandom.Instance.GetRandomBytes(16)));
@@ -420,46 +424,35 @@ namespace ModernKeePassLib.Serialization
}
}
#endif
return false;
}
internal static void ClearOld()
{
try
{
// See also TxfPrepare method
DirectoryInfo di = new DirectoryInfo(UrlUtil.GetTempPath());
List<FileInfo> l = UrlUtil.GetFileInfos(di, StrTxfTempPrefix +
"*" + StrTxfTempSuffix, SearchOption.TopDirectoryOnly);
foreach(FileInfo fi in l)
{
if(fi == null) { Debug.Assert(false); continue; }
if(!fi.Name.StartsWith(StrTxfTempPrefix, StrUtil.CaseIgnoreCmp) ||
!fi.Name.EndsWith(StrTxfTempSuffix, StrUtil.CaseIgnoreCmp))
continue;
if((DateTime.UtcNow - fi.LastWriteTimeUtc).TotalDays > 1.0)
fi.Delete();
}
}
catch(Exception) { Debug.Assert(false); }
}
// https://sourceforge.net/p/keepass/discussion/329220/thread/672ffecc65/
// https://sourceforge.net/p/keepass/discussion/329221/thread/514786c23a/
private bool IsOneDriveWorkaroundRequired()
private bool TxfIsUnusable()
{
#if !ModernKeePassLib
if(NativeLib.IsUnix()) return false;
try
{
string strReleaseId = (Registry.GetValue(
"HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion",
"ReleaseId", string.Empty) as string);
// Due to a bug in Microsoft's 'cldflt.sys' driver, a TxF transaction
// results in a Blue Screen of Death on Windows 10 1903/1909;
// https://www.windowslatest.com/2019/10/20/windows-10-update-issues-bsod-broken-apps-and-defender-atp/
// https://sourceforge.net/p/keepass/discussion/329221/thread/924b94ea48/
// This bug is fixed by the Windows update 4530684;
// https://support.microsoft.com/en-us/help/4530684/windows-10-update-kb4530684
// if(strReleaseId == "1903") return true;
// if(strReleaseId == "1909") return true;
if(strReleaseId != "1809") return false;
// On Windows 10 1809, OneDrive crashes if the file is
// in a OneDrive folder;
// https://sourceforge.net/p/keepass/discussion/329220/thread/672ffecc65/
// https://sourceforge.net/p/keepass/discussion/329221/thread/514786c23a/
string strFile = m_iocBase.Path;
GFunc<string, string, bool> fMatch = delegate(string strRoot, string strSfx)
@@ -529,5 +522,28 @@ namespace ModernKeePassLib.Serialization
#endif
return false;
}
internal static void ClearOld()
{
try
{
// See also TxfPrepare method
DirectoryInfo di = new DirectoryInfo(UrlUtil.GetTempPath());
List<FileInfo> l = UrlUtil.GetFileInfos(di, StrTxfTempPrefix +
"*" + StrTxfTempSuffix, SearchOption.TopDirectoryOnly);
foreach(FileInfo fi in l)
{
if(fi == null) { Debug.Assert(false); continue; }
if(!fi.Name.StartsWith(StrTxfTempPrefix, StrUtil.CaseIgnoreCmp) ||
!fi.Name.EndsWith(StrTxfTempSuffix, StrUtil.CaseIgnoreCmp))
continue;
if((DateTime.UtcNow - fi.LastWriteTimeUtc).TotalDays > 1.0)
fi.Delete();
}
}
catch(Exception) { Debug.Assert(false); }
}
}
}

135
ModernKeePassLib/Serialization/HashedBlockStream.cs
View File

@@ -1,6 +1,6 @@
/*
KeePass Password Safe - The Open-Source Password Manager
Copyright (C) 2003-2019 Dominik Reichl <dominik.reichl@t-online.de>
Copyright (C) 2003-2020 Dominik Reichl <dominik.reichl@t-online.de>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,6 +18,7 @@
*/
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Text;
@@ -36,16 +37,16 @@ namespace ModernKeePassLib.Serialization
{
private const int NbDefaultBufferSize = 1024 * 1024; // 1 MB
private Stream m_sBaseStream;
private bool m_bWriting;
private bool m_bVerify;
private Stream m_sBase;
private readonly bool m_bWriting;
private readonly bool m_bVerify;
private BinaryReader m_brInput = null;
private BinaryWriter m_bwOutput = null;
private bool m_bEos = false;
private BinaryReader m_brInput;
private BinaryWriter m_bwOutput;
private byte[] m_pbBuffer;
private int m_nBufferPos = 0;
private int m_iBufferPos = 0;
private uint m_uBlockIndex = 0;
@@ -75,50 +76,42 @@ namespace ModernKeePassLib.Serialization
set { Debug.Assert(false); throw new NotSupportedException(); }
}
public HashedBlockStream(Stream sBaseStream, bool bWriting)
public HashedBlockStream(Stream sBase, bool bWriting) :
this(sBase, bWriting, 0, true)
{
Initialize(sBaseStream, bWriting, 0, true);
}
public HashedBlockStream(Stream sBaseStream, bool bWriting, int nBufferSize)
public HashedBlockStream(Stream sBase, bool bWriting, int nBufferSize) :
this(sBase, bWriting, nBufferSize, true)
{
Initialize(sBaseStream, bWriting, nBufferSize, true);
}
public HashedBlockStream(Stream sBaseStream, bool bWriting, int nBufferSize,
public HashedBlockStream(Stream sBase, bool bWriting, int nBufferSize,
bool bVerify)
{
Initialize(sBaseStream, bWriting, nBufferSize, bVerify);
}
private void Initialize(Stream sBaseStream, bool bWriting, int nBufferSize,
bool bVerify)
{
if(sBaseStream == null) throw new ArgumentNullException("sBaseStream");
if(sBase == null) throw new ArgumentNullException("sBase");
if(nBufferSize < 0) throw new ArgumentOutOfRangeException("nBufferSize");
if(nBufferSize == 0) nBufferSize = NbDefaultBufferSize;
m_sBaseStream = sBaseStream;
m_sBase = sBase;
m_bWriting = bWriting;
m_bVerify = bVerify;
UTF8Encoding utf8 = StrUtil.Utf8;
if(!m_bWriting) // Reading mode
{
if(!m_sBaseStream.CanRead)
throw new InvalidOperationException();
if(!m_sBase.CanRead) throw new InvalidOperationException();
m_brInput = new BinaryReader(sBaseStream, utf8);
m_brInput = new BinaryReader(m_sBase, utf8);
m_pbBuffer = MemUtil.EmptyByteArray;
}
else // Writing mode
{
if(!m_sBaseStream.CanWrite)
throw new InvalidOperationException();
if(!m_sBase.CanWrite) throw new InvalidOperationException();
m_bwOutput = new BinaryWriter(sBaseStream, utf8);
m_bwOutput = new BinaryWriter(m_sBase, utf8);
m_pbBuffer = new byte[nBufferSize];
}
@@ -126,7 +119,7 @@ namespace ModernKeePassLib.Serialization
protected override void Dispose(bool disposing)
{
if(disposing && (m_sBaseStream != null))
if(disposing && (m_sBase != null))
{
if(!m_bWriting) // Reading mode
{
@@ -135,12 +128,12 @@ namespace ModernKeePassLib.Serialization
}
else // Writing mode
{
if(m_nBufferPos == 0) // No data left in buffer
WriteHashedBlock(); // Write terminating block
if(m_iBufferPos == 0) // No data left in buffer
WriteSafeBlock(); // Write terminating block
else
{
WriteHashedBlock(); // Write remaining buffered data
WriteHashedBlock(); // Write terminating block
WriteSafeBlock(); // Write remaining buffered data
WriteSafeBlock(); // Write terminating block
}
Flush();
@@ -148,47 +141,60 @@ namespace ModernKeePassLib.Serialization
m_bwOutput = null;
}
m_sBaseStream.Dispose();
m_sBaseStream = null;
m_sBase.Dispose();
m_sBase = null;
}
SetBuffer(MemUtil.EmptyByteArray);
base.Dispose(disposing);
}
private void SetBuffer(byte[] pb)
{
MemUtil.ZeroByteArray(m_pbBuffer); // Erase previous buffer
m_pbBuffer = pb;
}
public override void Flush()
{
if(m_bWriting) m_bwOutput.Flush();
Debug.Assert(m_sBase != null); // Object should not be disposed
if(m_bWriting && (m_bwOutput != null)) m_bwOutput.Flush();
}
public override long Seek(long lOffset, SeekOrigin soOrigin)
{
Debug.Assert(false);
throw new NotSupportedException();
}
public override void SetLength(long lValue)
{
Debug.Assert(false);
throw new NotSupportedException();
}
public override int Read(byte[] pbBuffer, int nOffset, int nCount)
public override int Read(byte[] pbBuffer, int iOffset, int nCount)
{
if(m_bWriting) throw new InvalidOperationException();
int nRemaining = nCount;
while(nRemaining > 0)
{
if(m_nBufferPos == m_pbBuffer.Length)
if(m_iBufferPos == m_pbBuffer.Length)
{
if(ReadHashedBlock() == false)
if(!ReadSafeBlock())
return (nCount - nRemaining); // Bytes actually read
}
int nCopy = Math.Min(m_pbBuffer.Length - m_nBufferPos, nRemaining);
int nCopy = Math.Min(m_pbBuffer.Length - m_iBufferPos, nRemaining);
Debug.Assert(nCopy > 0);
Array.Copy(m_pbBuffer, m_nBufferPos, pbBuffer, nOffset, nCopy);
Array.Copy(m_pbBuffer, m_iBufferPos, pbBuffer, iOffset, nCopy);
nOffset += nCopy;
m_nBufferPos += nCopy;
iOffset += nCopy;
m_iBufferPos += nCopy;
nRemaining -= nCopy;
}
@@ -196,11 +202,11 @@ namespace ModernKeePassLib.Serialization
return nCount;
}
private bool ReadHashedBlock()
private bool ReadSafeBlock()
{
if(m_bEos) return false; // End of stream reached already
m_nBufferPos = 0;
m_iBufferPos = 0;
if(m_brInput.ReadUInt32() != m_uBlockIndex)
throw new InvalidDataException();
@@ -229,11 +235,11 @@ namespace ModernKeePassLib.Serialization
}
m_bEos = true;
m_pbBuffer = MemUtil.EmptyByteArray;
SetBuffer(MemUtil.EmptyByteArray);
return false;
}
m_pbBuffer = m_brInput.ReadBytes(nBufferSize);
SetBuffer(m_brInput.ReadBytes(nBufferSize));
if((m_pbBuffer == null) || ((m_pbBuffer.Length != nBufferSize) && m_bVerify))
throw new InvalidDataException();
@@ -250,44 +256,45 @@ namespace ModernKeePassLib.Serialization
return true;
}
public override void Write(byte[] pbBuffer, int nOffset, int nCount)
public override void Write(byte[] pbBuffer, int iOffset, int nCount)
{
if(!m_bWriting) throw new InvalidOperationException();
while(nCount > 0)
{
if(m_nBufferPos == m_pbBuffer.Length)
WriteHashedBlock();
if(m_iBufferPos == m_pbBuffer.Length)
WriteSafeBlock();
int nCopy = Math.Min(m_pbBuffer.Length - m_nBufferPos, nCount);
int nCopy = Math.Min(m_pbBuffer.Length - m_iBufferPos, nCount);
Debug.Assert(nCopy > 0);
Array.Copy(pbBuffer, nOffset, m_pbBuffer, m_nBufferPos, nCopy);
Array.Copy(pbBuffer, iOffset, m_pbBuffer, m_iBufferPos, nCopy);
nOffset += nCopy;
m_nBufferPos += nCopy;
iOffset += nCopy;
m_iBufferPos += nCopy;
nCount -= nCopy;
}
}
private void WriteHashedBlock()
private void WriteSafeBlock()
{
m_bwOutput.Write(m_uBlockIndex);
++m_uBlockIndex;
if(m_nBufferPos > 0)
if(m_iBufferPos != 0)
{
byte[] pbHash = CryptoUtil.HashSha256(m_pbBuffer, 0, m_nBufferPos);
byte[] pbHash = CryptoUtil.HashSha256(m_pbBuffer, 0, m_iBufferPos);
// For KeePassLibSD:
// SHA256Managed sha256 = new SHA256Managed();
// byte[] pbHash;
// if(m_nBufferPos == m_pbBuffer.Length)
// if(m_iBufferPos == m_pbBuffer.Length)
// pbHash = sha256.ComputeHash(m_pbBuffer);
// else
// {
// byte[] pbData = new byte[m_nBufferPos];
// Array.Copy(m_pbBuffer, 0, pbData, 0, m_nBufferPos);
// byte[] pbData = new byte[m_iBufferPos];
// Array.Copy(m_pbBuffer, 0, pbData, 0, m_iBufferPos);
// pbHash = sha256.ComputeHash(pbData);
// }
@@ -301,12 +308,12 @@ namespace ModernKeePassLib.Serialization
m_bwOutput.Write((ulong)0);
}
m_bwOutput.Write(m_nBufferPos);
m_bwOutput.Write(m_iBufferPos);
if(m_nBufferPos > 0)
m_bwOutput.Write(m_pbBuffer, 0, m_nBufferPos);
if(m_iBufferPos != 0)
m_bwOutput.Write(m_pbBuffer, 0, m_iBufferPos);
m_nBufferPos = 0;
m_iBufferPos = 0;
}
}
}

19
ModernKeePassLib/Serialization/HmacBlockStream.cs
View File

@@ -1,6 +1,6 @@
/*
KeePass Password Safe - The Open-Source Password Manager
Copyright (C) 2003-2019 Dominik Reichl <dominik.reichl@t-online.de>
Copyright (C) 2003-2020 Dominik Reichl <dominik.reichl@t-online.de>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -119,9 +119,18 @@ namespace ModernKeePassLib.Serialization
m_sBase = null;
}
SetBuffer(MemUtil.EmptyByteArray);
base.Dispose(disposing);
}
private void SetBuffer(byte[] pb)
{
MemUtil.ZeroByteArray(m_pbBuffer); // Erase previous buffer
m_pbBuffer = pb;
}
public override void Flush()
{
Debug.Assert(m_sBase != null); // Object should not be disposed
@@ -225,7 +234,7 @@ namespace ModernKeePassLib.Serialization
m_iBufferPos = 0;
m_pbBuffer = MemUtil.Read(m_sBase, nBlockSize);
SetBuffer(MemUtil.Read(m_sBase, nBlockSize));
if((m_pbBuffer == null) || ((m_pbBuffer.Length != nBlockSize) && m_bVerify))
throw new EndOfStreamException(KLRes.FileCorrupted + " " +
KLRes.FileIncompleteExpc);
@@ -241,7 +250,7 @@ namespace ModernKeePassLib.Serialization
h.TransformBlock(pbBlockSize, 0, pbBlockSize.Length,
pbBlockSize, 0);
if(m_pbBuffer.Length > 0)
if(m_pbBuffer.Length != 0)
h.TransformBlock(m_pbBuffer, 0, m_pbBuffer.Length,
m_pbBuffer, 0);
@@ -302,7 +311,7 @@ namespace ModernKeePassLib.Serialization
h.TransformBlock(pbBlockSize, 0, pbBlockSize.Length,
pbBlockSize, 0);
if(cbBlockSize > 0)
if(cbBlockSize != 0)
h.TransformBlock(m_pbBuffer, 0, cbBlockSize, m_pbBuffer, 0);
h.TransformFinalBlock(MemUtil.EmptyByteArray, 0, 0);
@@ -314,7 +323,7 @@ namespace ModernKeePassLib.Serialization
MemUtil.Write(m_sBase, pbBlockHmac);
// MemUtil.Write(m_sBase, pbBlockIndex); // Implicit
MemUtil.Write(m_sBase, pbBlockSize);
if(cbBlockSize > 0)
if(cbBlockSize != 0)
m_sBase.Write(m_pbBuffer, 0, cbBlockSize);
++m_uBlockIndex;

48
ModernKeePassLib/Serialization/IOConnection.cs
View File

@@ -1,6 +1,6 @@
/*
KeePass Password Safe - The Open-Source Password Manager
Copyright (C) 2003-2019 Dominik Reichl <dominik.reichl@t-online.de>
Copyright (C) 2003-2020 Dominik Reichl <dominik.reichl@t-online.de>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -38,7 +38,7 @@ using ModernKeePassLib.Utility;
namespace ModernKeePassLib.Serialization
{
#if (!ModernKeePassLib && !KeePassLibSD && !KeePassRT)
#if (!ModernKeePassLib && !KeePassLibSD)
internal sealed class IOWebClient : WebClient
{
private IOConnectionInfo m_ioc;
@@ -240,7 +240,7 @@ namespace ModernKeePassLib.Serialization
public static class IOConnection
{
#if (!ModernKeePassLib && !KeePassLibSD && !KeePassRT)
#if (!ModernKeePassLib && !KeePassLibSD)
private static ProxyServerType m_pstProxyType = ProxyServerType.System;
private static string m_strProxyAddr = string.Empty;
private static string m_strProxyPort = string.Empty;
@@ -269,7 +269,7 @@ namespace ModernKeePassLib.Serialization
public static event EventHandler<IOAccessEventArgs> IOAccessPre;
#if (!ModernKeePassLib && !KeePassLibSD && !KeePassRT)
#if (!ModernKeePassLib && !KeePassLibSD)
// Allow self-signed certificates, expired certificates, etc.
private static bool AcceptCertificate(object sender,
X509Certificate certificate, X509Chain chain,
@@ -598,12 +598,12 @@ namespace ModernKeePassLib.Serialization
#if ModernKeePassLib
return new MemoryStream(ioc.Bytes);
#else
return new FileStream(ioc.Path, FileMode.Open, FileAccess.Read,
return new FileStream(ioc.Path, FileMode.Open, FileAccess.Read,
FileShare.Read);
#endif
}
#if (!ModernKeePassLib && !KeePassLibSD && !KeePassRT)
#if (!ModernKeePassLib && !KeePassLibSD)
public static Stream OpenWrite(IOConnectionInfo ioc)
{
if(ioc == null) { Debug.Assert(false); return null; }
@@ -640,7 +640,7 @@ namespace ModernKeePassLib.Serialization
return new FileStream(ioc.Path, FileMode.Create, FileAccess.Write,
FileShare.None);
#endif
}
}
public static bool FileExists(IOConnectionInfo ioc)
{
@@ -718,7 +718,7 @@ namespace ModernKeePassLib.Serialization
}
#endif
#endif
}
}
/// <summary>
/// Rename/move a file. For local file system and WebDAV, the
@@ -740,13 +740,15 @@ namespace ModernKeePassLib.Serialization
WebRequest req = CreateWebRequest(iocFrom);
if(req != null)
{
string strToCnc = UrlUtil.GetCanonicalUri(iocTo.Path);
if(IsHttpWebRequest(req))
{
#if KeePassUAP
throw new NotSupportedException();
#else
req.Method = "MOVE";
req.Headers.Set("Destination", iocTo.Path); // Full URL supported
req.Headers.Set("Destination", strToCnc); // Full URL supported
#endif
}
else if(IsFtpWebRequest(req))
@@ -755,13 +757,13 @@ namespace ModernKeePassLib.Serialization
throw new NotSupportedException();
#else
req.Method = WebRequestMethods.Ftp.Rename;
string strTo = UrlUtil.GetFileName(iocTo.Path);
string strToName = UrlUtil.GetFileName(strToCnc);
// We're affected by .NET bug 621450:
// https://connect.microsoft.com/VisualStudio/feedback/details/621450/problem-renaming-file-on-ftp-server-using-ftpwebrequest-in-net-framework-4-0-vs2010-only
// Prepending "./", "%2E/" or "Dummy/../" doesn't work.
((FtpWebRequest)req).RenameTo = strTo;
((FtpWebRequest)req).RenameTo = strToName;
#endif
}
else if(IsFileWebRequest(req))
@@ -776,7 +778,7 @@ namespace ModernKeePassLib.Serialization
throw new NotSupportedException();
#else
req.Method = WrmMoveFile;
req.Headers.Set(WrhMoveFileTo, iocTo.Path);
req.Headers.Set(WrhMoveFileTo, strToCnc);
#endif
}
@@ -800,7 +802,7 @@ namespace ModernKeePassLib.Serialization
#endif
}
#if (!ModernKeePassLib && !KeePassLibSD && !KeePassRT)
#if (!ModernKeePassLib && !KeePassLibSD)
private static bool SendCommand(IOConnectionInfo ioc, string strMethod)
{
try
@@ -835,24 +837,14 @@ namespace ModernKeePassLib.Serialization
#endif
public static byte[] ReadFile(IOConnectionInfo ioc)
{
Stream sIn = null;
MemoryStream ms = null;
try
{
sIn = IOConnection.OpenRead(ioc);
if(sIn == null) return null;
ms = new MemoryStream();
MemUtil.CopyStream(sIn, ms);
return ms.ToArray();
}
catch(Exception) { }
finally
{
if(sIn != null) sIn.Dispose();
if(ms != null) ms.Dispose();
using(Stream s = IOConnection.OpenRead(ioc))
{
return MemUtil.Read(s);
}
}
catch(Exception) { Debug.Assert(false); }
return null;
}

10
ModernKeePassLib/Serialization/IOConnectionInfo.cs
View File

@@ -1,6 +1,6 @@
/*
KeePass Password Safe - The Open-Source Password Manager
Copyright (C) 2003-2019 Dominik Reichl <dominik.reichl@t-online.de>
Copyright (C) 2003-2020 Dominik Reichl <dominik.reichl@t-online.de>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -63,10 +63,9 @@ namespace ModernKeePassLib.Serialization
public sealed class IOConnectionInfo : IDeepCloneable<IOConnectionInfo>
{
// private IOFileFormatHint m_ioHint = IOFileFormatHint.None;
public byte[] Bytes { get; set; }
private string m_strUrl = string.Empty;
private string m_strUrl = string.Empty;
public string Path
{
get { return m_strUrl; }
@@ -115,8 +114,7 @@ namespace ModernKeePassLib.Serialization
}
private IOCredSaveMode m_ioCredSaveMode = IOCredSaveMode.NoSave;
public IOCredSaveMode CredSaveMode
public IOCredSaveMode CredSaveMode
{
get { return m_ioCredSaveMode; }
set { m_ioCredSaveMode = value; }
@@ -333,7 +331,7 @@ namespace ModernKeePassLib.Serialization
return ioc;
}
public bool CanProbablyAccess()
public bool CanProbablyAccess()
{
#if ModernKeePassLib
if (IsLocalFile()) return Bytes != null;

2
ModernKeePassLib/Serialization/IocProperties.cs
View File

@@ -1,6 +1,6 @@
/*
KeePass Password Safe - The Open-Source Password Manager
Copyright (C) 2003-2019 Dominik Reichl <dominik.reichl@t-online.de>
Copyright (C) 2003-2020 Dominik Reichl <dominik.reichl@t-online.de>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by

2
ModernKeePassLib/Serialization/IocPropertyInfo.cs
View File

@@ -1,6 +1,6 @@
/*
KeePass Password Safe - The Open-Source Password Manager
Copyright (C) 2003-2019 Dominik Reichl <dominik.reichl@t-online.de>
Copyright (C) 2003-2020 Dominik Reichl <dominik.reichl@t-online.de>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by

2
ModernKeePassLib/Serialization/IocPropertyInfoPool.cs
View File

@@ -1,6 +1,6 @@
/*
KeePass Password Safe - The Open-Source Password Manager
Copyright (C) 2003-2019 Dominik Reichl <dominik.reichl@t-online.de>
Copyright (C) 2003-2020 Dominik Reichl <dominik.reichl@t-online.de>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by

2
ModernKeePassLib/Serialization/KdbxFile.Read.Streamed.cs
View File

@@ -1,6 +1,6 @@
/*
KeePass Password Safe - The Open-Source Password Manager
Copyright (C) 2003-2019 Dominik Reichl <dominik.reichl@t-online.de>
Copyright (C) 2003-2020 Dominik Reichl <dominik.reichl@t-online.de>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by

16
ModernKeePassLib/Serialization/KdbxFile.Read.cs
View File

@@ -1,6 +1,6 @@
/*
KeePass Password Safe - The Open-Source Password Manager
Copyright (C) 2003-2019 Dominik Reichl <dominik.reichl@t-online.de>
Copyright (C) 2003-2020 Dominik Reichl <dominik.reichl@t-online.de>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -53,18 +53,18 @@ namespace ModernKeePassLib.Serialization
/// </summary>
public sealed partial class KdbxFile
{
/// <summary>
/// Load a KDBX file.
/// </summary>
/// <param name="strFilePath">File to load.</param>
/// <param name="fmt">Format.</param>
/// <param name="slLogger">Status logger (optional).</param>
/// <summary>
/// Load a KDBX file.
/// </summary>
/// <param name="strFilePath">File to load.</param>
/// <param name="fmt">Format.</param>
/// <param name="slLogger">Status logger (optional).</param>
#if ModernKeePassLib
public void Load(byte[] fileContents, KdbxFormat fmt, IStatusLogger slLogger)
{
IOConnectionInfo ioc = IOConnectionInfo.FromByteArray(fileContents);
#else
public void Load(string strFilePath, KdbxFormat fmt, IStatusLogger slLogger)
public void Load(string strFilePath, KdbxFormat fmt, IStatusLogger slLogger)
{
IOConnectionInfo ioc = IOConnectionInfo.FromPath(strFilePath);
#endif

7
ModernKeePassLib/Serialization/KdbxFile.Write.cs
View File

@@ -1,6 +1,6 @@
/*
KeePass Password Safe - The Open-Source Password Manager
Copyright (C) 2003-2019 Dominik Reichl <dominik.reichl@t-online.de>
Copyright (C) 2003-2020 Dominik Reichl <dominik.reichl@t-online.de>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -842,7 +842,7 @@ namespace ModernKeePassLib.Serialization
// string transformation here. By default, language-dependent conversions
// should be applied, otherwise characters could be rendered incorrectly
// (code page problems).
if(m_bLocalizedNames)
if(g_bLocalizedNames)
{
StringBuilder sb = new StringBuilder();
foreach(char ch in strValue)
@@ -853,8 +853,7 @@ namespace ModernKeePassLib.Serialization
// page area
if(char.IsSymbol(ch) || char.IsSurrogate(ch))
{
System.Globalization.UnicodeCategory cat =
CharUnicodeInfo.GetUnicodeCategory(ch);
UnicodeCategory cat = CharUnicodeInfo.GetUnicodeCategory(ch);
// Map character to correct position in code page
chMapped = (char)((int)cat * 32 + ch);
}

15
ModernKeePassLib/Serialization/KdbxFile.cs
View File

@@ -1,6 +1,6 @@
/*
KeePass Password Safe - The Open-Source Password Manager
Copyright (C) 2003-2019 Dominik Reichl <dominik.reichl@t-online.de>
Copyright (C) 2003-2020 Dominik Reichl <dominik.reichl@t-online.de>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -227,7 +227,7 @@ namespace ModernKeePassLib.Serialization
private const uint NeutralLanguageOffset = 0x100000; // 2^20, see 32-bit Unicode specs
private const uint NeutralLanguageIDSec = 0x7DC5C; // See 32-bit Unicode specs
private const uint NeutralLanguageID = NeutralLanguageOffset + NeutralLanguageIDSec;
private static bool m_bLocalizedNames = false;
private static bool g_bLocalizedNames = false;
private enum KdbxHeaderFieldID : byte
{
@@ -312,8 +312,8 @@ namespace ModernKeePassLib.Serialization
public static void DetermineLanguageId()
{
// Test if localized names should be used. If localized names are used,
// the m_bLocalizedNames value must be set to true. By default, localized
// names should be used! (Otherwise characters could be corrupted
// the g_bLocalizedNames value must be set to true. By default, localized
// names should be used (otherwise characters could be corrupted
// because of different code pages).
unchecked
{
@@ -321,7 +321,7 @@ namespace ModernKeePassLib.Serialization
foreach(char ch in PwDatabase.LocalizedAppName)
uTest = uTest * 5 + ch;
m_bLocalizedNames = (uTest != NeutralLanguageID);
g_bLocalizedNames = (uTest != NeutralLanguageID);
}
}
@@ -331,8 +331,11 @@ namespace ModernKeePassLib.Serialization
// See also KeePassKdb2x3.Export (KDBX 3.1 export module)
if(m_pwDatabase.DataCipherUuid.Equals(ChaCha20Engine.ChaCha20Uuid))
return FileVersion32;
AesKdf kdfAes = new AesKdf();
if(!kdfAes.Uuid.Equals(m_pwDatabase.KdfParameters.KdfUuid))
if(!m_pwDatabase.KdfParameters.KdfUuid.Equals(kdfAes.Uuid))
return FileVersion32;
if(m_pwDatabase.PublicCustomData.Count > 0)

2
ModernKeePassLib/Serialization/OldFormatException.cs
View File

@@ -1,6 +1,6 @@
/*
KeePass Password Safe - The Open-Source Password Manager
Copyright (C) 2003-2019 Dominik Reichl <dominik.reichl@t-online.de>
Copyright (C) 2003-2020 Dominik Reichl <dominik.reichl@t-online.de>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by