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

Remove native dll loading - needed for store inclusion

Browse Source
This commit is contained in:
Geoffroy Bonneville
2017-09-18 10:46:38 +02:00
parent daa6972792
commit 31832eb9c9
26 changed files with 384 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ModernKeePassLib/ModernKeePassLib.nuspec
View File

@@ -2,7 +2,7 @@
<package >
<metadata>
<id>ModernKeePassLib</id>
<version>2.19.2940</version>
<version>2.19.2950</version>
<title>ModernKeePassLib</title>
<authors>Geoffroy Bonneville</authors>
<owners>Geoffroy Bonneville</owners>

8
ModernKeePassLib/Native/NativeLib.cs
View File

@@ -172,12 +172,12 @@ namespace ModernKeePassLib.Native
KeyValuePair<IntPtr, IntPtr> kvp = PrepareArrays256(pBuf256, pKey256);
bool bResult = false;
try
/*try
{
bResult = NativeMethods.TransformKey(kvp.Key, kvp.Value, uRounds);
}
catch(Exception) { bResult = false; }
*/
if(bResult) GetBuffers256(kvp, pBuf256, pKey256);
NativeLib.FreeArrays(kvp);
@@ -196,8 +196,8 @@ namespace ModernKeePassLib.Native
if(m_bAllowNative == false) return false;
try { puRounds = NativeMethods.TransformKeyBenchmark(uTimeMs); }
catch(Exception) { return false; }
/*try { puRounds = NativeMethods.TransformKeyBenchmark(uTimeMs); }
catch(Exception) { return false; }*/
return true;
}

6
ModernKeePassLib/Native/NativeMethods.cs
View File

@@ -65,7 +65,7 @@ namespace ModernKeePassLib.Native
else
return TransformKeyTimed32(pBuf256, pKey256, ref puRounds, uSeconds);
} */
/*
[DllImport("KeePassLibC32.dll", EntryPoint = "TransformKey256")]
[return: MarshalAs(UnmanagedType.Bool)]
private static extern bool TransformKey32(IntPtr pBuf256,
@@ -75,7 +75,7 @@ namespace ModernKeePassLib.Native
[return: MarshalAs(UnmanagedType.Bool)]
private static extern bool TransformKey64(IntPtr pBuf256,
IntPtr pKey256, UInt64 uRounds);
internal static bool TransformKey(IntPtr pBuf256, IntPtr pKey256,
UInt64 uRounds)
{
@@ -98,7 +98,7 @@ namespace ModernKeePassLib.Native
else
return TransformKeyBenchmark32(uTimeMs);
}
*/
#if !KeePassLibSD && TODO
[DllImport("ShlWApi.dll", CharSet = CharSet.Unicode, ExactSpelling = true)]
internal static extern int StrCmpLogicalW(string x, string y);