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

change opaque key tests to use unknown algorithms instead of eddsa

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-04-29 23:30:33 +02:00
parent 27582c1310
commit 50d8cd0559
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/OpaqueKeyTest.java
View File

@@ -42,9 +42,7 @@ public class OpaqueKeyTest {
@Test @Test
public void testOpaqueSubKey__canonicalize__shouldFail() throws Exception { public void testOpaqueSubKey__canonicalize__shouldFail() throws Exception {
// key from GnuPG's test suite, sample msg generated using GnuPG v2.1.18 UncachedKeyRing ring = readRingFromResource("/test-keys/unknown-sample-1.pub");
// TODO use for actual tests once eddsa is supported!
UncachedKeyRing ring = readRingFromResource("/test-keys/eddsa-sample-1-pub.asc");
OperationLog log = new OperationLog(); OperationLog log = new OperationLog();
ring.canonicalize(log, 0); ring.canonicalize(log, 0);
@@ -61,12 +59,12 @@ public class OpaqueKeyTest {
OperationLog log = new OperationLog(); OperationLog log = new OperationLog();
ring.canonicalize(log, 0); ring.canonicalize(log, 0);
assertTrue(log.containsType(LogType.MSG_KC_ERROR_MASTER_ALGO)); assertTrue(log.containsType(LogType.MSG_KC_SUB_BAD));
} }
@Test @Test
public void testOpaqueSubKey__canonicalize__shouldStrip() throws Exception { public void testOpaqueSubKey__canonicalize__shouldStrip() throws Exception {
UncachedKeyRing ring = readRingFromResource("/test-keys/eddsa-subkey.pub.asc"); UncachedKeyRing ring = readRingFromResource("/test-keys/unknown-subkey.pub.asc");
OperationLog log = new OperationLog(); OperationLog log = new OperationLog();
CanonicalizedKeyRing canonicalizedKeyRing = ring.canonicalize(log, 0); CanonicalizedKeyRing canonicalizedKeyRing = ring.canonicalize(log, 0);
@@ -78,7 +76,7 @@ public class OpaqueKeyTest {
@Test @Test
public void testOpaqueSubKey__reencode__shouldBeIdentical() throws Exception { public void testOpaqueSubKey__reencode__shouldBeIdentical() throws Exception {
byte[] rawKeyData = TestDataUtil.readFully( byte[] rawKeyData = TestDataUtil.readFully(
OpaqueKeyTest.class.getResourceAsStream("/test-keys/eddsa-subkey.pub.asc")); OpaqueKeyTest.class.getResourceAsStream("/test-keys/unknown-subkey.pub.asc"));
UncachedKeyRing ring = UncachedKeyRing.decodeFromData(rawKeyData); UncachedKeyRing ring = UncachedKeyRing.decodeFromData(rawKeyData);

BIN
OpenKeychain/src/test/resources/test-keys/unknown-sample-1.pub Normal file
View File

Binary file not shown.

BIN
OpenKeychain/src/test/resources/test-keys/unknown-subkey.pub.asc Normal file
View File

Binary file not shown.