aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-09-03 15:33:44 +0200
committeriNPUTmice <daniel@gultsch.de>2014-09-03 15:39:35 +0200
commit2b941d19f8cc9a517806a27d1ac976afbaa1677a (patch)
tree4c689ad320a265bcd8faf1fb797c751ff67ad4cf
parentf1494f83ff7dd9c7d0ebdb176d36293f42297988 (diff)
more openpgp bug fixes
m---------libs/openpgp-api-lib10
-rw-r--r--src/eu/siacs/conversations/crypto/PgpEngine.java10
2 files changed, 12 insertions, 8 deletions
diff --git a/libs/openpgp-api-lib b/libs/openpgp-api-lib
-Subproject 650e1ebda82596cd4fbfaae406e6eccf189f4f6
+Subproject 6bec5eedde31bacbafcb541a728719eeff99d3b
diff --git a/src/eu/siacs/conversations/crypto/PgpEngine.java b/src/eu/siacs/conversations/crypto/PgpEngine.java
index 7b5ef905..d8222ac5 100644
--- a/src/eu/siacs/conversations/crypto/PgpEngine.java
+++ b/src/eu/siacs/conversations/crypto/PgpEngine.java
@@ -168,8 +168,10 @@ public class PgpEngine {
os.flush();
StringBuilder encryptedMessageBody = new StringBuilder();
String[] lines = os.toString().split("\n");
- for (int i = 3; i < lines.length - 1; ++i) {
- encryptedMessageBody.append(lines[i].trim());
+ for (int i = 2; i < lines.length - 1; ++i) {
+ if (!lines[i].contains("Version")) {
+ encryptedMessageBody.append(lines[i].trim());
+ }
}
message.setEncryptedBody(encryptedMessageBody
.toString());
@@ -301,7 +303,9 @@ public class PgpEngine {
if (line.contains("END PGP SIGNATURE")) {
sig = false;
} else {
- signatureBuilder.append(line.trim());
+ if (!line.contains("Version")) {
+ signatureBuilder.append(line.trim());
+ }
}
}
if (line.contains("BEGIN PGP SIGNATURE")) {