diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-04-13 23:41:16 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-04-13 23:41:16 +0200 |
| commit | 1923942fc97534eb86177053a29868df5223cb16 (patch) | |
| tree | fd0c44d5d529f41921ac4d2b2e1f8c67220a27bd /OpenKeychain/src/main | |
| parent | f12c7b64d8b78b5927d8c5a76f9c16a0272a44c5 (diff) | |
| download | open-keychain-1923942fc97534eb86177053a29868df5223cb16.tar.gz open-keychain-1923942fc97534eb86177053a29868df5223cb16.tar.bz2 open-keychain-1923942fc97534eb86177053a29868df5223cb16.zip | |
Buffer ascii armored encryption/signatures
Diffstat (limited to 'OpenKeychain/src/main')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java | 5 | ||||
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java index cdb6000c2..8ecb30cdd 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java @@ -51,6 +51,7 @@ import org.sufficientlysecure.keychain.util.Log; import org.sufficientlysecure.keychain.util.Passphrase; import org.sufficientlysecure.keychain.util.ProgressScaler; +import java.io.BufferedOutputStream; import java.io.BufferedReader; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -130,7 +131,7 @@ public class PgpSignEncryptOperation extends BaseOperation { ArmoredOutputStream armorOut = null; OutputStream out; if (input.isEnableAsciiArmorOutput()) { - armorOut = new ArmoredOutputStream(outputStream); + armorOut = new ArmoredOutputStream(new BufferedOutputStream(outputStream, 1 << 16)); if (input.getVersionHeader() != null) { armorOut.setHeader("Version", input.getVersionHeader()); } @@ -408,7 +409,7 @@ public class PgpSignEncryptOperation extends BaseOperation { detachedByteOut = new ByteArrayOutputStream(); OutputStream detachedOut = detachedByteOut; if (input.isEnableAsciiArmorOutput()) { - detachedArmorOut = new ArmoredOutputStream(detachedOut); + detachedArmorOut = new ArmoredOutputStream(new BufferedOutputStream(detachedOut, 1 << 16)); if (input.getVersionHeader() != null) { detachedArmorOut.setHeader("Version", input.getVersionHeader()); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java index 681aff56d..b86618a9a 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java @@ -1165,7 +1165,7 @@ public class UncachedKeyRing { } } - // If anything changed, save the updated (sub)key + // If anything change, save the updated (sub)key if (modified != resultKey) { result = replacePublicKey(result, modified); } |