From 2311465fdda2d7cd7aff6c4144c73df00cb0653c Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 24 Feb 2019 17:22:10 +0100 Subject: [PATCH] firmware: update embedded bootloader --- embed/firmware/bl_check.c | 10 +++++----- embed/firmware/bootloader.bin | Bin 94208 -> 94208 bytes 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/embed/firmware/bl_check.c b/embed/firmware/bl_check.c index 3642e325c0..65daf9b11f 100644 --- a/embed/firmware/bl_check.c +++ b/embed/firmware/bl_check.c @@ -38,20 +38,20 @@ static secbool known_bootloader(const uint8_t *hash, int len) { if (0 == memcmp(hash, "\x2e\xf7\x47\xf8\x49\x87\x1e\xc8\xc6\x01\x35\xd6\x32\xe5\x5a\xd1\x56\x18\xf8\x64\x87\xb7\xaa\x7c\x62\x0e\xc3\x0d\x25\x69\x4e\x18", 32)) return sectrue; // bootloader-2.0.2.bin (padded with 0xff) if (0 == memcmp(hash, "\xcc\x6b\x35\xc3\x8f\x29\x5c\xbd\x7d\x31\x69\xaf\xae\xf1\x61\x01\xef\xbe\x9f\x3b\x0a\xfd\xc5\x91\x70\x9b\xf5\xa0\xd5\xa4\xc5\xe0", 32)) return sectrue; - return secfalse; // bootloader-2.0.3.bin (padded with 0x00) - if (0 == memcmp(hash, "\xf9\xf3\x87\xbc\xd4\x7e\x9f\xdc\x6d\x97\xe7\x84\x3e\x7d\x87\x3b\x08\x43\x43\x63\xe2\x47\x71\x68\xe0\x40\xba\x1f\x21\x7f\xe2\x32", 32)) return sectrue; + if (0 == memcmp(hash, "\xb1\x83\xd3\x31\xc7\xff\x3d\xcf\x54\x1e\x7e\x40\xf4\x9e\xc3\x53\x4c\xcc\xf3\x8c\x35\x39\x88\x81\x65\xc0\x5c\x25\xbd\xfc\xea\x14", 32)) return sectrue; // bootloader-2.0.3.bin (padded with 0xff) - if (0 == memcmp(hash, "\x2b\x58\x9d\x79\xcd\xe2\xe4\x3f\xe3\x14\x40\xb5\x41\x34\xa9\x94\xb4\xd5\xb9\x20\x12\x30\xd7\x15\xec\xda\x6f\x86\x18\x75\x23\xc8", 32)) return sectrue; + if (0 == memcmp(hash, "\xab\xdb\x7d\xe2\xef\x44\x66\xa7\xb7\x1f\x2b\x02\xf3\xe1\x40\xe7\xcd\xf2\x8e\xc0\xbb\x33\x04\xce\x0d\xa5\xca\x02\x57\xb6\xd4\x30", 32)) return sectrue; + return secfalse; } */ static secbool latest_bootloader(const uint8_t *hash, int len) { if (len != 32) return secfalse; // bootloader.bin (padded with 0x00) - if (0 == memcmp(hash, "\xf9\xf3\x87\xbc\xd4\x7e\x9f\xdc\x6d\x97\xe7\x84\x3e\x7d\x87\x3b\x08\x43\x43\x63\xe2\x47\x71\x68\xe0\x40\xba\x1f\x21\x7f\xe2\x32", 32)) return sectrue; + if (0 == memcmp(hash, "\xb1\x83\xd3\x31\xc7\xff\x3d\xcf\x54\x1e\x7e\x40\xf4\x9e\xc3\x53\x4c\xcc\xf3\x8c\x35\x39\x88\x81\x65\xc0\x5c\x25\xbd\xfc\xea\x14", 32)) return sectrue; // bootloader.bin (padded with 0xff) - if (0 == memcmp(hash, "\x2b\x58\x9d\x79\xcd\xe2\xe4\x3f\xe3\x14\x40\xb5\x41\x34\xa9\x94\xb4\xd5\xb9\x20\x12\x30\xd7\x15\xec\xda\x6f\x86\x18\x75\x23\xc8", 32)) return sectrue; + if (0 == memcmp(hash, "\xab\xdb\x7d\xe2\xef\x44\x66\xa7\xb7\x1f\x2b\x02\xf3\xe1\x40\xe7\xcd\xf2\x8e\xc0\xbb\x33\x04\xce\x0d\xa5\xca\x02\x57\xb6\xd4\x30", 32)) return sectrue; return secfalse; } diff --git a/embed/firmware/bootloader.bin b/embed/firmware/bootloader.bin index 952056c46cc2420bc103668fd343837ea41cb509..aebb4eb720fd1ae1d298b8d84b44c9635ec7013b 100644 GIT binary patch delta 1405 zcmZXSdr(w$6vywmcUSHzYrEjWG|U>*fNc*F!toErgb0jkc`hs(uSJ&S{aoT5tdNKc zC?04D%0`{+546SZ)anE=An26QV;rTT1hq!9G-q^jm59!TwPEOw&pqdN?)Uq`(KRJJ2UG?hL{==rGloR1^a^VaY*4j0F zA*diJ#}3~&#+CYLqqZd%KgUCl!d=aOD*mCOO8*Iui6>Q zSjf@u=j&Cy!UETm1B}p&K5%DIDze3T8HO1%E2~RM7lH0xiNCt(x+wK|J9;Pr`4wxUB~8^yPkZg5W>s6K^B$8@o_}1U??|%)IEdaLvgYq zf}J1PY<`@*WyECjZkc-y$BXav_^WwJ`G#?6b&&Q8&F1)SVY0G~h2KzL9SS!P ztMlSVN%EQ-qj;GRjUT(DakQSGTx@rmBEv}d6sp~!e4N@2rYJU+L1UTBW*0}X*1++_ zsI55x4{)JI1An8Y)}Nj8#JJk_E#34Xo$DiwBoxo{aFYYH{*Z7Idg?%&Yw0HeF#)eU zpF1`vjq<=p>ukyp8i9DkH55g+9!KkXHf&v-pQrOBaq5=EnUluPrO~>M*&sC3+gWM* zPLA)xphi1nl2%))mqn^~2POje@aWj;vph@ftze@=_@d+eaV<84z*ZlP_j1EkMU zKYbY4J_8!`?XPsadggz(O709K)G-yC?Hq|b`GYAMbV&Yi;BU3~y<7=#0hJNV#b z+y)9k({1wsoiJ+OELT_3JX?rPqL=u9uoEYVF;orD$?sBjm5|fa{RQ>sbjmZM+VKTAgW8G5{Jx;exOt7)aOs*v7lMjpU&|^ z#LtfC9pDD?bjtIIGGebI?RD^ifJ9wvLio1GjKs(Y$`YUPT~Wx0h)s&oIr>wfAD)Ve zPSEPZ6PBr0R+i)%#*vi{VXV!b2`!418e4<`cK^Tng8>THOBAczc-iVT?((%t56^Wf zFK=_Xv9_c7L% N;w4>ilB31I{tMe5&zJxJ delta 1407 zcmZXTe@qi+7{~kEwQ!wuwn!lhYbYqPX1F06C^2kf2+A@j0+R{S(n4EGfkF%6=LQIh zh%oS#mFbiPmxTln*loFyjUk{;2TY9vw=7XebZ$m665PZQ#-1y6G47AgJ@50p-{-mK zecrp8Sy9cbs8y-_qo!jbNa1tZoV-0C{ov%h`I{@t+PbAX%AdEJ{_K%ZgHi9(Q3AT< z`bx$^%guF{&rQ$g9&ZjQ*>Z0*IQ3(BNS{X2tMB?WK-1Ck>+gP-UO&&NeeRw5@nS;c zvDmJwZmAP15qp1%U{~pOBM8~{+*<&Fq$KYV>?78EU&tU$`8z;IzRM2;1DVfPQ<)m_ zT7h@qnf){~ggin#GiW9yDJ?bx?QWzilV)zC{hO2*TvzBf3jBo&9sdXihJRaV5R5E| z1yU(03`i|8TYI3C$O~T-`~DY;EBr-q*_qY5@?=)U z)MUyYP05Vp2fLDl76(w2k?bu#Bvu+}hTpf4JH28Ei9Ct|*(VxLJf86_M1p*=SF2;m9n%RfFgky|9m=?z}l}$NE z;fH(GB))tQD6(3v0-C5Q0;%;INn*v($ZmX5it8nFY{3)ob1nRG zbHe7gUdb675XE|t=PDht7~JJsd>$>IZ6TwT?Lo=T`E6L*$xpr3Idjy6x-@%SZPv2y zRrOP%PqJv{EZJJ!4`pPoy2<4i)i^|Bm~f3qYAeMQY8KJ+B5k#$Vm|JS5ZQqy%sO?T zNu)+aB-v8e;93pUjQ~f=>r>${d#!#OCC|a6PNdb9{5e{VRW#r?rz0ze`(YF5YrL_R z%{Ct4KopJVIZI-W-hxOH*lfjTdvgy&vQaI&06N*m50=4m5?{+#)uDZWcx1C5ww(a* zC0j|4v%tm?SK7t+|#{%sOPBhIsfpDEId3?bvlBr-$f!^;xJL^BW3^G6%O zD!#=o-(*)t2pZBhYKNVyXsih!hqR5W@NfBg{GenKr3(muaXBRZ{3;BR_zQmiU*KiT z-xUPiyes0bqmI9h*(bCN+kD}qP+XKlGhn6}?EL$O61~fdKw%vlHn9j$MO0H3JV^VL z4<)Oy;Fpp|Gsn;lNCeVuGJHh~f3b?Im2UD*EaQ<&GXY2(VnGP$oAH(0$DIMhAJaH? zdd5;G?$prCIb@EDO9OY1=y6?ulprl!Mml)I3wA?RvDIeR+VQC~8G@B|bA`cbd^)b; zKH3i_A=qfP<(KMg2CXYESQ#6a6rUQE6r)X!iB3@`C2OPA?|