narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

more openpgp bug fixes

Browse source
This commit is contained in:
iNPUTmice 2014-09-03 15:33:44 +02:00
parent f1494f83ff
commit 2b941d19f8
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libs/openpgp-api-lib

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

10
src/eu/siacs/conversations/crypto/PgpEngine.java
View file

@ -168,8 +168,10 @@ public class PgpEngine {
os.flush(); os.flush();
StringBuilder encryptedMessageBody = new StringBuilder(); StringBuilder encryptedMessageBody = new StringBuilder();
String[] lines = os.toString().split("\n"); String[] lines = os.toString().split("\n");
for (int i = 3; i < lines.length - 1; ++i) { for (int i = 2; i < lines.length - 1; ++i) {
encryptedMessageBody.append(lines[i].trim()); if (!lines[i].contains("Version")) {
encryptedMessageBody.append(lines[i].trim());
}
} }
message.setEncryptedBody(encryptedMessageBody message.setEncryptedBody(encryptedMessageBody
.toString()); .toString());
@ -301,7 +303,9 @@ public class PgpEngine {
if (line.contains("END PGP SIGNATURE")) { if (line.contains("END PGP SIGNATURE")) {
sig = false; sig = false;
} else { } else {
signatureBuilder.append(line.trim()); if (!line.contains("Version")) {
signatureBuilder.append(line.trim());
}
} }
} }
if (line.contains("BEGIN PGP SIGNATURE")) { if (line.contains("BEGIN PGP SIGNATURE")) {