aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-09-13 21:59:47 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-09-13 21:59:47 +0200
commitb67b6b7f874c2f448f8636f7c0d465b381b9ea65 (patch)
tree48aa4fc3b59d64ae13e6e646c54a1248ccc54686
parentf8677a5f166308e34c0652d9890f4120a6e712aa (diff)
downloadopen-keychain-b67b6b7f874c2f448f8636f7c0d465b381b9ea65.tar.gz
open-keychain-b67b6b7f874c2f448f8636f7c0d465b381b9ea65.tar.bz2
open-keychain-b67b6b7f874c2f448f8636f7c0d465b381b9ea65.zip
Set literal data format tag to UTF8 when encrypting text
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
index d82c68316..070239a80 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
@@ -434,7 +434,13 @@ public class PgpSignEncrypt {
}
PGPLiteralDataGenerator literalGen = new PGPLiteralDataGenerator();
- pOut = literalGen.open(bcpgOut, PGPLiteralData.BINARY, mOriginalFilename, new Date(),
+ char literalDataFormatTag;
+ if (mCleartextInput) {
+ literalDataFormatTag = PGPLiteralData.UTF8;
+ } else {
+ literalDataFormatTag = PGPLiteralData.BINARY;
+ }
+ pOut = literalGen.open(bcpgOut, literalDataFormatTag, mOriginalFilename, new Date(),
new byte[1 << 16]);
long alreadyWritten = 0;