Allow CRLF line endings in some PGP tests

Author: peterdettman

pg/src/test/java/org/bouncycastle/openpgp/api/test/OpenPGPDetachedSignatureProcessorTest.java

@@ -22,6 +22,7 @@
 import org.bouncycastle.openpgp.api.SignatureParameters;
 import org.bouncycastle.openpgp.api.SignatureSubpacketsFunction;
 import org.bouncycastle.openpgp.operator.PGPKeyPairGenerator;
+import org.bouncycastle.util.Strings;
 
 public class OpenPGPDetachedSignatureProcessorTest
         extends APITest
@@ -63,7 +64,7 @@ private void createVerifyV4Signature(OpenPGPApi api)
         OpenPGPSignature.OpenPGPDocumentSignature signature = signatures.get(0);
         isEquals(4, signature.getSignature().getVersion());
         String armored = signature.toAsciiArmoredString();
-        isTrue(armored.startsWith("-----BEGIN PGP SIGNATURE-----\n"));
+        isTrue(armored.startsWith("-----BEGIN PGP SIGNATURE-----" + Strings.lineSeparator()));
 
         // Verify detached signatures
         OpenPGPDetachedSignatureProcessor processor = api.verifyDetachedSignature();
@@ -90,7 +91,7 @@ private void createVerifyV6Signature(OpenPGPApi api)
         OpenPGPSignature.OpenPGPDocumentSignature signature = signatures.get(0);
         isEquals(6, signature.getSignature().getVersion());
         String armored = signature.toAsciiArmoredString();
-        isTrue(armored.startsWith("-----BEGIN PGP SIGNATURE-----\n"));
+        isTrue(armored.startsWith("-----BEGIN PGP SIGNATURE-----" + Strings.lineSeparator()));
 
         // Verify detached signatures
         OpenPGPDetachedSignatureProcessor processor = api.verifyDetachedSignature();

pg/src/test/java/org/bouncycastle/openpgp/api/test/OpenPGPMessageGeneratorTest.java

@@ -13,6 +13,7 @@
 import org.bouncycastle.openpgp.api.OpenPGPKey;
 import org.bouncycastle.openpgp.api.OpenPGPMessageGenerator;
 import org.bouncycastle.openpgp.api.OpenPGPMessageOutputStream;
+import org.bouncycastle.util.Strings;
 import org.bouncycastle.util.encoders.Hex;
 
 public class OpenPGPMessageGeneratorTest
@@ -52,12 +53,13 @@ private void armoredLiteralDataPacket(OpenPGPApi api)
 
         msgOut.close();
 
-        isEquals(
-                "-----BEGIN PGP MESSAGE-----\n" +
-                        "\n" +
-                        "yxNiAAAAAABIZWxsbywgV29ybGQh\n" +
-                        "-----END PGP MESSAGE-----\n",
-                bOut.toString());
+        String nl = Strings.lineSeparator();
+        String expected = 
+        	"-----BEGIN PGP MESSAGE-----" + nl +
+            nl +
+            "yxNiAAAAAABIZWxsbywgV29ybGQh" + nl +
+            "-----END PGP MESSAGE-----" + nl;
+        isEquals(expected, bOut.toString());
     }
 
     private void unarmoredLiteralDataPacket(OpenPGPApi api)
@@ -93,11 +95,13 @@ private void armoredCompressedLiteralDataPacket(OpenPGPApi api)
 
         msgOut.close();
 
-        isEquals("-----BEGIN PGP MESSAGE-----\n" +
-                "\n" +
-                "yBUBOy2cxAACHqk5Ofk6CuH5RTkpigA=\n" +
-                "-----END PGP MESSAGE-----\n",
-                bOut.toString());
+        String nl = Strings.lineSeparator();
+        String expected =
+        	"-----BEGIN PGP MESSAGE-----" + nl +
+            nl +
+            "yBUBOy2cxAACHqk5Ofk6CuH5RTkpigA=" + nl +
+            "-----END PGP MESSAGE-----" + nl;
+        isEquals(expected, bOut.toString());
     }
 
     private void unarmoredCompressedLiteralDataPacket(OpenPGPApi api)

pg/src/test/java/org/bouncycastle/openpgp/test/ArmorCRCTest.java

@@ -19,17 +19,17 @@
 public class ArmorCRCTest
     extends SimpleTest
 {
-
+	private static final String NL = Strings.lineSeparator();
     private static final String WITHOUT_CRC = "" +
-        "-----BEGIN PGP MESSAGE-----\n" +
-        "\n" +
-        "yxR0AAAAAABIZWxsbywgV29ybGQhCg==\n" +
-        "-----END PGP MESSAGE-----\n";
+        "-----BEGIN PGP MESSAGE-----" + NL +
+        NL +
+        "yxR0AAAAAABIZWxsbywgV29ybGQhCg==" + NL +
+        "-----END PGP MESSAGE-----" + NL;
     private static final String FAULTY_CRC = "" +
-        "-----BEGIN PGP MESSAGE-----\n" +
-        "\n" +
-        "yxR0AAAAAABIZWxsbywgV29ybGQhCg==\n" +
-        "=TRA9\n" +
+        "-----BEGIN PGP MESSAGE-----" + NL +
+        NL +
+        "yxR0AAAAAABIZWxsbywgV29ybGQhCg==" + NL +
+        "=TRA9" + NL +
         "-----END PGP MESSAGE-----";
 
     @Override