aboutsummaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2013-05-13 08:33:48 -0700
committerDominik Schürmann <dominik@dominikschuermann.de>2013-05-13 08:33:48 -0700
commit9744b569ab7eda549e01cff685aa1b1d171cc28e (patch)
treee11e793c132c654b859d4c56b54e15b57f09244d /README.md
parent30fa184e7e6a3bbd1a26c39ef5c3037dcbe3ea32 (diff)
parent723a89079ca96f4af537f2a5f2a8b73c2bbb5704 (diff)
downloadopen-keychain-9744b569ab7eda549e01cff685aa1b1d171cc28e.tar.gz
open-keychain-9744b569ab7eda549e01cff685aa1b1d171cc28e.tar.bz2
open-keychain-9744b569ab7eda549e01cff685aa1b1d171cc28e.zip
Merge pull request #51 from ashh87/master
Updates spongycastle to the fork: https://github.com/ashh87/spongycastle This allows us to import secret keys much more quickly and to enable passphrase changing for subkey only secret keys.
Diffstat (limited to 'README.md')
-rw-r--r--README.md16
1 files changed, 10 insertions, 6 deletions
diff --git a/README.md b/README.md
index 5bdf080df..f4922a635 100644
--- a/README.md
+++ b/README.md
@@ -17,8 +17,8 @@ Fork OpenPGP Keychain and do a merge request. I will merge your changes back int
## Build with Eclipse
-1. File -> Import -> Android -> Existing Android Code Into Workspace, choose "OpenPGP-Kechain/android-libs/ActionBarSherlock"
-2. File -> Import -> Android -> Existing Android Code Into Workspace, choose "OpenPGP-Kechain"
+1. File -> Import -> Android -> Existing Android Code Into Workspace, choose "OpenPGP-Keychain/android-libs/ActionBarSherlock"
+2. File -> Import -> Android -> Existing Android Code Into Workspace, choose "OpenPGP-Keychain"
3. OpenPGP-Kechain can now be build
# Libraries
@@ -26,7 +26,7 @@ Fork OpenPGP Keychain and do a merge request. I will merge your changes back int
All JAR-Libraries are provided in this repository under "libs", all Android Library projects are under "android-libs".
* ActionBarSherlock to provide an ActionBar for Android < 3.0
-* Spongy Castle Crypto Lib (Android version of Bouncy Castle)
+* forked Spongy Castle Crypto Lib (Android version of Bouncy Castle)
* android-support-v4.jar: Compatibility Lib
* barcodescanner-android-integration-supportv4.jar: Barcode Scanner Integration
@@ -42,9 +42,12 @@ On error see: http://code.google.com/p/zxing/issues/detail?id=1207
## Build Spongy Castle
-Spongy Castle is the stock Bouncy Castle libraries with a couple of small changes to make it work on Android.
+Spongy Castle is the stock Bouncy Castle libraries with a couple of small changes to make it work on Android. OpenPGP-Keychain uses a forked version with some small changes to improve key import speed. These changes will be sent to Bouncy Castle, and Spongy Castle will be used again when they have filtered down.
+
+see
+* http://rtyley.github.com/spongycastle/
+* https://github.com/ashh87/spongycastle
-see http://rtyley.github.com/spongycastle/
# Notes
@@ -162,4 +165,5 @@ OpenPGP Kechain is licensed under Apache License v2.
* dashboard_scan_qrcode.svg
New creation for OpenPGP Kechain
- Apache License v2 \ No newline at end of file
+ Apache License v2
+