diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-17 20:40:02 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-17 20:40:02 +0200 |
| commit | 1abf167f80e1eccfef551c2e1385999b06f9cfbf (patch) | |
| tree | ddccea574564896e18afb0a1973a9620fd4af40d /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service | |
| parent | 872491686632540d7e4196cc082a94a662204497 (diff) | |
| download | open-keychain-1abf167f80e1eccfef551c2e1385999b06f9cfbf.tar.gz open-keychain-1abf167f80e1eccfef551c2e1385999b06f9cfbf.tar.bz2 open-keychain-1abf167f80e1eccfef551c2e1385999b06f9cfbf.zip | |
Passphrase handling in encrypt
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | 10 |
1 files changed, 3 insertions, 7 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 9d06fe22a..78464a5aa 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java @@ -132,14 +132,13 @@ public class KeychainIntentService extends IntentService implements Progressable // encrypt public static final String ENCRYPT_SIGNATURE_MASTER_ID = "secret_key_id"; + public static final String ENCRYPT_SIGNATURE_KEY_PASSPHRASE = "secret_key_passphrase"; public static final String ENCRYPT_USE_ASCII_ARMOR = "use_ascii_armor"; public static final String ENCRYPT_ENCRYPTION_KEYS_IDS = "encryption_keys_ids"; public static final String ENCRYPT_COMPRESSION_ID = "compression_id"; public static final String ENCRYPT_MESSAGE_BYTES = "message_bytes"; - public static final String ENCRYPT_INPUT_FILE = "input_file"; public static final String ENCRYPT_INPUT_URI = "input_uri"; public static final String ENCRYPT_INPUT_URIS = "input_uris"; - public static final String ENCRYPT_OUTPUT_FILE = "output_file"; public static final String ENCRYPT_OUTPUT_URI = "output_uri"; public static final String ENCRYPT_OUTPUT_URIS = "output_uris"; public static final String ENCRYPT_SYMMETRIC_PASSPHRASE = "passphrase"; @@ -255,6 +254,7 @@ public class KeychainIntentService extends IntentService implements Progressable Bundle resultData = new Bundle(); long sigMasterKeyId = data.getLong(ENCRYPT_SIGNATURE_MASTER_ID); + String sigKeyPassphrase = data.getString(ENCRYPT_SIGNATURE_KEY_PASSPHRASE); String symmetricPassphrase = data.getString(ENCRYPT_SYMMETRIC_PASSPHRASE); boolean useAsciiArmor = data.getBoolean(ENCRYPT_USE_ASCII_ARMOR); @@ -300,14 +300,10 @@ public class KeychainIntentService extends IntentService implements Progressable new ProviderHelper(this).getCachedPublicKeyRing(sigMasterKeyId); long sigSubKeyId = signingRing.getSignId(); - // Get its passphrase from cache. It is assumed that this passphrase was - // cached prior to the service call. - String passphrase = PassphraseCacheService.getCachedPassphrase(this, sigSubKeyId); - // Set signature settings builder.setSignatureMasterKeyId(sigMasterKeyId) .setSignatureSubKeyId(sigSubKeyId) - .setSignaturePassphrase(passphrase) + .setSignaturePassphrase(sigKeyPassphrase) .setSignatureHashAlgorithm( Preferences.getPreferences(this).getDefaultHashAlgorithm()) .setAdditionalEncryptId(sigMasterKeyId); |