From 99c277021c2e348d51f17b78267d9f9c61b5f46f Mon Sep 17 00:00:00 2001 From: Michele Balistreri Date: Tue, 18 Sep 2018 11:32:20 +0300 Subject: [PATCH] update wallet file --- app/src/main/assets/wallet.cap | Bin 60407 -> 60174 bytes .../appletinstaller/PerfTest.java | 7 +++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/assets/wallet.cap b/app/src/main/assets/wallet.cap index 0b56269f2cb2ad4ed338d3be8463ddf863a687e3..210ad6a6d42472ecab100bc9e621bb7d7d21201c 100644 GIT binary patch delta 9603 zcmaJ{349dA(y!{-%_f`4eUdwY1afd1Ln4P9A~$jg2#ACS5&6)EDDXgKi72Q%g)rcO zB8qZ|L4*|q6h%P+1%ilN;*(nrl}l87!F>Pf-7FK|_rBfVbXE0KS65e8SNGJ+ZwHL$ z_8Z~7yBm&J3JwmYPwr~bvm!jt)ANoK%_28-{=##yqD}GYE2r|_kBkqQSpG~#api#R z-O4J~-WQ#+Y@TQKPwVE)?GW`$;p)Pw3%goZ4ZV1K_4HxKhRoSC`sLU@v)Avwx~I`< zdQ?4@+iBV0YeB(b8LK9LKP$Rw^0h^`((c{8`kwsv(Ed|X)--y(V8rUGPhZR~+;KI* zyM2Pkee~x3xqZjefgKy)iO(LmAnyCtljbZQzvYVwLGuPwY>w;y`|pSL-F#(xn^Anr z#@~M?S4!-X~&A8M98%~Dq%8Z}7YJJj_nx_vuf9jQ{CA&9Nj(c_2rMH$JTlv!F z(9frNpDZhU=G%`JPq=sFXI;Au7}>HxdC8%6+X`AOopWc(7{{!g9_Pk3s}DM?rw$cW z%)4cM_?nunYVpG3NzRCj2b({pI_PRqa)@t_nF9r znce!Wm=*k0r%R#ECw8}8n^8QL*S7sJc280FJ%!O#qdtg@+aB9<(NEKU9-VWdd7<}2 z`PoV4{y*ROJm`Gnq3&B}+>yWd!n%>8{y6?d>+k-)Eni)~>s-&vi$8v()sU*o3l|<8 z>kaF-;is*SoPYYar7^dj&8*(@O`AQd+O%%-Zu@)U-<;{(ar>SL!>D(6SMZdc8^bm+ z(MAV>HXLrEVAAtDJnn3-JR-`oE~!kbjcOY$vp(aG>*pJwR<4F*T{@d;tx$XBi%9E?>hBOKRy$)%lpv#O#&lY%h~&z%GE}M+ekRiCRBNcx z`pKBh8P;QtTQj4B%0tOX6wl?c6jUBBcr2Gk0*@3t(fZDjz)99s$3r10L5~NAp)SpO z(0PDcT3v(gh#3?_{9xVDS*wDkg^31TbALWLIgV(u)!NmVCwj-Y+QlkI1FJGQ%@apZ zi^7O0%4jhz%+X?8NYt1a&r*{qNzUvER2aCOm|ogA>b@s&XI%EG4Ap!W+s6si(J|gRq&VIY?`)sz zNH5Lv^OkGg7$0wGOzwZM#ycXjJEA%=C*JAoIHY)Ga=mz`wIrptwtJ;jHselAyIi^2 z?jdI*LV~$3W-f|Cysc8Za5~2RmkI21SC`AmAd<`1Z1~v-BSh7BkEA7VcxR_7&M#={ zP!7Z3!(PtV%MH?!Qi5~xo0QZw|B`2BUOg2=Bv&JGqcm&7S<@35bld@J!|HAdtw}=v zTqZ#IfCB*D8O@6Y#PZ_;;`wa>i2!ikBpx9kg{uXmaT%3UbDl3=LIl2I;C;}A;Iq^q z+T*L|yH!Vu_V|ehRRQ(YxSKyyE?Vxx)!$VV<@@nhR2UopzZ$pN%SS2Mk6%!!bgK_H zngQ=5I5U}885CTT2!K%l1p9#72TTFzKO7K>XYk`xZcMtNxG@!Y6cp#0V55RRpkBI< zVB?r-O%ZbMQlp(;@puicRcZER@6G4d9(tlc$fiT z@Gu7e%1v=BY4CA>0sVDKvNr%u?v!@i0rFlPAI~g_u>BYD0xC9uK<|2J=MNr4V*; z1Gss7C_pGrGyyQzVE|!V77l~MKVC%(qo!(8ls1XjBWYdUIF z=y;Vwu`&?gPoX}`k5>X;?8D98z}xuo*)YhHK0GWQxX(jWSTpcQ7>As&0l?b{?g8;4 zh*3fSuL0iChlk&$+LNqF)Q1mOC2T+;XN`&&h3R_8S08a$W$}0)9@R^g)=pj2o2s*a zS*WN}svEWU@kBR*{B3^xk}4xlrjLk;#f`ImT$J#wDHYoe_*GwhTuW6%>3)0=raDD% zs^q~ul!x&MTxIa<(L5GV{^M|s=ZS&KS1aXEa8JQpPxSyDss#+@$FUY`bi*>9!OwC9 z&&RzNcs^=h;#YYwFGbL);Z+DkHT)jG&F}LE{4uz;K-~5k{Lp$ASMgr{2DJy!`WyU@ z@KHViX=ia&@y~pPe+B0?aLi}Ve6Cg!_3%@M!YWf?DvFOPLli+>f-aL(DjJ;SYiKwW zCLgS_{-1vi1~d+Qc`^i5z~fYbE}L?dx=9tGt_1hybA@W1rrLw-s8UsD)lCgjrK&YL zu0R7ANfmfiqk60l0#8n<%(_xUBv*Zj;Mq>I=px_c9he&$5fj~MQ13hX_P?ilr@QXy z-Ta;|T|0NNW>sc+7ZgWuT&(S;+_|S``+nWM8%s7D))Q@3wu#1a#4!^y8B1{pO@hT^ zUHY&@_-{QO&641Z$r?++%!gAMHMY|-T50UK zjozVmjW206Z7_DyM*7g$MVn~5v72_#S4I`>rGv&EIz-0_Vw+=w;_J}iHVJKTqrJhd`ad(@nRKVS4< znafo~)?4R`t!7I@I^E>rQCJ3UY@+wN=^s4W&G+#bH~$Zh2|?Z15Rmt~`2qgBi^sVU z-5*2gO6naOnRf4@M*lKCHMnrn0cu$zu zhT+tlN28bsq zVcjlVJ7fyJ5Y{iHZl@Hxq;9uhRnlmW*!L@8*(=!BB644-?0w(Jgza}D8XlA`4oQ>4 zQhY0nM?}nbg8fVGe(yr8w3^=>=bgX&d*lBKE8b@+ANp@0CH$RW!*LMywvtva;8E7v z)yH|8_2QZ_yxcOpmg8Y~ig$r`9$O`A7iIrRznSzWk8trZlaC8LVbXVW(BzYR%EhNm z{(;X}m*&MqbRRXj!-V_BjvO`KL<~M>WvVirCqVMHi#k(=q z`E~B1Kl!3bN9bFVFVSxU$&qZB{2TvnVz>B%DM>fKFxA!F zUhe3Q{gp1&dMgc8lXL(r`hOo(2v{b>7bvm z(NBV&VWVe)e#%Ba4f+`$?UCqDvrzF*8^g1ppR>`kLC>+#6`<$ZXbbc_8$BQN^EUbg z&@bBPmq0Jjv`0?%3VU)QHsl*476A)w^sAs3*(~%L=+|wuSY)w{egpKIw)RUvFSXIj zKra{C<2Sifyk%op0s3tlEgDzaXc4&5Moas5{z9*^(eL8^Y8x&5Ye0Ky=UhzgwJ}Hs z@7ZV>(OMfV0@vAS;eX#oO9$(1^ajuyZS)7AKcuOifRk-P#YZ*<5%{r<7J-{>wA}y1 zM$7$AZS)qEdg*pH(n7C9U;3FoI9iaiSlMTFIkirA|mb_fj-pEblrpdq#Z4H5A* zJVmE9#IB$rHUBFnss68?2gj3P%lu)B>#B4i37#ls3uj|$>G`RqOs zm%q*H5pj8V{7;|;>|m$p#JvN8dvg%GAUJ_bI2c_h4gr4-#f4SV3_Ky@=eqH8c5rcM zHD#gvgE)pI;~|-)R%nN*~x0u3wE%f-q$f%}ts2Wv`gbcdEeyzKD?#oT+ zs>jZbdP;rHRT&UlsfCHVRC2s{h!)lZsSWaw;o<~HgfuB@z!azf;$~FUzftwym>?6! z214fMcPnyNi{3J;(U^bYN6E#HVHDGlAuPA~er7)1r?>x`htF3xp9Pn=z~Au{&O zgPLpibuJbY`eTyO#FGq0x|L9&V@&(1l!3Xkb9v zK-PXEb$p9#C>m>}rA5*0+#1`j1Ig8!xeYdCC*6c?sV(@#PmtxHpwNykzO|Z6l)&0) ztQ|0UCdZ?Lr~t;3XlkuF+yk1_98RyD3f$-r(4+%*L|+mSJMeAjOEl@gozR!;B^~&7 zt%+crwI+gf5l!@6(OpK?fkpRV@svn|bz4!xG0Dgq?#{+**hzWJ^?4+mgqwj8kw%5K( zzx_t2$qi_h%l#l-43~>cog6m85ZCVn<_k4gQHV8>5&-bns>eU|;3nN`$4jk5FN4r9kZAWh!aAR!$U&Ifmwzgh%#FsG25fVZ1Fz)L} zjYKyRx4PmC($JHQF2$eZmyAn{m0`49MiCAaZoJN1Pq(ZtaNhK`a1h;rtCnA~dD^(C z3#bIIFu}QunnCq`uGc9MFhS!ZD{hM1JhdWn^CF6=<*F6ziOeo?6vR2=9FE~ukt6c; z{(j6>H?6h~(xOqn0eMj>asqRVwBnoHr*mXQfAo}|ALopkgJV?N)flEhvhB>3{IKx~(w_?{+*pLv=W9rIE}_=Q@wP>V zx4p4~IwHG!J94`{klF2tyzW?Jb;lv6JK0!I&m*6^2-(~v$mK3YCU=G5*+TCljr$Rj zxL+cLyB7)Eqe$PLGj`BrWNv>ocCumYVz;rI6OAg)GWKwu@in(F_Hip?KX)+>=smA5 z)^%Gr^$>(u1Mg#MG0bwnO}hr%^ften_N3~L{w6E1Cgrf@KqB})?M1%rsUG2!EMAoA zaL6ex%}fc#DxHqis3fl~IKj!%@f#rz0<%iL7t~<43Kj zJP$-+$qmD4N8CN9RzJidiB#fGIlhCH#`FPHFQZWKLl?$*9j9_hoJi+jDuqaE!^ws{ zCoLeCV;Q=yM6GYe^jY2T9Slq@yujC?7Kw$C*N(9jmGTI`utQoaqED>Gr#2VL)U%#? zEeJu3`ERIGJhFFpRHu%fizkrKRl#UaP{83lmYr ztV=(nS|9rP>U>0D<05($e12t{oJmqI2Wk0bXW}yIeENXTAL`0acUkRSIsc(~ov#M! zbaXgHOAa}ktR>g^PM{9s#5Bz~+|O9|I{-W9$C>`G0ur^vy04q;jOQAGvAH(bw%p?} zjS#)$!kBEoG^_o&23k;6!OW~HFuh#OY#jIkWQ0{RCC6%)AJn4B-^P|c^w3`?uJMX( zoi>FL$#qkmrW+@t>CIN+c~kc>+*sLdXeyChE$c9Dp9#i>R@FaEYts2>t#sYj9(L}@ O*7EaRgL<5jy8i`AD8N4e delta 9854 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 S`AxbHS!+*qaokoRjsFJ)Pu;)( diff --git a/app/src/main/java/im/status/applet_installer_test/appletinstaller/PerfTest.java b/app/src/main/java/im/status/applet_installer_test/appletinstaller/PerfTest.java index dcf9436..e406a44 100644 --- a/app/src/main/java/im/status/applet_installer_test/appletinstaller/PerfTest.java +++ b/app/src/main/java/im/status/applet_installer_test/appletinstaller/PerfTest.java @@ -57,8 +57,7 @@ public class PerfTest { static final byte DERIVE_P1_SOURCE_MASTER = (byte) 0x00; static final byte DERIVE_P1_SOURCE_PARENT = (byte) 0x40; static final byte DERIVE_P1_SOURCE_CURRENT = (byte) 0x80; - static final byte EXPORT_KEY_P1_WHISPER = 0x01; - static final byte EXPORT_KEY_P1_DATABASE = 0x02; + static final byte EXPORT_KEY_P1_HIGH = 0x01; static final byte SIGN_P1_DATA = 0x00; static final byte SIGN_P1_PRECOMPUTED_HASH = 0x01; static final byte GET_STATUS_P1_APPLICATION = 0x00; @@ -127,10 +126,10 @@ public class PerfTest { cmdSet.verifyPIN("000000").checkOK(); APDUResponse resp = cmdSet.deriveKey(new byte[] { (byte) 0xC0, 0x00, 0x00, 0x00}, DERIVE_P1_SOURCE_PARENT, true, false).checkOK(); cmdSet.deriveKey(derivePublicKey(resp.getData()), DERIVE_P1_SOURCE_CURRENT, true, true).checkOK(); - cmdSet.exportKey(EXPORT_KEY_P1_WHISPER, false).checkOK(); + cmdSet.exportKey(EXPORT_KEY_P1_HIGH, false).checkOK(); resp = cmdSet.deriveKey(new byte[] { (byte) 0xC0, 0x00, 0x00, 0x01}, DERIVE_P1_SOURCE_PARENT, true, false).checkOK(); cmdSet.deriveKey(derivePublicKey(resp.getData()), DERIVE_P1_SOURCE_CURRENT, true, true).checkOK(); - cmdSet.exportKey(EXPORT_KEY_P1_DATABASE, false).checkOK(); + cmdSet.exportKey(EXPORT_KEY_P1_HIGH, false).checkOK(); loginTime = System.currentTimeMillis() - time; }