From 6c6201f1292951fdc25b355c1693045d94186ff2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Tue, 27 Jan 2015 17:13:54 +0100 Subject: Fix cleartext signatures internally --- .../keychain/service/KeychainIntentService.java | 9 ++++----- 1 file 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"); -- cgit v1.2.3