more openpgp bug fixes
This commit is contained in:
parent
f1494f83ff
commit
2b941d19f8
|
@ -1 +1 @@
|
|||
Subproject commit 650e1ebda82596cd4fbfaae406e6eccf189f4f63
|
||||
Subproject commit 6bec5eedde31bacbafcb541a728719eeff99d3b7
|
|
@ -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")) {
|
||||
|
|
Loading…
Reference in New Issue