diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-05-04 03:38:58 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-05-04 03:38:58 +0200 |
| commit | b5647b2062e3233451532f44ce03c8b1bcdb7a3e (patch) | |
| tree | ba419a49a80c98ca4305e40c86b30ba23c263727 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service | |
| parent | f524fa692c8ab9bd737f7b03a5104ff2b2867669 (diff) | |
| download | open-keychain-b5647b2062e3233451532f44ce03c8b1bcdb7a3e.tar.gz open-keychain-b5647b2062e3233451532f44ce03c8b1bcdb7a3e.tar.bz2 open-keychain-b5647b2062e3233451532f44ce03c8b1bcdb7a3e.zip | |
wrapped-key-ring: no more pgp imports in PassphraseDialogFragment
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java index 972362f5f..af6e66937 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java @@ -801,7 +801,9 @@ public class KeychainIntentService extends IntentService CachedPublicKeyRing publicRing = providerHelper.getCachedPublicKeyRing(pubKeyId); CachedSecretKeyRing secretKeyRing = providerHelper.getCachedSecretKeyRing(masterKeyId); CachedSecretKey certificationKey = secretKeyRing.getSubKey(); - certificationKey.unlock(signaturePassphrase); + if(!certificationKey.unlock(signaturePassphrase)) { + throw new PgpGeneralException("Error extracting key (bad passphrase?)"); + } UncachedKeyRing newRing = certificationKey.certifyUserIds(publicRing, userIds); // store the signed key in our local cache |