PeterCxy
/
open-keychain
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

2/2 use forked spongycastle to speed up secret key imports

This commit is contained in:
Ash Hughes 2013-05-13 15:10:52 +01:00
parent 3b798fd7e6
commit 5db08b9bdc
6 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
OpenPGP-Keychain/libs/sc-bzip2-1.47.0.3-SNAPSHOT.jar Normal file
View File

Binary file not shown.

BIN
OpenPGP-Keychain/libs/sc-light-jdk15on-1.47.0.3-SNAPSHOT.jar Normal file
View File

Binary file not shown.

BIN
OpenPGP-Keychain/libs/scpg-jdk15on-1.47.0.3-SNAPSHOT.jar Normal file
View File

Binary file not shown.

BIN
OpenPGP-Keychain/libs/scprov-jdk15on-1.47.0.3-SNAPSHOT.jar Normal file
View File

Binary file not shown.

13
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/PgpHelper.java
View File

@ -480,18 +480,7 @@ public class PgpHelper {
}
public static boolean isSecretKeyPrivateEmpty(PGPSecretKey secretKey) {
try {
PBESecretKeyDecryptor keyDecryptor = new JcePBESecretKeyDecryptorBuilder()
.setProvider(PgpMain.BOUNCY_CASTLE_PROVIDER_NAME).build(new char[] {});
PGPPrivateKey testKey = secretKey.extractPrivateKey(
keyDecryptor);
if (testKey != null) {
return false;
}
} catch (PGPException e) { //exception if wrong key => not empty
return false; //all good if this fails, we likely didn't use the right password
}
return true;
return secretKey.isPrivateKeyEmpty();
}
public static boolean isSecretKeyPrivateEmpty(Context context, long keyId) {

16
README.md
View File

@ -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
Apache License v2