diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-07-22 06:43:59 -0700 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-07-22 06:43:59 -0700 |
| commit | dce5b92d25d59fec14120c390cca648272a30b7f (patch) | |
| tree | ee1719c8ae033abf21d7985844d454365480b787 /OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/PgpMain.java | |
| parent | 92d76e482ada74538a634ff74d7836476a1bd8c1 (diff) | |
| parent | eaeb10c1e8b4f6524303a639b568bbfe7d7f0436 (diff) | |
| download | open-keychain-dce5b92d25d59fec14120c390cca648272a30b7f.tar.gz open-keychain-dce5b92d25d59fec14120c390cca648272a30b7f.tar.bz2 open-keychain-dce5b92d25d59fec14120c390cca648272a30b7f.zip | |
Merge pull request #57 from bcbarnes-gmx/Issue56
Implemented Issue56
Diffstat (limited to 'OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/PgpMain.java')
| -rw-r--r-- | OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/PgpMain.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/PgpMain.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/PgpMain.java index 142dfec01..d236f9faa 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/PgpMain.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/PgpMain.java @@ -132,7 +132,8 @@ public class PgpMain { } // Not BC due to the use of Spongy Castle for Android - public static final String BOUNCY_CASTLE_PROVIDER_NAME = "SC"; + public static final String SC = BouncyCastleProvider.PROVIDER_NAME; + public static final String BOUNCY_CASTLE_PROVIDER_NAME = SC; private static final int[] PREFERRED_SYMMETRIC_ALGORITHMS = new int[] { SymmetricKeyAlgorithmTags.AES_256, SymmetricKeyAlgorithmTags.AES_192, @@ -323,8 +324,9 @@ public class PgpMain { } PGPSecretKeyRing newKeyRing = PGPSecretKeyRing.copyWithNewPassword(keyRing, - oldPassPhrase.toCharArray(), newPassPhrase.toCharArray(), keyRing.getSecretKey().getKeyEncryptionAlgorithm(), - new SecureRandom(), BOUNCY_CASTLE_PROVIDER_NAME); + new JcePBESecretKeyDecryptorBuilder( + new JcaPGPDigestCalculatorProviderBuilder().setProvider(BOUNCY_CASTLE_PROVIDER_NAME).build()).setProvider(BOUNCY_CASTLE_PROVIDER_NAME).build(oldPassPhrase.toCharArray()), + new JcePBESecretKeyEncryptorBuilder(keyRing.getSecretKey().getKeyEncryptionAlgorithm()).build(newPassPhrase.toCharArray())); updateProgress(progress, R.string.progress_savingKeyRing, 50, 100); |