moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-27 11:12:15 -05:00
Code Issues Releases Wiki Activity

Fix cleartext signatures internally

Browse Source
This commit is contained in:
Dominik Schürmann 2015-01-27 17:13:54 +01:00
parent d11d3933bc
commit 6c6201f129
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
View File

@ -428,7 +428,7 @@ public class KeychainIntentService extends IntentService implements Progressable
case ACTION_SIGN_ENCRYPT: case ACTION_SIGN_ENCRYPT:
try { try {
/* Input */ /* Input */
int source = data.get(SOURCE) != null ? data.getInt(SOURCE) : data.getInt(TARGET); int source = data.get(SOURCE) != null ? data.getInt(SOURCE) : data.getInt(TARGET);
Bundle resultData = new Bundle(); Bundle resultData = new Bundle();
@ -450,11 +450,12 @@ public class KeychainIntentService extends IntentService implements Progressable
OutputStream outStream = createCryptOutputStream(data); OutputStream outStream = createCryptOutputStream(data);
String originalFilename = getOriginalFilename(data); String originalFilename = getOriginalFilename(data);
/* Operation */ /* Operation */
PgpSignEncrypt.Builder builder = new PgpSignEncrypt.Builder( PgpSignEncrypt.Builder builder = new PgpSignEncrypt.Builder(
this, new ProviderHelper(this), this, inputData, outStream this, new ProviderHelper(this), this, inputData, outStream
); );
builder.setEnableAsciiArmorOutput(useAsciiArmor) builder.setEnableAsciiArmorOutput(useAsciiArmor)
.setCleartextSignature(true)
.setVersionHeader(PgpHelper.getVersionForHeader(this)) .setVersionHeader(PgpHelper.getVersionForHeader(this))
.setCompressionId(compressionId) .setCompressionId(compressionId)
.setSymmetricEncryptionAlgorithm( .setSymmetricEncryptionAlgorithm(
@ -491,10 +492,8 @@ public class KeychainIntentService extends IntentService implements Progressable
outStream.close(); outStream.close();
/* Output */ /* Output */
finalizeEncryptOutputStream(data, resultData, outStream); finalizeEncryptOutputStream(data, resultData, outStream);
} }
Log.logDebugBundle(resultData, "resultData"); Log.logDebugBundle(resultData, "resultData");