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

ModernKeePassLib namespace restoration

Browse Source
This commit is contained in:
Geoffroy Bonneville
2017-09-26 15:38:58 +02:00
parent 27aaa8023a
commit 1faa26473d
114 changed files with 785 additions and 747 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ModernKeePassLib/Serialization/BinaryReaderEx.cs
View File

@@ -22,9 +22,9 @@ using System.Collections.Generic;
using System.Text;
using System.IO;
using ModernKeePassLibPCL.Utility;
using ModernKeePassLib.Utility;
namespace ModernKeePassLibPCL.Serialization
namespace ModernKeePassLib.Serialization
{
public sealed class BinaryReaderEx
{

12
ModernKeePassLib/Serialization/FileLock.cs
View File

@@ -21,7 +21,7 @@ using System;
using System.Collections.Generic;
using System.Text;
using System.IO;
#if ModernKeePassLibPCL
#if ModernKeePassLib
using System.Threading.Tasks;
#else
using System.Threading;
@@ -29,11 +29,11 @@ using System.Threading;
using System.Diagnostics;
using System.Runtime.InteropServices.WindowsRuntime;
using Windows.Storage.Streams;
using ModernKeePassLibPCL.Cryptography;
using ModernKeePassLibPCL.Resources;
using ModernKeePassLibPCL.Utility;
using ModernKeePassLib.Cryptography;
using ModernKeePassLib.Resources;
using ModernKeePassLib.Utility;
namespace ModernKeePassLibPCL.Serialization
namespace ModernKeePassLib.Serialization
{
public sealed class FileLockException : Exception
{
@@ -233,7 +233,7 @@ namespace ModernKeePassLibPCL.Serialization
if(bFileDeleted) break;
#if ModernKeePassLibPCL
#if ModernKeePassLib
if(bDisposing)
Task.Delay(50).Wait();
#else

18
ModernKeePassLib/Serialization/FileTransactionEx.cs
View File

@@ -23,16 +23,16 @@ using System.Text;
using System.IO;
using System.Diagnostics;
#if (!ModernKeePassLibPCL && !KeePassLibSD && !KeePassRT)
#if (!ModernKeePassLib && !KeePassLibSD && !KeePassRT)
using System.Security.AccessControl;
#endif
using ModernKeePassLibPCL.Native;
using ModernKeePassLibPCL.Utility;
using ModernKeePassLib.Native;
using ModernKeePassLib.Utility;
using System.Threading.Tasks;
using Windows.Storage.Streams;
namespace ModernKeePassLibPCL.Serialization
namespace ModernKeePassLib.Serialization
{
public sealed class FileTransactionEx
{
@@ -61,8 +61,8 @@ namespace ModernKeePassLibPCL.Serialization
m_bTransacted = bTransacted;
m_iocBase = iocBaseFile.CloneDeep();
// ModernKeePassLibPCL is currently targeting .NET 4.5
#if !ModernKeePassLibPCL
// ModernKeePassLib is currently targeting .NET 4.5
#if !ModernKeePassLib
// Prevent transactions for FTP URLs under .NET 4.0 in order to
// avoid/workaround .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
@@ -104,14 +104,14 @@ namespace ModernKeePassLibPCL.Serialization
{
bool bMadeUnhidden = UrlUtil.UnhideFile(m_iocBase.Path);
#if (!ModernKeePassLibPCL && !KeePassLibSD && !KeePassRT)
#if (!ModernKeePassLib && !KeePassLibSD && !KeePassRT)
FileSecurity bkSecurity = null;
bool bEfsEncrypted = false;
#endif
if(IOConnection.FileExists(m_iocBase))
{
#if (!ModernKeePassLibPCL && !KeePassLibSD && !KeePassRT)
#if (!ModernKeePassLib && !KeePassLibSD && !KeePassRT)
if(m_iocBase.IsLocalFile())
{
try
@@ -133,7 +133,7 @@ namespace ModernKeePassLibPCL.Serialization
IOConnection.RenameFile(m_iocTemp, m_iocBase);
#if (!ModernKeePassLibPCL && !KeePassLibSD && !KeePassRT)
#if (!ModernKeePassLib && !KeePassLibSD && !KeePassRT)
if(m_iocBase.IsLocalFile())
{
try

14
ModernKeePassLib/Serialization/HashedBlockStream.cs
View File

@@ -19,7 +19,7 @@
using System;
using System.IO;
#if ModernKeePassLibPCL
#if ModernKeePassLib
using System.Linq;
using Windows.Security.Cryptography;
#else
@@ -28,15 +28,15 @@ using System.Security.Cryptography;
using System.Diagnostics;
using System.Text;
using ModernKeePassLibPCL.Native;
using ModernKeePassLibPCL.Utility;
using ModernKeePassLib.Native;
using ModernKeePassLib.Utility;
using Windows.Security.Cryptography.Core;
#if KeePassLibSD
using KeePassLibSD;
#endif
namespace ModernKeePassLibPCL.Serialization
namespace ModernKeePassLib.Serialization
{
public sealed class HashedBlockStream : Stream
{
@@ -136,7 +136,7 @@ namespace ModernKeePassLibPCL.Serialization
if(m_bWriting) m_bwOutput.Flush();
}
#if ModernKeePassLibPCL || KeePassRT
#if ModernKeePassLib || KeePassRT
protected override void Dispose(bool disposing)
{
if(!disposing) return;
@@ -251,7 +251,7 @@ namespace ModernKeePassLibPCL.Serialization
if(m_bVerify)
{
#if ModernKeePassLibPCL
#if ModernKeePassLib
/*var sha256 = WinRTCrypto.HashAlgorithmProvider.OpenAlgorithm(HashAlgorithm.Sha256);
var pbComputedHash = sha256.HashData(m_pbBuffer);*/
var sha256 = HashAlgorithmProvider.OpenAlgorithm(HashAlgorithmNames.Sha256);
@@ -302,7 +302,7 @@ namespace ModernKeePassLibPCL.Serialization
if(m_nBufferPos > 0)
{
#if ModernKeePassLibPCL
#if ModernKeePassLib
/*var sha256 = WinRTCrypto.HashAlgorithmProvider.OpenAlgorithm(HashAlgorithm.Sha256);
var pbHash = sha256.HashData(m_pbBuffer.Where((x, i) => i < m_nBufferPos).ToArray());*/
var sha256 = HashAlgorithmProvider.OpenAlgorithm(HashAlgorithmNames.Sha256);

24
ModernKeePassLib/Serialization/IOConnection.cs
View File

@@ -24,24 +24,24 @@ using System.Net;
using System.Diagnostics;
using Windows.Storage.Streams;
using System.Threading.Tasks;
#if (!ModernKeePassLibPCL && !KeePassLibSD && !KeePassRT)
#if (!ModernKeePassLib && !KeePassLibSD && !KeePassRT)
using System.Net.Cache;
using System.Net.Security;
#endif
#if !ModernKeePassLibPCL && !KeePassRT
#if !ModernKeePassLib && !KeePassRT
using System.Security.Cryptography.X509Certificates;
#endif
#if ModernKeePassLibPCL
#if ModernKeePassLib
using Windows.Storage;
//using PCLStorage;
#endif
using ModernKeePassLibPCL.Utility;
using ModernKeePassLib.Utility;
namespace ModernKeePassLibPCL.Serialization
namespace ModernKeePassLib.Serialization
{
#if (!ModernKeePassLibPCL && !KeePassLibSD && !KeePassRT)
#if (!ModernKeePassLib && !KeePassLibSD && !KeePassRT)
internal sealed class IOWebClient : WebClient
{
protected override WebRequest GetWebRequest(Uri address)
@@ -53,7 +53,7 @@ namespace ModernKeePassLibPCL.Serialization
}
#endif
#if !ModernKeePassLibPCL
#if !ModernKeePassLib
internal abstract class WrapperStream : Stream
{
private readonly Stream m_s;
@@ -226,7 +226,7 @@ namespace ModernKeePassLibPCL.Serialization
public static class IOConnection
{
#if (!ModernKeePassLibPCL && !KeePassLibSD && !KeePassRT)
#if (!ModernKeePassLib && !KeePassLibSD && !KeePassRT)
private static ProxyServerType m_pstProxyType = ProxyServerType.System;
private static string m_strProxyAddr = string.Empty;
private static string m_strProxyPort = string.Empty;
@@ -250,7 +250,7 @@ namespace ModernKeePassLibPCL.Serialization
public static event EventHandler<IOAccessEventArgs> IOAccessPre;
#if (!ModernKeePassLibPCL && !KeePassLibSD && !KeePassRT)
#if (!ModernKeePassLib && !KeePassLibSD && !KeePassRT)
// Allow self-signed certificates, expired certificates, etc.
private static bool AcceptCertificate(object sender,
X509Certificate certificate, X509Chain chain,
@@ -435,7 +435,7 @@ namespace ModernKeePassLibPCL.Serialization
return ioc.StorageFile.OpenAsync(FileAccessMode.Read).GetAwaiter().GetResult().AsStream();
}
#if (!ModernKeePassLibPCL && !KeePassLibSD && !KeePassRT)
#if (!ModernKeePassLib && !KeePassLibSD && !KeePassRT)
public static Stream OpenWrite(IOConnectionInfo ioc)
{
if(ioc == null) { Debug.Assert(false); return null; }
@@ -511,7 +511,7 @@ namespace ModernKeePassLibPCL.Serialization
iocFrom.StorageFile?.RenameAsync(iocTo.Path).GetAwaiter().GetResult();
}
#if (!ModernKeePassLibPCL && !KeePassLibSD && !KeePassRT)
#if (!ModernKeePassLib && !KeePassLibSD && !KeePassRT)
private static bool SendCommand(IOConnectionInfo ioc, string strMethod)
{
try
@@ -525,7 +525,7 @@ namespace ModernKeePassLibPCL.Serialization
return true;
}
#endif
#if !ModernKeePassLibPCL
#if !ModernKeePassLib
internal static void DisposeResponse(WebResponse wr, bool bGetStream)
{
if(wr == null) return;

10
ModernKeePassLib/Serialization/IOConnectionInfo.cs
View File

@@ -25,16 +25,16 @@ using System.Net;
using System.ComponentModel;
using System.Xml.Serialization;
using System.Diagnostics;
#if ModernKeePassLibPCL
#if ModernKeePassLib
using Windows.Storage;
//using PCLStorage;
#endif
using ModernKeePassLibPCL.Interfaces;
using ModernKeePassLibPCL.Utility;
using ModernKeePassLib.Interfaces;
using ModernKeePassLib.Utility;
using System.Threading.Tasks;
namespace ModernKeePassLibPCL.Serialization
namespace ModernKeePassLib.Serialization
{
public enum IOCredSaveMode
{
@@ -309,7 +309,7 @@ namespace ModernKeePassLibPCL.Serialization
public async Task<bool> CanProbablyAccess()
{
#if ModernKeePassLibPCL
#if ModernKeePassLib
if (IsLocalFile())
{
//return (FileSystem.Current.GetFileFromPathAsync(m_strUrl).Result != null);

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

@@ -26,16 +26,16 @@ using System.Xml;
using System.IO;
using System.Diagnostics;
using ModernKeePassLibPCL;
using ModernKeePassLibPCL.Collections;
using ModernKeePassLibPCL.Cryptography;
using ModernKeePassLibPCL.Cryptography.Cipher;
using ModernKeePassLibPCL.Interfaces;
using ModernKeePassLibPCL.Resources;
using ModernKeePassLibPCL.Security;
using ModernKeePassLibPCL.Utility;
using ModernKeePassLib;
using ModernKeePassLib.Collections;
using ModernKeePassLib.Cryptography;
using ModernKeePassLib.Cryptography.Cipher;
using ModernKeePassLib.Interfaces;
using ModernKeePassLib.Resources;
using ModernKeePassLib.Security;
using ModernKeePassLib.Utility;
namespace ModernKeePassLibPCL.Serialization
namespace ModernKeePassLib.Serialization
{
/// <summary>
/// Serialization to KeePass KDBX files.
@@ -99,7 +99,7 @@ namespace ModernKeePassLibPCL.Serialization
xrs.IgnoreProcessingInstructions = true;
xrs.IgnoreWhitespace = true;
#if !ModernKeePassLibPCL
#if !ModernKeePassLib
// these are default values, so no need to set them
#if !KeePassRT
#if !KeePassLibSD
@@ -690,7 +690,7 @@ namespace ModernKeePassLibPCL.Serialization
}
m_bReadNextNode = false; // ReadElementString skips end tag
#if ModernKeePassLibPCL
#if ModernKeePassLib
return xr.ReadElementContentAsString();
#else
return xr.ReadElementString();
@@ -700,7 +700,7 @@ namespace ModernKeePassLibPCL.Serialization
private string ReadStringRaw(XmlReader xr)
{
m_bReadNextNode = false; // ReadElementString skips end tag
#if ModernKeePassLibPCL
#if ModernKeePassLib
return xr.ReadElementContentAsString();
#else
return xr.ReadElementString();

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

@@ -23,7 +23,7 @@ using System.Text;
using System.IO;
using System.Diagnostics;
using System.Security;
#if ModernKeePassLibPCL
#if ModernKeePassLib
using Windows.Security.Cryptography;
#else
using System.Security.Cryptography;
@@ -36,16 +36,16 @@ using System.IO.Compression;
using KeePassLibSD;
#endif
using ModernKeePassLibPCL.Cryptography;
using ModernKeePassLibPCL.Cryptography.Cipher;
using ModernKeePassLibPCL.Interfaces;
using ModernKeePassLibPCL.Keys;
using ModernKeePassLibPCL.Resources;
using ModernKeePassLibPCL.Utility;
using ModernKeePassLib.Cryptography;
using ModernKeePassLib.Cryptography.Cipher;
using ModernKeePassLib.Interfaces;
using ModernKeePassLib.Keys;
using ModernKeePassLib.Resources;
using ModernKeePassLib.Utility;
using Windows.Security.Cryptography.Core;
using Windows.Storage.Streams;
namespace ModernKeePassLibPCL.Serialization
namespace ModernKeePassLib.Serialization
{
/// <summary>
/// Serialization to KeePass KDBX files.
@@ -156,7 +156,7 @@ namespace ModernKeePassLibPCL.Serialization
// GC.KeepAlive(br);
// GC.KeepAlive(brDecrypted);
}
#if !ModernKeePassLibPCL
#if !ModernKeePassLib
catch(CryptographicException) // Thrown on invalid padding
{
throw new CryptographicException(KLRes.FileCorrupted);
@@ -222,7 +222,7 @@ namespace ModernKeePassLibPCL.Serialization
byte[] pbHeader = msHeader.ToArray();
msHeader.Dispose();
#if ModernKeePassLibPCL
#if ModernKeePassLib
/*var sha256 = WinRTCrypto.HashAlgorithmProvider.OpenAlgorithm(HashAlgorithm.Sha256);
m_pbHashOfHeader = sha256.HashData(pbHeader);*/
var sha256 = HashAlgorithmProvider.OpenAlgorithm(HashAlgorithmNames.Sha256);
@@ -352,7 +352,7 @@ namespace ModernKeePassLibPCL.Serialization
throw new SecurityException(KLRes.InvalidCompositeKey);
ms.Write(pKey32, 0, 32);
#if ModernKeePassLibPCL
#if ModernKeePassLib
/*var sha256 = WinRTCrypto.HashAlgorithmProvider.OpenAlgorithm(HashAlgorithm.Sha256);
var aesKey = sha256.HashData(ms.ToArray());*/
var sha256 = HashAlgorithmProvider.OpenAlgorithm(HashAlgorithmNames.Sha256);

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

@@ -23,7 +23,7 @@ using System.Text;
using System.IO;
using System.Xml;
using System.Security;
#if ModernKeePassLibPCL
#if ModernKeePassLib
using Windows.Security.Cryptography;
#else
using System.Security.Cryptography;
@@ -38,19 +38,19 @@ using System.IO.Compression;
using KeePassLibSD;
#endif
using ModernKeePassLibPCL.Collections;
using ModernKeePassLibPCL.Cryptography;
using ModernKeePassLibPCL.Cryptography.Cipher;
using ModernKeePassLibPCL.Delegates;
using ModernKeePassLibPCL.Interfaces;
using ModernKeePassLibPCL.Keys;
using ModernKeePassLibPCL.Resources;
using ModernKeePassLibPCL.Security;
using ModernKeePassLibPCL.Utility;
using ModernKeePassLib.Collections;
using ModernKeePassLib.Cryptography;
using ModernKeePassLib.Cryptography.Cipher;
using ModernKeePassLib.Delegates;
using ModernKeePassLib.Interfaces;
using ModernKeePassLib.Keys;
using ModernKeePassLib.Resources;
using ModernKeePassLib.Security;
using ModernKeePassLib.Utility;
using Windows.Security.Cryptography.Core;
using Windows.Storage.Streams;
namespace ModernKeePassLibPCL.Serialization
namespace ModernKeePassLib.Serialization
{
/// <summary>
/// Serialization to KeePass KDBX files.
@@ -126,7 +126,7 @@ namespace ModernKeePassLibPCL.Serialization
writerStream = hashedStream;
else { Debug.Assert(false); throw new FormatException("KdbFormat"); }
#if ModernKeePassLibPCL
#if ModernKeePassLib
var settings = new XmlWriterSettings() {
Encoding = encNoBom,
Indent = true,
@@ -192,7 +192,7 @@ namespace ModernKeePassLibPCL.Serialization
byte[] pbHeader = ms.ToArray();
#if ModernKeePassLibPCL
#if ModernKeePassLib
/*var sha256 = WinRTCrypto.HashAlgorithmProvider.OpenAlgorithm(HashAlgorithm.Sha256);
m_pbHashOfHeader = sha256.HashData(pbHeader);*/
var sha256 = HashAlgorithmProvider.OpenAlgorithm(HashAlgorithmNames.Sha256);
@@ -243,7 +243,7 @@ namespace ModernKeePassLibPCL.Serialization
throw new SecurityException(KLRes.InvalidCompositeKey);
ms.Write(pKey32, 0, 32);
#if ModernKeePassLibPCL
#if ModernKeePassLib
/*var sha256 = WinRTCrypto.HashAlgorithmProvider.OpenAlgorithm(HashAlgorithm.Sha256);
var aesKey = sha256.HashData(ms.ToArray());*/
var sha256 = HashAlgorithmProvider.OpenAlgorithm(HashAlgorithmNames.Sha256);
@@ -275,7 +275,7 @@ namespace ModernKeePassLibPCL.Serialization
BinPoolBuild(pgRoot);
#if !ModernKeePassLibPCL
#if !ModernKeePassLib
m_xmlWriter.Formatting = Formatting.Indented;
m_xmlWriter.IndentChar = '\t';
m_xmlWriter.Indentation = 1;

22
ModernKeePassLib/Serialization/KdbxFile.cs
View File

@@ -29,19 +29,19 @@ using System.Diagnostics;
using System.IO.Compression;
#endif
#if ModernKeePassLibPCL
#if ModernKeePassLib
//using PCLStorage;
using Windows.Storage;
#endif
using ModernKeePassLibPCL.Collections;
using ModernKeePassLibPCL.Cryptography;
using ModernKeePassLibPCL.Delegates;
using ModernKeePassLibPCL.Interfaces;
using ModernKeePassLibPCL.Security;
using ModernKeePassLibPCL.Utility;
using ModernKeePassLib.Collections;
using ModernKeePassLib.Cryptography;
using ModernKeePassLib.Delegates;
using ModernKeePassLib.Interfaces;
using ModernKeePassLib.Security;
using ModernKeePassLib.Utility;
namespace ModernKeePassLibPCL.Serialization
namespace ModernKeePassLib.Serialization
{
/// <summary>
/// The <c>KdbxFile</c> class supports saving the data to various
@@ -196,7 +196,7 @@ namespace ModernKeePassLibPCL.Serialization
private PwDatabase m_pwDatabase; // Not null, see constructor
#if ModernKeePassLibPCL
#if ModernKeePassLib
private XmlWriter m_xmlWriter = null;
#else
private XmlTextWriter m_xmlWriter = null;
@@ -384,14 +384,14 @@ namespace ModernKeePassLibPCL.Serialization
++iTry;
}
#if ModernKeePassLibPCL
#if ModernKeePassLib
//while(FileSystem.Current.GetFileFromPathAsync(strPath).Result != null);
while (StorageFile.GetFileFromPathAsync(strPath).GetResults() != null);
#else
while(File.Exists(strPath));
#endif
#if ModernKeePassLibPCL
#if ModernKeePassLib
byte[] pbData = pb.ReadData();
/*var file = FileSystem.Current.GetFileFromPathAsync(strPath).Result;
using (var stream = file.OpenAsync(FileAccess.ReadAndWrite).Result) {*/

6
ModernKeePassLib/Serialization/OldFormatException.cs
View File

@@ -21,10 +21,10 @@ using System;
using System.Collections.Generic;
using System.Text;
using ModernKeePassLibPCL.Resources;
using ModernKeePassLibPCL.Utility;
using ModernKeePassLib.Resources;
using ModernKeePassLib.Utility;
namespace ModernKeePassLibPCL.Serialization
namespace ModernKeePassLib.Serialization
{
public sealed class OldFormatException : Exception
{