PGPainless/pgpainless
PGPainless/pgpainless
1
0
Fork 0
mirror of https://github.com/pgpainless/pgpainless.git synced 2024-11-26 22:32:07 +01:00
Code Issues Releases Wiki Activity

Support multiline comments in ProducerOption.setComment().

Browse source
This commit is contained in:
feri 2022-02-24 17:04:30 +01:00 committed by Paul Schaub
parent 53f7815778
commit 7a77d0847a
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pgpainless-core/src/main/java/org/pgpainless/encryption_signing/EncryptionStream.java
View file

@ -76,7 +76,12 @@ public final class EncryptionStream extends OutputStream {
LOGGER.debug("Wrap encryption output in ASCII armor"); LOGGER.debug("Wrap encryption output in ASCII armor");
armorOutputStream = ArmoredOutputStreamFactory.get(outermostStream); armorOutputStream = ArmoredOutputStreamFactory.get(outermostStream);
if (options.hasComment()) { if (options.hasComment()) {
ArmorUtils.addCommentHeader(armorOutputStream, options.getComment()); String[] commentLines = options.getComment().split("\n");
for (String commentLine : commentLines) {
if (!commentLine.trim().isEmpty()) {
ArmorUtils.addCommentHeader(armorOutputStream, commentLine);
}
}
} }
outermostStream = armorOutputStream; outermostStream = armorOutputStream;
} }

15
pgpainless-core/src/test/java/org/pgpainless/example/Encrypt.java
View file

@ -133,8 +133,7 @@ public class Encrypt {
/** /**
* In this example, Alice is sending a signed and encrypted message to Bob. * In this example, Alice is sending a signed and encrypted message to Bob.
* She encrypts the message to both bobs certificate and her own. * She encrypts the message to both bobs certificate and her own.
* A comment header with the text "This comment was added using options." is added * A multiline comment header is added using the fluent ProducerOption syntax.
* using the fluent ProducerOption syntax.
* *
* Bob subsequently decrypts the message using his key. * Bob subsequently decrypts the message using his key.
*/ */
@ -152,7 +151,13 @@ public class Encrypt {
// plaintext message to encrypt // plaintext message to encrypt
String message = "Hello, World!\n"; String message = "Hello, World!\n";
String comment = "This comment was added using options."; String[] comments = {
"This comment was added using options.",
"And it has three lines.",
" ",
"Empty lines are skipped."
};
String comment = comments[0] + "\n" + comments[1] + "\n" + comments[2] + "\n" + comments[3];
ByteArrayOutputStream ciphertext = new ByteArrayOutputStream(); ByteArrayOutputStream ciphertext = new ByteArrayOutputStream();
// Encrypt and sign // Encrypt and sign
EncryptionStream encryptor = PGPainless.encryptAndOrSign() EncryptionStream encryptor = PGPainless.encryptAndOrSign()
@ -172,7 +177,9 @@ public class Encrypt {
String encryptedMessage = ciphertext.toString(); String encryptedMessage = ciphertext.toString();
// check that comment header was added after "BEGIN PGP" and "Version:" // check that comment header was added after "BEGIN PGP" and "Version:"
assertEquals(encryptedMessage.split("\n")[2].trim(), "Comment: " + comment); assertEquals(encryptedMessage.split("\n")[2].trim(), "Comment: " + comments[0]);
assertEquals(encryptedMessage.split("\n")[3].trim(), "Comment: " + comments[1]);
assertEquals(encryptedMessage.split("\n")[4].trim(), "Comment: " + comments[3]);
// also test, that decryption still works... // also test, that decryption still works...