From 4185bf0326165cbf52c261851d77cc91232bcc81 Mon Sep 17 00:00:00 2001
From: Bastien JANSEN <bastien.jansen@gmx.com>
Date: Tue, 11 Mar 2025 17:57:55 +0100
Subject: [PATCH] Fix #469

---
 .../encryption_signing/CRLFGeneratorStream.kt |  2 +-
 .../CanonicalizedDataEncryptionTest.java      | 22 ++++++++++++++-----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/pgpainless-core/src/main/kotlin/org/pgpainless/encryption_signing/CRLFGeneratorStream.kt b/pgpainless-core/src/main/kotlin/org/pgpainless/encryption_signing/CRLFGeneratorStream.kt
index badc8b48..76d747e0 100644
--- a/pgpainless-core/src/main/kotlin/org/pgpainless/encryption_signing/CRLFGeneratorStream.kt
+++ b/pgpainless-core/src/main/kotlin/org/pgpainless/encryption_signing/CRLFGeneratorStream.kt
@@ -37,7 +37,7 @@ class CRLFGeneratorStream(private val crlfOut: OutputStream, encoding: StreamEnc
     }
 
     override fun close() {
-        if (!isBinary && lastB == 'r'.code) {
+        if (!isBinary && lastB == '\r'.code) {
             crlfOut.write('\n'.code)
         }
         crlfOut.close()
diff --git a/pgpainless-core/src/test/java/org/pgpainless/decryption_verification/CanonicalizedDataEncryptionTest.java b/pgpainless-core/src/test/java/org/pgpainless/decryption_verification/CanonicalizedDataEncryptionTest.java
index 36e473ac..f9936db0 100644
--- a/pgpainless-core/src/test/java/org/pgpainless/decryption_verification/CanonicalizedDataEncryptionTest.java
+++ b/pgpainless-core/src/test/java/org/pgpainless/decryption_verification/CanonicalizedDataEncryptionTest.java
@@ -13,6 +13,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
+import java.util.stream.Stream;
 
 import org.bouncycastle.bcpg.ArmoredOutputStream;
 import org.bouncycastle.bcpg.CompressionAlgorithmTags;
@@ -30,6 +31,9 @@ import org.bouncycastle.openpgp.operator.bc.BcPGPContentSignerBuilder;
 import org.bouncycastle.util.io.Streams;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.pgpainless.PGPainless;
 import org.pgpainless.algorithm.DocumentSignatureType;
 import org.pgpainless.algorithm.HashAlgorithm;
@@ -288,11 +292,9 @@ public class CanonicalizedDataEncryptionTest {
         }
     }
 
-    @Test
-    public void resultOfDecryptionIsCRLFEncoded() throws PGPException, IOException {
-        String before = "Foo\nBar!\n";
-        String after = "Foo\r\nBar!\r\n";
-
+    @ParameterizedTest
+    @MethodSource("resultOfDecryptionIsCRLFEncodedArguments")
+    public void resultOfDecryptionIsCRLFEncoded(String before, String after) throws PGPException, IOException {
         String encrypted = encryptAndSign(before, DocumentSignatureType.BINARY_DOCUMENT, StreamEncoding.TEXT, true);
 
         ByteArrayInputStream in = new ByteArrayInputStream(encrypted.getBytes(StandardCharsets.UTF_8));
@@ -309,6 +311,16 @@ public class CanonicalizedDataEncryptionTest {
         assertArrayEquals(after.getBytes(StandardCharsets.UTF_8), decrypted.toByteArray());
     }
 
+    private static Stream<Arguments> resultOfDecryptionIsCRLFEncodedArguments() {
+        return Stream.of(
+                Arguments.of("foo", "foo"),
+                Arguments.of("rrr", "rrr"),
+                Arguments.of("Foo\nBar!\n", "Foo\r\nBar!\r\n"),
+                Arguments.of("Foo\rBar!\r", "Foo\r\nBar!\r\n"),
+                Arguments.of("Foo\r\nBar!\r\n", "Foo\r\nBar!\r\n")
+        );
+    }
+
     @Test
     public void resultOfDecryptionIsNotCRLFEncoded() throws PGPException, IOException {
         String beforeAndAfter = "Foo\nBar!\n";