diff options
| author | bcbarnes-gmx <bcbarnes@gmx.com> | 2013-07-19 10:08:52 -0500 |
|---|---|---|
| committer | bcbarnes-gmx <bcbarnes@gmx.com> | 2013-07-19 10:08:52 -0500 |
| commit | 3f97e30fa06ceb407fa26588300ab92aa882438d (patch) | |
| tree | 1fb71c693073bb7a689d93fd1fde9d2ab5bd6456 /OpenPGP-Keychain | |
| parent | 92d76e482ada74538a634ff74d7836476a1bd8c1 (diff) | |
| parent | 515b415a56fa6a464fb16ff7f96d839e27883e7b (diff) | |
| download | open-keychain-3f97e30fa06ceb407fa26588300ab92aa882438d.tar.gz open-keychain-3f97e30fa06ceb407fa26588300ab92aa882438d.tar.bz2 open-keychain-3f97e30fa06ceb407fa26588300ab92aa882438d.zip | |
Merge branch 'master' of git://github.com/ashh87/openpgp-keychain
Diffstat (limited to 'OpenPGP-Keychain')
| -rw-r--r-- | OpenPGP-Keychain/libs/scpg-jdk15on-1.47.0.3-SNAPSHOT.jar | bin | 279076 -> 279296 bytes | |||
| -rw-r--r-- | OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/PgpMain.java | 5 |
2 files changed, 3 insertions, 2 deletions
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 differindex 55c28d5b7..a63969c8a 100644 --- a/OpenPGP-Keychain/libs/scpg-jdk15on-1.47.0.3-SNAPSHOT.jar +++ b/OpenPGP-Keychain/libs/scpg-jdk15on-1.47.0.3-SNAPSHOT.jar diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/PgpMain.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/PgpMain.java index 142dfec01..60be62b92 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/PgpMain.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/PgpMain.java @@ -323,8 +323,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); |