aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-01-27 17:13:54 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2015-01-27 17:13:54 +0100
commit6c6201f1292951fdc25b355c1693045d94186ff2 (patch)
tree66c1c3654a10ba1d489b856867508222947a2fbf
parentd11d3933bc2ee88169f33a5c5592eeacbb4ed9a0 (diff)
downloadopen-keychain-6c6201f1292951fdc25b355c1693045d94186ff2.tar.gz
open-keychain-6c6201f1292951fdc25b355c1693045d94186ff2.tar.bz2
open-keychain-6c6201f1292951fdc25b355c1693045d94186ff2.zip
Fix cleartext signatures internally
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java9
1 files changed, 4 insertions, 5 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 515711d1f..264b45035 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
@@ -428,7 +428,7 @@ public class KeychainIntentService extends IntentService implements Progressable
case ACTION_SIGN_ENCRYPT:
try {
- /* Input */
+ /* Input */
int source = data.get(SOURCE) != null ? data.getInt(SOURCE) : data.getInt(TARGET);
Bundle resultData = new Bundle();
@@ -450,11 +450,12 @@ public class KeychainIntentService extends IntentService implements Progressable
OutputStream outStream = createCryptOutputStream(data);
String originalFilename = getOriginalFilename(data);
- /* Operation */
+ /* Operation */
PgpSignEncrypt.Builder builder = new PgpSignEncrypt.Builder(
this, new ProviderHelper(this), this, inputData, outStream
);
builder.setEnableAsciiArmorOutput(useAsciiArmor)
+ .setCleartextSignature(true)
.setVersionHeader(PgpHelper.getVersionForHeader(this))
.setCompressionId(compressionId)
.setSymmetricEncryptionAlgorithm(
@@ -491,10 +492,8 @@ public class KeychainIntentService extends IntentService implements Progressable
outStream.close();
- /* Output */
-
+ /* Output */
finalizeEncryptOutputStream(data, resultData, outStream);
-
}
Log.logDebugBundle(resultData, "resultData");