From 50d8cd05597ac85f3b87d2dd629d14e999b0327c Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Sat, 29 Apr 2017 23:30:33 +0200
Subject: [PATCH] change opaque key tests to use unknown algorithms instead of
 eddsa

---
 .../keychain/pgp/OpaqueKeyTest.java              |  10 ++++------
 .../resources/test-keys/unknown-sample-1.pub     | Bin 0 -> 230 bytes
 .../resources/test-keys/unknown-subkey.pub.asc   | Bin 0 -> 1114 bytes
 3 files changed, 4 insertions(+), 6 deletions(-)
 create mode 100644 OpenKeychain/src/test/resources/test-keys/unknown-sample-1.pub
 create mode 100644 OpenKeychain/src/test/resources/test-keys/unknown-subkey.pub.asc

diff --git a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/OpaqueKeyTest.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/OpaqueKeyTest.java
index b3dce051c..9e25841fb 100644
--- a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/OpaqueKeyTest.java
+++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/OpaqueKeyTest.java
@@ -42,9 +42,7 @@ public class OpaqueKeyTest {
 
     @Test
     public void testOpaqueSubKey__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/eddsa-sample-1-pub.asc");
+        UncachedKeyRing ring = readRingFromResource("/test-keys/unknown-sample-1.pub");
 
         OperationLog log = new OperationLog();
         ring.canonicalize(log, 0);
@@ -61,12 +59,12 @@ public class OpaqueKeyTest {
         OperationLog log = new OperationLog();
         ring.canonicalize(log, 0);
 
-        assertTrue(log.containsType(LogType.MSG_KC_ERROR_MASTER_ALGO));
+        assertTrue(log.containsType(LogType.MSG_KC_SUB_BAD));
     }
 
     @Test
     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();
         CanonicalizedKeyRing canonicalizedKeyRing = ring.canonicalize(log, 0);
@@ -78,7 +76,7 @@ public class OpaqueKeyTest {
     @Test
     public void testOpaqueSubKey__reencode__shouldBeIdentical() throws Exception {
         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);
 
diff --git a/OpenKeychain/src/test/resources/test-keys/unknown-sample-1.pub b/OpenKeychain/src/test/resources/test-keys/unknown-sample-1.pub
new file mode 100644
index 0000000000000000000000000000000000000000..ff4354c9a2c9079f5348990dc297998de37960a1
GIT binary patch
literal 230
zcmV<C02%+7GXzufUkfS;D+U1s0oq3o0Raa<KM9GHz1bG+KvNlcG~}p!fO9$$fYvX7
z5ScDR?mHv~v@}IzL{mW^b75_8Y-J#8WqBYmASh&VVP<qKYj0y{EoEe6b73uJZ*nbf
zaAj_AXK*brFe!+61QQkr03iheQ}bU70viJb3ke7Z0tOWb2?`4W1Qr4V0RkQY0vCV)
z3JDO5{ox^(mRg!~P5}RDDt>U!c+av7y{E2o$31?;kt_YjGZhSfwTUF-+hlkE{y*5s
g6NH5iX;q>8XVvYtAGQm<#c~`ofc6SlSu<CN1;7+f0ssI2

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/test/resources/test-keys/unknown-subkey.pub.asc b/OpenKeychain/src/test/resources/test-keys/unknown-subkey.pub.asc
new file mode 100644
index 0000000000000000000000000000000000000000..abef454c5885ef4631d16f62f5fd9100ff723a07
GIT binary patch
literal 1114
zcmbQq$jcIOaGo_I2gB=<e{~9K%!$(s*6LNRy`PhGqJ5TuL6EsY>H`N6za72@w(!lY
zu{ft&@A7(@t6kh?-2&a+50=`#`BoXBA|M=9`YC^s$qBbRw*$Tg8tuOSe!@!mr3WpK
zulLqcP|be&_tl9r9Q_+Fw*6XRUZ;KTLuG1IQFr}{8?R=(xl}m&ea9lj#fv^P@Ns)(
z`D#Whr51=OCbGJR6_uV^BI&QPqQ7Wf!VTfFi!--INd;M0g{-$MR+;5BIrrq;&^YCz
z3-eCL7%l3%%d}_P^50uZ<abY*Sflz~;*6Eq%~=H(KG&6H7pc!xi&qX?Q*kjvaVOvG
z$A99ZVxBaw(!SVuGm~f0!WBF_G<8lh2r@D-ZsAEyNhwZL$W1IRNiFJR3}F!l292GV
zB1`KP?X6w>pWPo?H7~g6sl+N`dS8~62^4lr(#))!%!kq$Sh+bl*qPWwIXJnvnOMY_
zm>HSm7@5Qy7`QkEU|OusaWE{}QZXsj#d7!5oi_9Br#q!h-}~N8X$k9IjjUIOk7i$=
zdM`r$nue-$*(I$TbyxHL-ihwMezNu9Z3p|GE7w)(DT+M&)?iw*A(`#2%LJ>H;ad!}
zK0H};>TA!v=L>dJ-j2RJQ(I%(21Y$gZd2VN`+m`fx9&bYIr08^nd__v9URxsSd_fS
ziR=2ioe{@wW&B*?6241cIPcS3QT?k6HubXXmOOQp^F~D7+QZU&k9*I(#JGm_&^({A
z{5|J)?@jQn@}1|miM!!S|8Mo`@`aa#I?eOjv}_kePk9vkpnFmHr{8Z@O*kxG*0v`^
z@2KyxT7#AX_VpGlXO{D2?sAhj(3^DL;@n|Qsnt7-L20f^i&LA8k%jS=J3k{MyTdDq
z&ly(Ud##II*I%rAIi+#t_do3`^rs$_F<DzU$N7h8C*xWc31D0(;ERhYCTS*yMnq_r
zDX>V2aWKdN_4w?~Ii9b!E#mf}_C0Tf`F1mhsqX;CUlk~NU?P3*85ve9i+);qNbRhe
z_N?2L=Nn~aDmkT|KXdGAUT|5ZlgIo{Muzsgm2))or(b+~Wi4;dtalUTG<Ilj5ZiIr
zD}?DzL$5j$ZyNjm$hEvr4{J`Fzdi2whRR1JY(ZLY0zUmd%JHFk4+G!L*ZZb_Py9ZQ
zTjP|@N&9RG>Hg(0n;&cx{@PX3Wyr+7BiT_(=<?nZzISR17G0^9&yKLv=lrpL?UAap
zbxAj7?|2t;Jn_NY<4dQo?QK7>{N=jhqiY;iypM@`acZ}0=9I_N*G3Dk-=fa=y{b3k
zcfM1);34Z1zxPkwBAHvdu-uLRH@oBoC#(H(hk9q|2JlMHxqBo*BkS)nCaGMR$Q>y=
zul6glO}q3@r}BKTVA)A)U5yPpr-;O?GoP@;M}fg9V5W9ec7d{z=d9?xw-(1UP4!LQ
a*A#4!5EK!v7x<~DcecLt8XK)co45h)tMNbp

literal 0
HcmV?d00001