From 97bcf753a476aa1b2ddbbe7344447d8d241be9e2 Mon Sep 17 00:00:00 2001 From: Philipp Crocoll Date: Wed, 30 Jul 2014 06:25:37 +0200 Subject: [PATCH] + binary JavaFileStorage --- src/ArtTestApp/Activity1.cs | 82 +++++++----------- src/ArtTestApp/ArtTestApp.csproj | 13 --- src/KeePass.sln | 70 +++++++++++++++ src/MasterKeePlugin/MasterKeePlugin.csproj | 4 +- .../Resources/values/Strings.xml | 2 +- .../JavaFileStorage/bin/javafilestorage.jar | Bin 0 -> 535559 bytes .../JavaFileStorageTest/project.properties | 5 +- .../res/layout/activity_main.xml | 11 ++- .../javafilestoragetest/MainActivity.java | 70 ++++++++++++++- .../bin/keepass2androidpluginsdk.jar | Bin 20359 -> 20359 bytes src/java/PluginInputStick/AndroidManifest.xml | 4 +- .../keepass2android/plugin/inputstick/R.java | 7 +- .../PluginInputStick/res/values/strings.xml | 1 + .../plugin/inputstick/ActionReceiver.java | 20 ++++- src/keepass2android/AppKilledInfo.cs | 2 +- src/keepass2android/keepass2android.csproj | 2 +- 16 files changed, 214 insertions(+), 79 deletions(-) create mode 100644 src/java/JavaFileStorage/bin/javafilestorage.jar diff --git a/src/ArtTestApp/Activity1.cs b/src/ArtTestApp/Activity1.cs index 10968c43..6b366170 100644 --- a/src/ArtTestApp/Activity1.cs +++ b/src/ArtTestApp/Activity1.cs @@ -1,5 +1,7 @@ using System; using System.Collections.Generic; +using System.Diagnostics; +using System.Security.Cryptography; using Android.App; using Android.Content; using Android.Content.PM; @@ -7,22 +9,27 @@ using Android.Runtime; using Android.Views; using Android.Widget; using Android.OS; -using KeeChallenge; -using KeePassLib.Serialization; -using keepass2android; -using keepass2android.Io; + +//using KeePassLib.Serialization; +using MasterPassword; +//using keepass2android; +//using keepass2android.Io; namespace ArtTestApp { [Activity(Label = "ArtTestApp", MainLauncher = true, Icon = "@drawable/icon")] public class Activity1 : Activity { - private ChallengeInfo _chalInfo; - private byte[] _challengeSecret; - private IOConnectionInfo _ioConnectionInfo; - private IOConnectionInfo _ioConnectionInfoOut; + //private IOConnectionInfo _ioConnectionInfo; + //private IOConnectionInfo _ioConnectionInfoOut; private const int RequestCodeChallengeYubikey = 98; + private static byte[] HashHMAC(byte[] key, byte[] message) + { + var hash = new HMACSHA256(key); + return hash.ComputeHash(message); + } + protected override void OnCreate(Bundle bundle) { base.OnCreate(bundle); @@ -30,20 +37,31 @@ namespace ArtTestApp // Set our view from the "main" layout resource SetContentView(Resource.Layout.Main); - _ioConnectionInfo = new IOConnectionInfo() { Path = "/mnt/sdcard/keepass/keechallenge.xml" }; + /*_ioConnectionInfo = new IOConnectionInfo() { Path = "/mnt/sdcard/keepass/keechallenge.xml" }; _ioConnectionInfoOut = new IOConnectionInfo() { Path = "/mnt/sdcard/keepass/keechallengeOut.xml" }; - + */ + + FindViewById