From ec89340a26e9a9c80b029d02fe9b06fd1328181b Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Wed, 10 May 2017 10:18:13 +0200
Subject: [PATCH] tests: Add a second gpg keyring

---
 .gitignore                      |   3 +++
 tests/libtest.sh                |   5 +++++
 tests/test-keyring2/README      |   3 +++
 tests/test-keyring2/pubring.gpg | Bin 0 -> 1201 bytes
 tests/test-keyring2/secring.gpg | Bin 0 -> 2503 bytes
 5 files changed, 11 insertions(+)
 create mode 100644 tests/test-keyring2/README
 create mode 100644 tests/test-keyring2/pubring.gpg
 create mode 100644 tests/test-keyring2/secring.gpg

diff --git a/.gitignore b/.gitignore
index 796332b4..1b429513 100644
--- a/.gitignore
+++ b/.gitignore
@@ -78,6 +78,9 @@ Flatpak-1.0.*
 /tests/test-keyring/.gpg-v21-migrated
 /tests/test-keyring/private-keys-v1.d/
 /tests/test-keyring/trustdb.gpg
+/tests/test-keyring2/.gpg-v21-migrated
+/tests/test-keyring2/private-keys-v1.d/
+/tests/test-keyring2/trustdb.gpg
 /tests/hello*.flatpak
 /tests/platform*.flatpak
 /tests/repo
diff --git a/tests/libtest.sh b/tests/libtest.sh
index d4a22c28..d0618f2b 100644
--- a/tests/libtest.sh
+++ b/tests/libtest.sh
@@ -170,12 +170,17 @@ assert_file_empty() {
 }
 
 export FL_GPG_HOMEDIR=${TEST_DATA_DIR}/gpghome
+export FL_GPG_HOMEDIR2=${TEST_DATA_DIR}/gpghome2
 mkdir -p ${FL_GPG_HOMEDIR}
+mkdir -p ${FL_GPG_HOMEDIR2}
 # This need to be writable, so copy the keys
 cp $(dirname $0)/test-keyring/*.gpg ${FL_GPG_HOMEDIR}/
+cp $(dirname $0)/test-keyring2/*.gpg ${FL_GPG_HOMEDIR2}/
 
 export FL_GPG_ID=7B0961FD
+export FL_GPG_ID2=B2314EFC
 export FL_GPGARGS="--gpg-homedir=${FL_GPG_HOMEDIR} --gpg-sign=${FL_GPG_ID}"
+export FL_GPGARGS2="--gpg-homedir=${FL_GPG_HOMEDIR2} --gpg-sign=${FL_GPG_ID2}"
 
 setup_repo () {
     REPONAME=${1:-test}
diff --git a/tests/test-keyring2/README b/tests/test-keyring2/README
new file mode 100644
index 00000000..7586ed3e
--- /dev/null
+++ b/tests/test-keyring2/README
@@ -0,0 +1,3 @@
+These are completely random keys, which include the secret key.
+Use these for testing gpg signing, do *NOT* ever use these for any
+real application.
diff --git a/tests/test-keyring2/pubring.gpg b/tests/test-keyring2/pubring.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..f5bf51a59f010a7f920c71c140804b65f2305c6b
GIT binary patch
literal 1201
zcmV;i1Wx;z0SyFM63ZR|2mq@8#l>)6jZTtEeu_L7rZPvwP+tr>kR^EUGkfqmduS+l
z-DH?86#+)wZCjHOPsDoCoC2_G%A8n@OJ!<%g!LhACJu2-WQIvy(^bHwDpV88{ygL$
zIneag?YQ$t(xDUSSXiCETFOG`{K$cu9;*9;FJa&6!Xtc=%TbB+NX9tX$E+-a>8@j}
zvGw*!##k?f&F8YYccUQa@Bfwgz2SL+?Jy(-!coyHJ=lL`{U1h@NwC;*1oG<*>i2=w
zG%86-r=myc0UKWV1qKR7X?t0RT2%30<g*040%6f1r>gGzU+)uPgiwkgLFM)%80Uw4
z=z6$*MgWvh%4J9=48H&o0RRECDn@K!bZ}v7AShI2b95kUWqBYnDIh#%Y+-b8VQWBU
zY+-b8VQVgLa%Vn?0XPH`0RjLb1p-+T%N_z70|pBT2nPcK1{DYb2?`4Y76JnS0v-VZ
z7k~f?2@rLkU(m8KPW+xx2mgBD8Kx>%20@m^<+vMNE7b&I+SWi=*Ndkw5(i%1qtQCZ
z9<@o){L(NBZi>~j`emJ*%5YcyoV()+esvVHA?X9l-7mE7)rYa?fBvgfS@y~Em`i&1
z!Z9{XE=yFJtT0j?xAA4afU8?lHV&%2NM$1dpvaK5%_2EaPwaIag@~ZVGOx4q0T5xp
zHRL2?PT8G*XcciKI*)`P@CQlE1UW1OR<+brdQdn#$bK`ZJwet1n@ratQ~D*QRCl-@
z)jSIzXFnwzojH?Os{PpspnYi@)jsZlK44zo`es%DX_2R|+>N;@H!#RUFzlsv(m^wp
zW%1;k6Vicyx=|*KXE3k=00X%J4Fp*d%N_v;0K5&oBPfZaAEQus_b}|0$uLfu^5%Q(
z4R#uB{$%0$%p8Q3FU`FO%>=zI?s8NM=lYsJv@ncs=GEbNdCs=tA3^TYtP0@?J}JTq
zL{A8qIFvKPMH6J1qKTPG$QjhoR%{1E$y#Iu`t95|d=|?LuLH&EN~qIh*{`$lo)3W#
zbs0~n&kGx#t0nTkXA5lu9@Kpl?n!LK`KO$Q6sg<}nEX_-l|*3wXeGXK*KOv<OrzwR
zn01pQS+n<X66nWNN+MBKfeMbFY>9|U7S5WTZr1y-P2hrd*(i|%(VSFdhNO;sjD>%O
z06;us#(Ma7!?#$6SIUQRh>Kg0Hvt6kX8;ia00D^s9|RZy0ssjG0$CEv9s(N-0162Z
zb)R3*vN2BlHqHnDlu+eDeJV$p3Q^|NNZ6JO0IO9AuiPMSAVn!LBpIK=0`+Es4}np4
z4gDj)kV4xK1BqokukbEhxRAK^AxAqE8%34b<>Pir_*u?hxq<3-xO^2Y+L0p>Lriwd
zT6wJ>6W&v@5d+)2>aFlsQ*@+0<gMdP>=lY*f9)fE;bU*tRZ()#!+EmnPoL>kE3S;F
z0qVAgUgsLB&(?e{WV<d}sF4W(%GU;WrRuXEeKk2el1<y5Pe)q7FAVQ3MVjb($BKCq
zW^NI$2-Pt?AbM_=0VKQ7wlF<qTl%osv=ij6iE^UNnE@E?Kp&kc4ve(;z=ojcaKU$&
P=j~)<1GA9AumS)BAe<pp

literal 0
HcmV?d00001

diff --git a/tests/test-keyring2/secring.gpg b/tests/test-keyring2/secring.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..321581d9fb790e3007932dc7fc86e54fd076d5be
GIT binary patch
literal 2503
zcmV;&2{`tZ1DFI^63ZR|2mq@8#l>)6jZTtEeu_L7rZPvwP+tr>kR^EUGkfqmduS+l
z-DH?86#+)wZCjHOPsDoCoC2_G%A8n@OJ!<%g!LhACJu2-WQIvy(^bHwDpV88{ygL$
zIneag?YQ$t(xDUSSXiCETFOG`{K$cu9;*9;FJa&6!Xtc=%TbB+NX9tX$E+-a>8@j}
zvGw*!##k?f&F8YYccUQa@Bfwgz2SL+?Jy(-!coyHJ=lL`{U1h@NwC;*1oG<*>i2=w
zG%86-r=myc0UKWV1qKR7X?t0RT2%30<g*040%6f1r>gGzU+)uPgiwkgLFM)%80Uw4
z=z6$*MgWvh%4J9=48H&o0RRC22mUH&MW{Ky03ZQJ=FBOrrJ-j@hq9t7EsvE)AIY|#
zQE^#A>xQHA-S-ri86>f~1Hn<j!#yc^d1F4*KI4_Wu8~OUa~5{O{#1;C??ayhb`>UB
znjnZ{b7I{q<%rD>JnVz71R&{gN4CpT(nok$I*BCMd71b)Q%?|gsA7I*tlG}ulaf5L
z-Mv8!A}eCUG29bO;#pMP@c=v#yp(r?uz8fpbru2|$H9PpGQu2zv9YOPz^~(x8tc_)
zf0eFb)*w9RYwSyrug;EhLNpCI->Ei50J)Ap2B5Io=ZvdeQD(mKKK@-PC3Qiv(3E*o
zwwQ13s6<xiKrlhUg7w5~&%Fcy$D~cNKlX=5@AZ-yvrW{D;(ymP%dZ_o!6}?(Rm6{k
z9_on=zpj`~xqrIV5}ET=<(v&N5ba4J=gG=wCweMOs+Jcc4tdcXXMmMjc{t_Bg$1Te
zA(ZsIjr|$g2Z6M2W_cFf2E<r}P5ieE9Ov=9ouMA<yMc)ecI$%vcFRJu1OVGbg<?sG
zdXN5-4pH8}7eB*)XN8_@?D;SHi<)9A;W&?9fZhZIm!IP}A01tB29HKxgbGz`i^<aw
z0>bf2b(B)p+%XZT>Hrqj9RDh6P&421hor2Nv>B<d{s;kUgPbonbYn^|oRJwO(uWp8
z!8Sca7P7QE!3c-qtRzGT<HZB~4Z>v<3K-k1a8rfD>o$Uk0&jmnoQ7e%p(j}Y<V996
zz%iT={NNhkN@VIj?S?VIr*SKUQw3;*L7*FeY>>hd&dm&Nu&h|MfRF;G%ge0AWQ)zg
zIdjgTh)Ng%RU9OUSJZ?$-0)~u58NQ*0rgM@Hw%+s`niXmVwdWG0SKNVIbyUbMr>hp
zaA9j8C{$&0bRcVGc_1<=AUtMlVRUd|Yd~gfVRUd|Yc6kcXFiDmI0O>`0stZf0$CEv
z9s(N!1`7!Y2Ll2I6$k<e3JU}l0s{d89svRufB*^!5Otql(6TX3{GL$<|9apVrYctk
zL6*hkxEoz7)dXVN)<9U-i>EIV2VUNz(K^T;wMo(Z(l85diq*6FWu2VLa994EyW<Le
zbriE9=>yB%FSPH~hq32>{;O13_Q~^@OM3UhF*ZytOH`VyFj5`2@nye&t6New4ywIK
zWg`Kg$dI+oA~{e`>~$T5h@izXue0+35MjVI<RoKG*`0rA6>%jxkAxub2T9BXIV=QL
zwbWF4P&houelw^&LDm7AOxGe)`X#1RceozaJPROaKP4QUIg?nb{n-hieQ6ujKJI}&
zU|!$)W>x@ck*BZRjkzf|FvvqN?4@?nK{J+R@#LHn(t&@vQ6`LMFt7pu0G$Jv1X&Wx
z9svjdybZl0D2b#WqfmJFFzl7dFix8C=6mf8b{cK|Wa0YE9E6oG&AkZC1idZpa#RcF
z`kFwrFpO{J)!}$~&bHzoLGIG53gHPpDZ&awPY9SelrzIc6J(j9iJ3~s8Pw2LYzIWi
zT4V+K?c6tf7RwB;1I6k}sMBQGue0%<4}lPM8BeIs3mcxRCGx*#3vB}))O{50No>UV
zr<{fqsoV~j{8X})L}34DCBAakZRW>JqvV^Ib(14mv-fcl=*Lt_B2iX>3XY#_iHJ%T
z&YGQW*88wc;DUD9D3JrvoK$3nq>g-yg@1+sKs;o|diZz4w^)Z)%7<}?i(8O40R-`9
z01*KI0RRX8Tgiy)#5sy~Hq2~(n$Dj+m+FQN(HP^`k}=FiLl0Tbj*Qq8fg>kOif5cB
zs(u4uvm4(*6ahF5KabI}0*9GT5NmZntNyb1IDwIAP5LkLO~eK#jT5OkfLG=GO+RLV
z2r+aGqonqhN6Q%b<W?_MtxU+$upFK^@?EYiEBqe+a+nN7muZ(fs++C*-9EWiI~>&b
zgQu7_lQuo&q+!p3-t1@;D0USW6SiN5P5D9en+8skaB^={lg`xK1nKyaTQ`6WTuK0K
z<cZ=s5*N25TcYiRD)((TtBz3njE`SE68wjyWeZCct!CqY5I032%Ia9?ZqlR+4I$qa
z?C(M$1OU}9u(c(0|KYk(vV#8e;peN^_J+a`A&&r#;fUR1+!qhRey{QQh_h+#jKYEi
zaD@5>`n+#VYOjF*eErPP5|zYIzWMlDg;L|~d;l*OFetV^j6}3@WsN{@7V@9VC;4%C
z;U@n_dXZD<3s9rB_Yd0os4;zq)<JnaKf#oi>tzH0;nD8aDTUe2k3)g1oG-MWgQ%gs
zC+4*Yv0BJxguE!-&!bjN-e@16!et!ce}(DG(KngyPpL09lp!`M7)$WqBMqpXdJQ?-
zU^G}TLmbIh0t$y{h%!;5&NcoN9Wra|{$M)x1zmSFzU`BHf?t(UTnUxpM+F9veL+=f
z2Jb4{1OS;(<`QZhI=7vs>to_@6}Th552wbCnT9SEo^y|T6jR7a-cX<WvJ-GEbZ8a3
z+V=Qc2`PsG?Y^$B2AwFfvao_*D9H{y>g+Jxq7p>u5`o`EhGqT)DRCbe$;V7I*A*i7
zpP$iSoGlO2$PhF`B09jYS*eB9Db)}1P40r1y1_n9i2)x37y$wR2?YXK63ZR}8w>yn
z2@rLkU(m8KPW(2`2mq8&<wAWbN0|yy=F~{omJ0x@RSB=$Aa5W=DKR7&pTYw5W`Yla
zQFjgfBfyYC+YkeZWjwF&E?l^fxb`7OI~5y6mD%Ovc1rkJ&R@BK>UOw%6)oD4BN0PP
zcFS6MtsfKKQ?d~Q+q~+n@K;lGq(0=W<4x=pierE6BYojxZ`V~(a?rzhvg=Qu=~XMP
zjHm(XwufHl8miCMd@f|WE?TIO2>{C126v_EvmbpmIXse0+n!HHTEH(1?=3}|=z7PB
zc@t)C5w8f<F+Cu9Zk7QgyU?~UJ!M<^u-UW|<gSTwqRp8B816tHohc5CwD`b=py+VH
RcbMnxWMl)gkixJ6003ann?3*l

literal 0
HcmV?d00001