cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2087 from open-keychain/handle-crcrlf

Browse Source 
Handle crcrlf
This commit is contained in:
Vincent Breitmoser
2017-04-20 10:18:49 +02:00
committed by GitHub
parent 625e02d385 5cb81fef94
commit 9fd3fc600f
5 changed files with 65 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
OpenKeychain/src/test/java/org/sufficientlysecure/keychain/ArmoredInputStreamTest.java Normal file
View File

@@ -0,0 +1,43 @@
package org.sufficientlysecure.keychain;
import java.io.InputStream;
import org.bouncycastle.bcpg.ArmoredInputStream;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.sufficientlysecure.keychain.pgp.UncachedKeyringTest;
import org.sufficientlysecure.keychain.support.TestDataUtil;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
@RunWith(KeychainTestRunner.class)
public class ArmoredInputStreamTest {
@Test
public void armoredInputStream__withDifferentLineEndings() throws Exception {
// these are generated by GPG4USB, see https://github.com/gpg4usb/gpg4usb/issues/25
ArmoredInputStream stream1 = new ArmoredInputStream(ArmoredInputStreamTest.class.getResourceAsStream("/armored_crcrlf.asc"));
ArmoredInputStream stream2 = new ArmoredInputStream(ArmoredInputStreamTest.class.getResourceAsStream("/armored_crlf.asc"));
ArmoredInputStream stream3 = new ArmoredInputStream(ArmoredInputStreamTest.class.getResourceAsStream("/armored_lf.asc"));
assertEquals(1, stream1.getArmorHeaders().length);
assertEquals("Comment: comment content", stream1.getArmorHeaders()[0]);
assertEquals(1, stream2.getArmorHeaders().length);
assertEquals("Comment: comment content", stream2.getArmorHeaders()[0]);
assertEquals(1, stream3.getArmorHeaders().length);
assertEquals("Comment: comment content", stream3.getArmorHeaders()[0]);
byte[] data1 = TestDataUtil.readFully(stream1);
byte[] data2 = TestDataUtil.readFully(stream2);
byte[] data3 = TestDataUtil.readFully(stream3);
assertArrayEquals(data1, data2);
assertArrayEquals(data1, data3);
}
}

7
OpenKeychain/src/test/resources/armored_crcrlf.asc Normal file
View File

@@ -0,0 +1,7 @@
-----BEGIN PGP ARMORED FILE-----
Comment: comment content
bWkgY21hbHUgY21heGknYSwgdGhpcyBkdW1teSB0ZXh0IG11c3QgYmUgbG9uZyBl

7
OpenKeychain/src/test/resources/armored_crlf.asc Normal file
View File

@@ -0,0 +1,7 @@
-----BEGIN PGP ARMORED FILE-----
Comment: comment content
bWkgY21hbHUgY21heGknYSwgdGhpcyBkdW1teSB0ZXh0IG11c3QgYmUgbG9uZyBl
bm91Z2ggZm9yIG11bHRpcGxlIGxpbmVzIG9mIGFybW9yZWQgdGV4dH4K
=Amd+
-----END PGP ARMORED FILE-----

7
OpenKeychain/src/test/resources/armored_lf.asc Normal file
View File

@@ -0,0 +1,7 @@
-----BEGIN PGP ARMORED FILE-----
Comment: comment content
bWkgY21hbHUgY21heGknYSwgdGhpcyBkdW1teSB0ZXh0IG11c3QgYmUgbG9uZyBl
bm91Z2ggZm9yIG11bHRpcGxlIGxpbmVzIG9mIGFybW9yZWQgdGV4dH4K
=Amd+
-----END PGP ARMORED FILE-----