diff options
Diffstat (limited to 'OpenPGP-Keychain')
| -rw-r--r-- | OpenPGP-Keychain/libs/sc-bzip2-1.47.0.3-SNAPSHOT.jar | bin | 0 -> 26304 bytes | |||
| -rw-r--r-- | OpenPGP-Keychain/libs/sc-light-jdk15on-1.47.0.3-SNAPSHOT.jar | bin | 0 -> 1482732 bytes | |||
| -rw-r--r-- | OpenPGP-Keychain/libs/scpg-jdk15on-1.47.0.3-SNAPSHOT.jar | bin | 0 -> 279065 bytes | |||
| -rw-r--r-- | OpenPGP-Keychain/libs/scprov-jdk15on-1.47.0.3-SNAPSHOT.jar | bin | 0 -> 987884 bytes | |||
| -rw-r--r-- | OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/PgpHelper.java | 13 |
5 files changed, 1 insertions, 12 deletions
diff --git a/OpenPGP-Keychain/libs/sc-bzip2-1.47.0.3-SNAPSHOT.jar b/OpenPGP-Keychain/libs/sc-bzip2-1.47.0.3-SNAPSHOT.jar Binary files differnew file mode 100644 index 000000000..7eca57732 --- /dev/null +++ b/OpenPGP-Keychain/libs/sc-bzip2-1.47.0.3-SNAPSHOT.jar diff --git a/OpenPGP-Keychain/libs/sc-light-jdk15on-1.47.0.3-SNAPSHOT.jar b/OpenPGP-Keychain/libs/sc-light-jdk15on-1.47.0.3-SNAPSHOT.jar Binary files differnew file mode 100644 index 000000000..cd745e171 --- /dev/null +++ b/OpenPGP-Keychain/libs/sc-light-jdk15on-1.47.0.3-SNAPSHOT.jar diff --git a/OpenPGP-Keychain/libs/scpg-jdk15on-1.47.0.3-SNAPSHOT.jar b/OpenPGP-Keychain/libs/scpg-jdk15on-1.47.0.3-SNAPSHOT.jar Binary files differnew file mode 100644 index 000000000..b96389952 --- /dev/null +++ b/OpenPGP-Keychain/libs/scpg-jdk15on-1.47.0.3-SNAPSHOT.jar diff --git a/OpenPGP-Keychain/libs/scprov-jdk15on-1.47.0.3-SNAPSHOT.jar b/OpenPGP-Keychain/libs/scprov-jdk15on-1.47.0.3-SNAPSHOT.jar Binary files differnew file mode 100644 index 000000000..6f3433dca --- /dev/null +++ b/OpenPGP-Keychain/libs/scprov-jdk15on-1.47.0.3-SNAPSHOT.jar diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/PgpHelper.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/PgpHelper.java index 810f3a6f2..60450ffb8 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/PgpHelper.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/PgpHelper.java @@ -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) { |