more openpgp bug fixes

iNPUTmice created 11 years ago

Change summary

libs/openpgp-api-lib                             |  2 +-
src/eu/siacs/conversations/crypto/PgpEngine.java | 10 +++++++---
2 files changed, 8 insertions(+), 4 deletions(-)

Detailed changes

libs/openpgp-api-lib

@@ -1 +1 @@
-Subproject commit 650e1ebda82596cd4fbfaae406e6eccf189f4f63
+Subproject commit 6bec5eedde31bacbafcb541a728719eeff99d3b7

src/eu/siacs/conversations/crypto/PgpEngine.java

@@ -171,8 +171,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());
@@ -304,7 +306,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")) {