moparisthebest/keepass2android
1
0
Fork 0
mirror of https://github.com/moparisthebest/keepass2android synced 2024-11-26 03:02:24 -05:00
Code Issues Releases Wiki Activity

Added custom logger for better tracability of problems

Browse Source
This commit is contained in:
Philipp Crocoll 2013-07-06 16:10:33 +02:00
parent 4e8baf2b6a
commit 5f4d467da4
5 changed files with 67 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/KeePassLib2Android/KeePassLib2Android.csproj
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -55,6 +55,7 @@
<Reference Include="Mono.Security" />
</ItemGroup>
<ItemGroup>
<Compile Include="Kp2aLog.cs" />
<Compile Include="Resources\Resource.designer.cs" />
<Compile Include="Resources\KLRes.Generated.cs" />
<Compile Include="Resources\KSRes.Generated.cs" />

5
src/KeePassLib2Android/Keys/CompositeKey.cs
View File

@ -28,6 +28,7 @@ using KeePassLib.Native;
using KeePassLib.Resources;
using KeePassLib.Security;
using KeePassLib.Utility;
using keepass2android;
namespace KeePassLib.Keys
{
@ -266,7 +267,7 @@ namespace KeePassLib.Keys
if (NativeLib.TransformKey256(pbNewKey, pbKeySeed32, uNumRounds))
{
sw.Stop();
Android.Util.Log.Debug("DEBUG", "Native transform:" +sw.ElapsedMilliseconds+"ms");
Kp2aLog.Log("Native transform:" +sw.ElapsedMilliseconds+"ms");
return pbNewKey;
}
@ -274,7 +275,7 @@ namespace KeePassLib.Keys
if(TransformKeyManaged(pbNewKey, pbKeySeed32, uNumRounds) == false)
return null;
sw.Stop();
Android.Util.Log.Debug("DEBUG", "Managed transform:" +sw.ElapsedMilliseconds+"ms");
Kp2aLog.Log("Managed transform:" +sw.ElapsedMilliseconds+"ms");
SHA256Managed sha256 = new SHA256Managed();
return sha256.ComputeHash(pbNewKey);

58
src/KeePassLib2Android/Kp2aLog.cs Normal file
View File

@ -0,0 +1,58 @@
/*
This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll.
Keepass2Android is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
Keepass2Android is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Keepass2Android. If not, see <http://www.gnu.org/licenses/>.
*/
using System;
using System.IO;
using Android.Preferences;
using KeePassLib.Serialization;
namespace keepass2android
{
public static class Kp2aLog
{
private static bool? _logToFile;
public static void Log(string message)
{
Android.Util.Log.Debug("KP2A", message);
if (LogToFile)
{
using (var streamWriter = File.AppendText(LogFilename))
{
string stringToLog = DateTime.Now+":"+DateTime.Now.Millisecond+ " -- " + message;
streamWriter.WriteLine(stringToLog);
}
}
}
private static string LogFilename
{
get { return "/mnt/sdcard/keepass2android.log"; }
}
private static bool LogToFile
{
get
{
if (_logToFile == null)
_logToFile = File.Exists(LogFilename);
return (bool) _logToFile;
}
}
}
}

2
src/KeePassLib2Android/Native/NativeLib.cs
View File

@ -164,7 +164,7 @@ namespace KeePassLib.Native
try
{
//Android.Util.Log.Debug("DEBUG", "4+1"+new Kp2atest.TestClass().Add1(4));
//Kp2aLog.Log("4+1"+new Kp2atest.TestClass().Add1(4));
Com.Keepassdroid.Crypto.Finalkey.NativeFinalKey key = new Com.Keepassdroid.Crypto.Finalkey.NativeFinalKey();
byte[] newKey = key.TransformMasterKey(pKey256, pBuf256, (int)uRounds);

5
src/KeePassLib2Android/Serialization/IOConnection.cs
View File

@ -34,6 +34,7 @@ using System.Net.Security;
using KeePassLib.Native;
using KeePassLib.Utility;
using keepass2android;
namespace KeePassLib.Serialization
{
@ -211,10 +212,10 @@ namespace KeePassLib.Serialization
wc.Credentials = credentialCache;
} catch (NotImplementedException e)
{
Android.Util.Log.Debug("DEBUG", e.ToString());
Kp2aLog.Log(e.ToString());
} catch (Exception e)
{
Android.Util.Log.Debug("DEBUG", e.ToString());
Kp2aLog.Log(e.ToString());
Debug.Assert(false);
}
}