add test for opaque cv25519 subkey (which previously crashed)

OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/OpaqueKeyTest.java

@@ -52,6 +52,18 @@ public class OpaqueKeyTest {
         assertTrue(log.containsType(LogType.MSG_KC_ERROR_MASTER_ALGO));
     }
 
+    @Test
+    public void testOpaqueOidSubKey__canonicalize__shouldFail() throws Exception {
+        // key from GnuPG's test suite, sample msg generated using GnuPG v2.1.18
+        // TODO use for actual tests once eddsa is supported!
+        UncachedKeyRing ring = readRingFromResource("/test-keys/ed25519-cv25519-sample-1.asc");
+
+        OperationLog log = new OperationLog();
+        ring.canonicalize(log, 0);
+
+        assertTrue(log.containsType(LogType.MSG_KC_ERROR_MASTER_ALGO));
+    }
+
     @Test
     public void testOpaqueSubKey__canonicalize__shouldStrip() throws Exception {
         UncachedKeyRing ring = readRingFromResource("/test-keys/eddsa-subkey.pub.asc");

OpenKeychain/src/test/resources/test-keys/ed25519-cv25519-sample-1.asc

@@ -0,0 +1,21 @@
+pub   ed25519 2016-06-22 [SC]
+      B21DEAB4F875FB3DA42F1D1D139563682A020D0A
+      Keygrip = 1E28F20E41B54C2D1234D896096495FF57E08D18
+uid           [ unknown] patrice.lumumba@example.net
+sub   cv25519 2016-06-22 [E]
+      8D0221D9B2877A741D69AC4E9185878E4FCD74C0
+      Keygrip = EB33B687EB8581AB64D04852A54453E85F3DF62D
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2
+
+mDMEV2o9XRYJKwYBBAHaRw8BAQdAZ8zkuQDL9x7rcvvoo6s3iEF1j88Dknd9nZhL
+nTEoBRm0G3BhdHJpY2UubHVtdW1iYUBleGFtcGxlLm5ldIh5BBMWCAAhBQJXaj1d
+AhsDBQsJCAcCBhUICQoLAgQWAgMBAh4BAheAAAoJEBOVY2gqAg0KmQ0BAMUNzAlT
+OzG7tolSI92lhePi5VqutdqTEQTyYYWi1aEsAP0YfiuosNggTc0oRTSz46S3i0Qj
+AlpXwfU00888yIreDbg4BFdqPY0SCisGAQQBl1UBBQEBB0AWeeZlz31O4qTmIKr3
+CZhlRUXZFxc3YKyoCXyIZBBRawMBCAeIYQQYFggACQUCV2o9jQIbDAAKCRATlWNo
+KgINCsuFAP9BplWl813pi779V8OMsRGs/ynyihnOESft/H8qlM8PDQEAqIUPpIty
+OX/OBFy2RIlIi7J1bTp9RzcbzQ/4Fk4hWQQ=
+=qRfF
+-----END PGP PUBLIC KEY BLOCK-----