author | Liqiang Jin <liqiang.jin@amlogic.com> | 2017-12-06 11:19:26 (GMT) |
---|---|---|
committer | Peifu Jiang <peifu.jiang@amlogic.com> | 2018-01-03 08:34:29 (GMT) |
commit | cd82f27975cc6c41a4275d396a59d30f754dd7f8 (patch) | |
tree | 3e8df9f09e7097e18e25fa4e9423bbe79a07ba3b | |
parent | a9f7d9515dddc259aa5b50a800a1f12cf0c08bad (diff) | |
download | tdk-cd82f27975cc6c41a4275d396a59d30f754dd7f8.zip tdk-cd82f27975cc6c41a4275d396a59d30f754dd7f8.tar.gz tdk-cd82f27975cc6c41a4275d396a59d30f754dd7f8.tar.bz2 |
Secure OS: update bl32 firmware and scripts
PD#156140:
1) meson: axg: change reserved memory to 16M
2) core: add software TA antirollback
3) add sign_ta_auto.py and pack_arbt.py
4) update sign_ta.py and pack_kpub.py
Secure OS:
commit 073ca4a09a0ad5830c94ae9efeeea3528feff3fa
Change-Id: I73a1a9856c8b4f72bd31d282b944dca28344382b
Signed-off-by: Liqiang Jin <liqiang.jin@amlogic.com>
-rw-r--r-- | secureos/axg/bl32.img | 1340 | ||||
-rw-r--r-- | secureos/gx/bl32.img | 914 | ||||
-rw-r--r-- | secureos/txlx/bl32.img | 1329 | ||||
-rw-r--r-- | ta_export/host_include/conf.h | 5 | ||||
-rw-r--r-- | ta_export/host_include/conf.mk | 7 | ||||
-rw-r--r-- | ta_export/host_include/signed_hdr.h | 3 | ||||
-rw-r--r-- | ta_export/host_include/utee_syscalls.h | 1 | ||||
-rw-r--r-- | ta_export/include/utee_syscalls.h | 1 | ||||
-rw-r--r-- | ta_export/lib/libmpa.a | 1000 | ||||
-rw-r--r-- | ta_export/lib/libpng.a | 3038 | ||||
-rw-r--r-- | ta_export/lib/libutee.a | 3408 | ||||
-rw-r--r-- | ta_export/lib/libutils.a | 4091 | ||||
-rw-r--r-- | ta_export/lib/libzlib.a | 560 | ||||
-rwxr-xr-x | ta_export/scripts/pack_arbt.py | 186 | ||||
-rwxr-xr-x | ta_export/scripts/pack_kpub.py | 15 | ||||
-rwxr-xr-x | ta_export/scripts/sign_ta.py | 22 |
16 files changed, 8027 insertions, 7893 deletions
diff --git a/secureos/axg/bl32.img b/secureos/axg/bl32.img index e279447..12b814e 100644 --- a/secureos/axg/bl32.img +++ b/secureos/axg/bl32.img @@ -1,66 +1,61 @@ -e4' -o -/fZ(RnCi_` - - +e4' +o8 +/fZ(RnCi_` + + + FOzq# H O N # -# - - -" - -" -N F -N -oI -iI -۲F -F +# + + + +& +uI +oI +۲F +F +)KE,)i +%K +FF9 +GF -*" F -IGF FIG F$ - +*"F + +GFxHF "%X_K"_HOq +FdFO Kka -KZh*b5`]`HH +KZh*b5`]`HH BohXXP K" -H@( - -;` -!F2Fd -+ F9Fj -$] 9F$0` - -GF`E -`)F*F+F -SzMKhG -DM(h$ -'$.KhOV@F"1$ - -V"79F$88FAF"$4 ,"L/M - -GFXK!F.ihO!sGhFG -TLLFKB FX3Z22 +H@( +0b + +;` +!F2Fl ++ F9Fj +$<I"
$8Kh +Y@F" $ +QF$s8PFAF"$}`4 ,-L+)M Q Q -Q -KEsa#a - K +Q +2)292/2 +KEsa#a -A## F3`K+` +A$h# F3`K+` -E +E , -E""@ -CB`V" B3B`pG - -p +E""@ +CB`V" B3B`pG + +p @@ -69,335 +64,347 @@ CB`V" B3B`pG / / / -/F
FF -Zh:x"p -Z` +/F F9F +Zh:x"p +Z` K SBSL B3S -FF"30F
KBS,BSL:B +FF#30F
KBS,BSL:B #
'wF?
?K P 5 AF - + PCFSS, -CCL - -HOqJ +CCL + +HOqJ -k@F!hh/ر +k@F!hhر BV8/ "h8XB&`hhzhBhbhyhB4FF h{`B, -0`#ahE +0`#ahE + i
=
'w-?
#-?? F3h @h+- - JEEE0iB@ L\CCP`L}B``ap + JEEE0iB@ L\CCP`L}B``ap Z B`E E DG`1 )H3+Ѣkh0 -C`eck"<c8lH3-GFFFF +C`eck"c8LI3-GFFFF -kBYCh8FIFhpk +kBYCh8FIFhpk -kXYZQhFk@F![hd@k]hCD -KB - +kXYZQhFk@F![h@k]hCD +KB + ?O 2?#?#P?@j k@i :_вRB@` - -M
- -K"! H(FtK``cb -FG + +M
+ +K"! H(FlK``cb +2H08KhKh#F!F(FK`( +FG Eѝ -0 -JOq
H - - -#hG8" - -hD$F]#DBB3$+ +0 +JOq
H + + +#hG8" + K" -H! -F( -F( - -F( +H! +UF( +xF( +G +F( -H[ -mF( -JF( - -Fd6K - - - - - - - - - - - - - - - - - - - - - - - - - - +H[ + +F( +v8F(I +F( +RWK"HOq + + + + +F*7K + + + + + + + + + + + + + + + + + + + + + + + + + + Hh - - - - - - - - - - - - - - - - - - - -4(` -Y `@s + + + + + + + + + + + + + + + + + + + +(` (JhK
"`JhK`pG0 -pYp p p -
K -K -K -K -K -K -K -K -H! -"!cd"Adds 22kF:* K +pYp p p + +
K +K +K +K +K +K +K *( -@j@h -K`0FK`Zh"p""?B +@j@h +K`0F/K`Zh"p""?B J``KhB `"h dbhJdhdhdL -"i+J`bi`٣iBJ`iS`k+ѣl=J`#jbcjcjScjc+6K "` j45K``j/3K`j*2K`j%0K`k#lak -! ! -K@b -5 +"i+J`bi`٣iBJ`iS`k+ѣl=J`#jbcjcjScjc+6K "` j5K``j3K`j2K`j0K`k#lak +hsl"@rB#`rj +hsl"@rB#`sj2Ks`2K`2K`2K3a2KsaZ0Ks`0K`0K`0K3a0Ksa0Ka0Ka.Ks`.K`.K`.K3a.Ksa.Ka.Ka.K3b +'O 'O'O@"'BFB c"FFIF"F QF*K +! ! +O +O +!FJF + "h +K@b +5 +3o0+pOpѫ~(F!Cvp(F! J``a J -K`:Z`pG8cj?* +K`:Z`pG8cj?* C## +&J)&KOU2`$J$J)$KO2`#JOU2Z`"!K)OU1O1`Y`J)hC*C##*` -K" -H=F@ K" Hc! -H -HAFF:F0F +K" +HXF@ K" Hc! + +H +HAFF:F0F - + - -` -JF + +` +JF ca4Kh a3Kh -a1KhhB#`C"c.KhhB#`C*KhB"h"* h+0$KhhB#`C"F +a1KhhB#`C"c.KhhB#`C*KhB"h"* h+0$KhhB#`C"F
h -X -#EGFFOqhCLo d! -` m8OrXO0@ -+0x+Op`1TF8FP(̿0 * + +#EGFFOqhCo d! +` 8OrXO0@ ++0x+Op`1F8F(̿0 * 1+Bo"F+F 0w6pEڴF -3@P2@o(F(F -HI+h3K`Kh2`KhBє,0%ei +3@P2@o(F(F)&# +HI,+h3K`Kh2`KhBє,0%ei +0,0 HF3h+`'x F0 F:FhGFHFeMO - ` F -J -F)Fhh$iG8dZ38FK -F)FhhdiG8dZ3KXh - + ` F +J +F)Fhh$iG8@^38FK +F)FhhdiG8@^3KXh + FB!
<B @@# - + "FHF -P1F - +1F + - O - -kGFx@FeF 5F +E= O + +kGFx@FeF 5F OF9(F!F KFG - -=F O=F O + +=F O=F O ?(F 1FG -@#G`*$ -JF9%OD%E -IF FF - - -@ +@#G`*$ +JFx%OD%E +IF FNF + + +@ * -O0!XFF +O0!XFF * -+++h0FAй` ++++h0FTй`
,
#iˎ -SF +SF - FY -6FEKFK + FYW +6FEKFK -KKF -GKGHhZh
#B% -FF #FF$F4 F F -@+"i QF +KKF +GKGHhZh
#B% +FF #FF$#F4 F F +@+"i QF h +ED3BO OF# -1FX +1FX E B -FFFFUFWF6"h#KB/FAFL +FFFFUFWF6"h#KB/FAF_ -4Eѳh JB2Bѥb +4Eѳh JB2Bѥb - -h
FChB10+h -OO h34ڈj rRiGzBӽ2-CFjӱhF -OO h34ڈj riGzBӽ2 + +h
FChB10J+h +OO h34ڈj rRiGzBӽ2-CFjӱhF +OO h34ڈj riGzBӽ2 Hh! -3ڈj9FBFG04zBH +3ڈj9FBFG04zBH Ohj 3ڈj@YiG -)KB -8( -K[nKnKoK[o{)FGO3`5a - - +)KB +8( +K[nKnKoK[o{)FGO3`5a + + -3CEрLYF -t`hhGFȹ(F1FJ,(F1FJ'(F1FJ"J(F1FLL - -L L)FF - -**JhiGiipj JjkLhihGH +3CEрLYF +t`hhGFȹ(F1FJ?(F1FJ:(F1FJ5J(F1F0LL + +L L)FF + +**JhiGiipj JjkLhihGH ** -Ji JVkFi*F#FGFH +Ji JVkFi*F#FGFH FFFF -1hiaF -uAF(FJF#FF +1hiaF +uAF(FJF#FF RB@7! OqOq@ ! -jGF`YFO@B +jGF`YFO@B 2h+< -2hFYF - -AF"F -pjF +2hFYF + +AF"$F +p"F KB -" -QF +" +F + F AF F,GF)@5Iph+~9F2F(F/KFp -@ F,CFf(XB3%I - F - - -F +@ F,CFf(XB3%I + F + + + N N -N(FN - -F +N(FN + +F `bF -L -F/#;F"#" +L +F/#;F"#" KB -E)F +E)F+ L -L +L F -O +O F -!i$#c
ai.Kh$#jk -N F N -$h - FMck -. *F -"`+` -# -K!O -0F +!i$#c
ai.Kh$#jk +N F N +$h +. *F +"`+` +# +K!O +0F !h+1 !h[ 1!+i[h1!! -!ii!p"iڱ +!ii!p"iڱ Kh:F3F@F - + !"0#F"F -LLK"h@ > F&pZ3(2 -L - - +LLK"h@ > F&pp^32 +L + PO 3E -[kf +[k 03CD -0F -!"` 0*SF8F -FFF& -O -TPH - -LH!B(F$ F K3Z3 -+FIFS:F@D -IFh +0F +!"` 0*SF8F +FFF& +O +TPH + +LHm(Fc F N3h^3 ++FIFS:F@D +IFh W(h - - -7O*9_D?%_4]FOU_IF"FU + + +7O*9_D?%_4]FOU_IF"FU V!F(hJF3FF -
-(,D#2`!F!B"(Fw!>#XCC7B#7` -A +
+(,D#2`!F!B"(Fw!>#XCC7B#7` +A #F -l0F!FhBI0F!*FKFnh5QFB"00B)L+F - +l0F!FhBI0F!*FKFnh5QFB"00B)L+F + " -# -#"0 -# -E +# +# +E $ -EF@_@F5)FF@#@Fpd -GF0k0FI:F #GF0FVL -[F -#GF0eiPF9I #GFPFL -iI)GFPF -"o0, B +EF@_@F5)FF@#@Fpd +GF0k0FI:F #GF0FL +[F +#GF0eiPF9I #GFPF +iI)GFPF +"0, B @@ -407,122 +414,122 @@ $ - - - + + + Oc@DcOHsOhs` KBOsOss` - -hch
#ihMKBSBSB@0@@*F + +hch
#ihMKBSBSB@0@@6F @FlG -@FyG -&KB&KB %H%H%H%H%H - -F -lGB.(FFPK"H@Q - - - -hch`Hh
#iciii-KBS(F# -L F"0( -hkh`Hh
+ikiiiDKB.أCB)أ -khgF -+KlG+h(`B(LH0F,F +@FyG +&KB&KB %H%H%H%H%H + +F +lGB.(FFPK"H@Q + + + +hch`Hh
#iciii-KBS(F# +L F"0( +hkh`Hh
+ikiiiDKB.أCB)أ +khsF ++KlG+h(`B(LH0F,F
K"L@A -H
F -N(ر(("J@DAH -*I"F -3h2`BL!)F(F -K L" -KL" -p$3K3 -Gih
Gi)iG0F8F - -pK3 - -pK3 -GiiG0Fj8F -KBsBHH - - +He F +(ر(("J@DAH +*I"F +3h2`BL!)F(F) +K L" +KL" +p%3O3 +Gih
Gi)iG0FQ8F + +pO3 + +pO3 +GiiG0F8F +KBsBHH + + -
-KB%ңsBO3B3BIaE $KB@aE-!KB8)F2F#FB*')F2F#F. )F2F#FJ4c -A - -~*hiFK@F`jh[m"aJFGhQF:FL>hFh'I -L(+ +
-KB%ңsBO3B3BIaE $KB@aE-!KB8)F2F#F*3')F2F#F )F2F#F&4c +A + +*hiFK@F`jh[m"aJFGhQF:FL>hFh'I +L(+ F, -FFKBsB% - -(F - +FFKBsB% + +(F' + --KBPJF*F! +-KBPJF*F# -KB%PAq)KB3B3B F@@@? -F( - -)H>(H;(H8'He'Hb&H_&H\%HY%HV$HhhF0V3xO - - +KB%PAq)KB3B3B F@O@@ +F( + +2Hr1Ho1Hl0H0H.H.H-H,H+H+H)H)H~(H{(Hx'HhhF0V3x"O + + @FlG -@FqG +@FqG -o?L -khh -g5LT -9 H@eK" --@F9F2FPF`K@m
H" -L - B1 +o?L +khh +5LT +y H@eK" +m@F9F2FF`K@m
H" +XL + B1 zOj O -O
x2xixBHK +O
x2xixBH zOj O -O
x3xixBHFȱ 1"9F#O FCF0F" +O
x3xixBHFȱ 1"9F#O FCF{0F" zOj O -O
x3xixBHIF -DHFQF:FOFq] - J@qUZU5-< - - +O
x3xixBH@IF +DHFQF:F
LFq] + J@qUZU5-< + + 03 -"F +"F CC<# -҂"<#=#S@=3#!C<#=#C=#>#b>#?#B?#@#"@#A#S@A3# 3$#SCL3 -JOp3FR#0"FiG -l#c\2l#\32l# #*#OpFY" i"FG #52< # +҂"<#=#S@=3#!C<#=#C=#>#b>#?#B?#@#"@#A#S@A3# 3$#SCL3 +JOp3FR#0"FiG +l#c\2l#\32l# #*#OpFY" i"FG #52< # '' 7''7' '' -3F' -T'5J@ 3+:hB;`0F! F4-GFFF -%DOS +3F' +T'5J@ 3+:hB;`0Fa F4-GFFF +%DOS F F@
H @q@ T@L Z#@ LLD]3+ hFDF F!F @
HT@LDY#@\D7L3 + f.F F!F4FZ#`^D
Hu `3V@l0+ 5DeF&D!F4F.FddP
Hf U@\DZ#PMD8 P3@+ b -F5D +F5D K Fհ F*F#F8LOe,M@e @@ -541,7 +548,7 @@ J
p6P.WDO D*FF -ODaED[D``aDa +ODaED[D``aDa Kb` K` Ka @@ -549,10 +556,10 @@ KCa Ka Ka Kb -KCbFpG pG +KCbFpG pG FF;FZFOU pU - + Kb` K` Ka @@ -560,7 +567,7 @@ KCa Ka Ka Kb -KCbFpG pG +KCbFpG pG y Okqx0 #JK CxJ$ E C4y)Cx$
#ECC Cty)C$y6#fE@ 2O@p# A; @@ -574,117 +581,120 @@ CckCs{Cs#O OHEh A OBjJOCjJ Eg G -E -2BE +E +HFLI3 +O
+PF +KS&0h FF O -viHFYF -_J@! - - +viHFYF +_J@! + + 4 ,
J -KC$PH 4 ,HO4 +KC$PH 4 ,HO4 4 ,J -KC$PH 4 ,HO4 +KC$PH 4 ,HO4 4 ,J -KC$PH 4 ,HO4 w -ah -G - - -IQ" )FjFG - +KC$PH 4 ,HO4 +J +ah +G + + +IQ" )FjFG + -Eѻ -IQ" )FiFGFPF\\J@T3+0F Fp4-OFFFF { -AF"6?'
(i@FYFG +Eѻ +IQ" )FiFGFPF\\J@T3+0F Fp4-OFFFF { +AF"6?
(i@FYFG Eѹ JAFR#0FrjG!8F +FoйF;|\#T34tLE\U4,1F -+FW ++FW i
bi -1F
Dd -hi +1F
Dd +hi iIF
ci"3F@FF F -ci
3F&`F;#iO -l iGch -i ih -qH +ci
3F&`F;#iO +l iGch +qH 0 -QF -& F - 4F -!CZF" - .i
nii.ji#F"{F@T KhkG -al5m FG9 FADGF -i
IF8FCFF[i
GG#40!hGh"ah8F -F +-F +& F + 4F +!CZF" + .i
nii.ji#F"{F@T KhkG +Tl5m FG9 FADGF +i
IF8FCFF[i
GG#40!hGh"ah8F +lF QFZFKFF GF G GF G GF -FGF +FGF GF -*jGF0iGFpi)iGF@iiiGF#+`+j - -8FIFBF( +*jGF0iGFpi)iGF@iiiGF#+`+j + +8FIFBF( m O
-
< d ! "()+ ,lxhG F -F8F!h2SFB - -J+@XFF -F --FB?P{B?LXF4K3F@h K[iG -@:F -4JUmFGF - +
< d ! "()+ ,lxhG F + +h +J+@XFF +F +-FB?P{B?LXF4O3F@h K[iG +@:F +4JUmFGF + GF GF -GF -F -Qi"GF +GF +F +Qi"GF LlGF#mGF F (`h` .0;@<EAF``,u,a(bke
cg*clc0 -<@c0PeBed@,fx@@@ @@@ ->F -PFC +<@c0PeBed@,fx@@@ @@@ +h@$[n
c +1F +PFC - - $Ꭽ!#)``b:+c -`,u,ablc<@cȃCD - - $
$ + + $Ꭽ!#)``b:+c +`,u,ablc<@cȃCD + - -2`"bB"b5k`F`*cbOcje" + +2`"bB"b5k`F`*cbOcje" - -j`FbObbB#`+cke#e0tc<@c + +j`FbObbB#`+cke#e0tc<@c - - -t - - - F)F=( F!F*F;hXhF!F8F + +F + +g + + F)F0( F!F*F;hXhF!F8F Kh+F - F - + F + OepS%`%UiFu@FS&`u@&S&`Fu@.qq.Nq. =qS%`_*%iFu@FS&` 'Prih@P@S$ P@S* B ssJs -s +s OepS%`%eiFu@FS&`u@&S&`Fu@.qq.Nq. =GqS%`ղ%iFu@FS&`*u@&S&`Fu@.rr.Nr. S"P rE ssJs -s +s ? ?\'pX+'FMOW+pGFIOjW+pEOW* 'V'pGU'piT)ph3h1_@? X* @@ -694,221 +704,214 @@ X* BU" gT'p $J'R'p"J GR'piJ -R)pBOr1K@J@Os$b@$33Z@AK@A2S@C`` +R)pBOr1K@J@Os$b@$33Z@AK@A2S@C`` @% @$ 2* 7 28* @$?~p?P%`Q"pG -@%2*3+ - - +@%2*3+ + + 40 F9FG8O B80 FGC6F.O+pnp.#pkp5?҂#pkp3 p5 ҃#.qkp3p3 p5 F -GFk FGEѳk FGFNAF3lG K[iG!FmFG -3 +GFk FGEѳk FGFNAF3lG K[iG!FmFG +3 u -a(1"0F +a(1"0F V<VṾ+M -@]J@BP1`6%u%a(4$
#8F -$$ -FXFF -#8F -o -_F -MF F -:Xcx -XF!F5FO -:F - +@]J@BP1`6%u%a(4$
#8F +:F + E0F - F -OO
@FS208 (KVpGd pG -!(h -!p\ -!p(hp\ -!phh -!p\ -! qhhp\ -!`qh -!p\ -!qhp\ -!qh -!p\ -! rhp\ -!`r(i -!p\ -!r(ip\ -!rhi -!p\ -! ship\x`s+jiiN -!si -!p\` -!sip\X -! t(j -!p\M -!`t(jp\E#tZ ?#sbp + F +OO
@F)R208 (KVpGd pG +!(h +!p\ +!p(h +p\ +!phh +!p\ +! qhhp\ +!`qh +!p\ +!qhp\ +!qh +!p\ +! rhp\ +!`r(i +!p\ +!r(ip\ +!rhi +!p\ +! ship\x`s+jiiN +!si +!p\` +!sip\X +! t(jr +!p\M +!`t(jxp\E#tZ ?#sbp $p҃#,qkp#p# -$pV88(O -FHF -F F -F%h(F -8F - -YF"F 8 +$pV+8(O +FHF +F F +~F%h(F +8F + +YF"F 8 O -TaBFYD(F -N +GaBFYD(F +A +]b `i -#`O0FF -8F -(F -O +#`O0FF +8F +(F +O O O
-PF +PF E -F0F -F@F -F$h F -8F - -Cm +F0F +{F@F +wF$h F +8F + +zCm -f# +Y# 0D -: +- (F:KAFS"0[iG@EFQ!FZF;F9 hB`# -!F -D2 +!F +D2 ` -8F - F -## -F0F -F0F -0F -F4 F -(F -F - -<+# F:RFYF -F@F +8F + F +## +F0F +F0F +0F +}F4 F +(F +F +} +v<+# F:RFYF +9@F JF -@ +3 BoR E -`.['0[mGF +`.['0[mGF aRmGF['0)FmGFH(FAFJF -U`@F - -(F - F -# -F(F -}(F -yF(F -uFF -~F -y -s -l -[' RmGF +U`@F + +(F + F +# +tF(F +p(F +lF(F +hFF +qF +l +f +_ +[' RmGF 1Fm"GF m GF IFmBFGF QFmGF -"IFX 0BF -8FQFoFD -WQF -W"U +"IFX 0BF +8FQFoFD +WQF +W"U x@Xp` -HF - -0F -$$ -# BTPFy -M - +HF + +0F +$$ +# BTPFU +@ + 0GF 0F8ZF 0F HFZF HF -Y +Y PFQFZF PFQFZF PF[FR@RFPGF FFJRiGJ - G + G FGF FGF FnGF FGF FGF OFFmGF -!FKFmGF +!FKFmGF OF;nGF ~OFFmGF qOFmGF -NF3nGF +NF3nGF QO!hFmGF CO FnGF -OmFGF +OmFGF uOFmGF -`h)FmFGF +`h)FmFGF i AF
"0F#` -0F -K(F*F@KFGF -7pZ( RmG -FGF -gI0F_z1F O#F{OO +0F +K(F*F@KFGF +7pZ( RmG +FGF +gI0F_z1F O#F{OO -!F - 7OE - -!F!F!F -ch" -FKFFF;F -:/FF -@6K FF -+I*H -x0F -FJ`Y`h```h`KhQ` F)Ft -Q2$ -زBؕBشB3B +!F + r7OE + +!F!F!F +ch" +F~KFFF;F +:/FF +@6K FF ++I*H +x0F +FJ`Y`h```h`KhQ` F)Ft +Q2$ +زBؕBشB3B ȿ$,($+U -+, ++, ; ܸ#fи*fи @X.jи0и-@_U 3h6C{j -`H`" -FO +`H`" +FO AEq0 " " Fx<F
F " #x( ! AqFFT
ZF - 3 3 3 3H1@@8@Bddhl +!3!3!3!3H1@@8@Bddhl ;< E պ @@ -918,102 +921,102 @@ x0F : 2ZE{ #a -;9 +;9 -Xn`vh`mh`42,88Fi - - Fb0
FF +Xn`vh`mh`42,88FiIU<[j`kG#ij+U<iG8@H-CFFFF+ FiFF#;`#AF;`Y<pk"hjkFG!FFhF#(F -AFF
Fi# +F@@ +`` + (F!F:Fsih4 -oF
FFOhF -8 -) - - -"c -C -` +oF
FFOhF +8 +) + + +C +` FFFsi[i -:*+$$**V<hFhp`2`h +:*+$$**V<hF#hp`2`h zhh -7 -! -F +7 +!CF +P!F" ih` " -cj##jF>pFF OqvF85 -F FFF -F F8Fh\ Fah -h!q2FQ@BF +cj##jFpFF OqF85 +F F3F +F F8Fh\ Fah +h!q2FQ@BF php qCqˈ -qˈ1q0Kx +qˈ1q0ؼKx xCcxCxC#` -yKyC#yy1C#"À05 -i9F2F -ü pG -} pG -D pG - pG-AFFFF{d)F@p"~(F9F2F#FA -AFFFF۱I)F@p"c)FBp"])FDp"W(F9F2F#FAj F - +yKyC#yy1C#"À0pF +i9F2F + pG + pG +z pG +B pG-AFFFF{)F@p"(F9F2F#FA -AFFFF۱)F@p")FBp")FDp"(F9F2F#FA F + '' 'T74',T7 -Tu8F)F +Tu8F)F 73T+7T8FYF - -O -wa + +O +wa wa YW V -U )F +U )F Z \ ] -^ )F -pbJphO"php +^ )F +pbJphO"php f,h i -j ")F -pbJphO"php +j 1)F +pbJphO"php L - 4)F + 4-)F pJpbhO"pbhpx -qbJq"hO"qT+q -` 8kh --GFFF -萇Fpi -FBO --GFFFF@:7. -7 !.Fp -F@ F
T@F`F +qbJq"hO"qT+q +` 8kh +-GFFF +萇Fpi + +FBO +-GFFFF@:7. +7 !.Fp +3ah?+VF -86 -%D
iF - BFIF0FL Fm -(BF0FC FdHF ! -8 -*)(F"F -*4..2 F*F +86 +%D
iF + BFIF0FY Fm +(BF0FP FdHF ! +8 +*)(F"F +*4..2 F*F pq"qbq -q +q pq"qbq -q +q pq"qbq -q +q pq"qbq -q -FFUFZ +q +FFUFZ ( EѨ
- ?+߀k"hB#`
+1#0#-3pOup#-#psp#?҂#psp+ p# ҃#5qsp+p+ p#"h -#`;hhxh - +#`;hhxh + "FF -3 -%F +3 +%F - a -%a F -+8(x0lxвB$ + a +%a-F ++8(x0lxвB$ ?҂"pbp* p" ?҂"pbp* @@ -1025,15 +1028,15 @@ ZO O LɲѡT2 -D +D &p҃#%qcp+&p+ -p +p =F<F C p#(!rh 3h ;#*FFO p҃#,qkp#!p# -p\T2Bъ2`(0(0?00` +p\T2Bъ2`(0(0?00` &p҃#%qcp+&p+ -p +p Jh01 F B FAFh @@ -1081,7 +1084,7 @@ B 1 FFF!F9FBF#F1F FFF!F9FBF#F}1F -FFF!F9FBF#FN1F +FFF!F9FBF#FN1F ڰG Z6:h 8X'O (F OI @@ -1093,40 +1096,34 @@ h`:`9F"F3F""?GE 3FE !FXF -Fx1BxFF3x - +Fx1BxFF3x + GoQcpn g))/F '&&\8!.*Zm,M߳
8ScTs ew< jvG.;5,rdL迢0BKfpK0TQlReU$* qW5ѻ2pjҸSAQl7LwH'Hᵼ4cZų9ˊAJNscwOʜ[o.h]t`/CocxrxȄ9dnj(c#齂lPyƲ+SrxqƜa&>'!Ǹ}xnO}orgȢ}c
?G5q}#w($@{2 -<L
gCB>˾L*~e)Y:o_XGJDlS2=22102222a2 - - - +<L
gCB>˾L*~e)Y:o_XGJDl222%022S222 + + + + '8!.m,M
8STs e -jv.,r迢KfpK£Ql$օ5pjl7LwH'49JNOʜ[o.htocxxȄnjlPxqr2 -2'2D2a2~22 -2222262 - - -3 - -3` -3 -3 -33T33 -3 -333S33 -3 -33
3R
3
3 - - - - - +jv.,r迢KfpK£Ql$օ5pjl7LwH'49JNOʜ[o.htocxxȄnjlPxq2 + + +3n +3 +3 +33 + + + + + + |B| !\hT[:.6$g WҖO aiKwZ @@ -1165,7 +1162,7 @@ o/Dyeڜ - + @@ -1176,12 +1173,17 @@ o/Dyeڜ - - + + + + + - + + + @@ -1190,8 +1192,8 @@ o/Dyeڜ FSR 0x%x PC 0x%x TTBR0 0x%X CONTEXIDR 0x%X -CPUID 0x%x CPSR 0x%x (read from SPSR) - +CPUID 0x%x CPSR 0x%x (read from SPSR) + @@ -1242,7 +1244,7 @@ CPUID 0x%x CPSR 0x%x (read from SPSR) - + @@ -1255,7 +1257,7 @@ CPUID 0x%x CPSR 0x%x (read from SPSR) - + @@ -1285,14 +1287,14 @@ CPUID 0x%x CPSR 0x%x (read from SPSR) - + - + @@ -1315,7 +1317,7 @@ CPUID 0x%x CPSR 0x%x (read from SPSR) -SECP112R1 +aml-sha1 ;3+#>6.&=5-%
<4,$
- + diff --git a/secureos/gx/bl32.img b/secureos/gx/bl32.img index e893889..5c26464 100644 --- a/secureos/gx/bl32.img +++ b/secureos/gx/bl32.img @@ -1,66 +1,60 @@ e4' -o -/fZ(RnCi_` - - +o +/fZ(RnCi_` + + + FOzq# H O N # -# - - -" - -" -N F -N -oI -iI -۲F -F +# + + + +FO +& +uI +oI +۲F +F +)KE,)i +%K +FF9 +GF -*" F -IGF FIG F$ - +*"F + +GFxHF "%X_K"_HOq +FdFO Kka -KZh*b5`]`HH +KZh*b5`]`HH BohXXP K" -H@( - -;` -!F2Fd -+ F9Fj -$] 9F$0` - -GF`E -`)F*F+F -SzMKhG -DM(h$ -'$.KhOV@F"1$ - -V"79F$88FAF"$4 ,"L/M - -GFXK!F.ihO!sGhFG -TLLFKB FX3Z22 +H@( + +;` +!F2Fh ++ F9Fj +$<I"
$8Kh +Y@F" $ +QF$|8PFAF"$`4 ,-L+)M Q Q -Q -KEsa#a - K +Q +KEsa#a -A## F3`K+` +A#t# F3`K+` -E +E , -E""@ -CB`V" B3B`pG - -p +E""@ +CB`V" B3B`pG + +p @@ -69,335 +63,338 @@ CB`V" B3B`pG / / / -/F
FF -Zh:x"p -Z` +/F F5F +Zh:x"p +Z` K SBSL B3S -FF"30F
KBS,BSL:B +FF30F
KBS,BSL:B #
'wF?
?K P 5 AF - + PCFSS, -CCL - -HOqJ +CCL + +HOqJ -k@F!hh/ر +k@F!hhر BV8/ "h8XB&`hhzhBhbhyhB4FF h{`B, -0`#ahE +0`#ahE) i
=
'w-?
#-?? F3h @h+- - JEEE0iB@ L\CCP`L}B``ap + JEEE0iB@ L\CCP`L}B``ap Z B`E E DG`1 )H3+Ѣkh0 -C`eck"<c8lH3-GFFFF +C`eck"c8$@3-GFFFF -kBYCh8FIFhpk +kBYCh8FIFhpk -kXYZQhFk@F![hd@k]hCD -KB - +kXYZQhFk@F![h@k]hCD +KIB + ?O 2?#?#P?@j k@i :_вRB@` - -M
- -K"! H(FtK``cb -FG + +M
+ +K"! H(FK``cb +FG Eѝ -0 -JOq
H +0 +JOq
H - -#hG8" - -hD$F]#DBB3$+ + +#hG8" + +hD$F]#DBB3$+ K" -H! -F( -F( - -F( +H! +F( +8F( + +F( -H[ -mF( -JF( - -Fd6K - - - - - - - - - - - - - - - - - - - - - - - - - - +H[ +Y +F( +68F(I +F( +WK"HOq + + + + +F7K + + + + + + + + + + + + + + + + + + + + + + + + + + Hh - - - - - - - - - - - - - - - - - - - -4(` -Y `@s + + + + + + + + + + + + + + + + + + + +v(` + `@; (JhK
"`JhK`pGJKh -pYp p p -
K -K -K -K -K -K -K -K -H! -"!cd"Adds 22kF:* K +pYp p p +
K +K +K +K +K +K +K *( -@j@h -K`0FK`Zh"p""?B +@j@h +K`0FK`Zh"p""?B J``KhB `"h dbhJdhdhdL -"i+J`bi`٣iBJ`iS`k+ѣl=J`#jbcjcjScjc+6K "` j45K``j/3K`j*2K`j%0K`k#lak -! ! -K@b -5 +"i+J`bi`٣iBJ`iS`k+ѣl=J`#jbcjcjScjc+6K "` jJ5K``jE3K`j@2K`j;0K`k#lak +! ! +K@b +5 J``a J -K`:Z`pG8ڥj?* +K`:Z`pG8ڥj?* C## +&J)&KOU2`$J$J)$KO2`#JOU2Z`"!K)OU1O1`Y`J)hC*C##*` -K" -H=F@ K" Hc! -H -HAFF:F0F +K" +HSF@ K" Hc! +H +HAFF:F0F - + - -` -JF + +` +JF ca4Kh a3Kh -a1KhhB#`C"c.KhhB#`C*KhB"h"* h+0$KhhB#`C"F +a1KhhB#`C"c.KhhB#`C*KhB"h"* h+0$KhhB#`C"F
h -X -#EGFFOqhCLo d! -` m8OrXO0@ -+0x+Op`1TF8FP(̿0 * +f +#EGFFOqhCZo d! +` {8OrXO0@ ++0x+Op`1bF8F^(̿0 * 1+Bo"F+F 0w6pEڴF -3@P2@o(F(F -HI+h3K`Kh2`KhBє,0%ei +3@P2@o(F(F +HI+h3K`Kh2`KhBє,0%ei +2p2 HF3h+`'x F0 F:FhGFHFeMO - ` F -J -F)Fhh$iG8dZ38FK -F)FhhdiG8dZ3KXh - + ` F +J +F)Fhh$iG8R38FK +F)FhhdiG8R3KXh + FB!
<B @@# - + "FHF -P1F - +^1F + - O - -kGFx@FeF 5F + O + +kGFx@FeF 5F OF9(F!F KFG - -=F O=F O + +=F O=F O ?(F 1FG -@#G`*$ -JF9%OD%E -IF FF - - -@ +@#G`*$ +JFG%OD%E +IF FF + + +@ * -O0!XFF +O0!XFF * -+++h0FAй` ++++h0FOй`
,
#iˎ -SF +SF - FY -6FEKFK + FY& +6FEKFK -KKF -GKGHhZh
#B% -FF #FF$F4 F F -@+"i QF +KKF +GKGHhZh
#B% +FF #FF$F4 F F +@+"i QF h +ED3BO OF# -1FX +1FX E B -FFFFUFWF6"h#KB/FAFL +FFFFUFWF6"h#KB/FAFZ -4Eѳh JB2Bѥb +4Eѳh JB2Bѥb - -h
FChB10+h -OO h34ڈj rRiGzBӽ2-CFjӱhF -OO h34ڈj riGzBӽ2 + +h
FChB10+h +OO h34ڈj rRiGzBӽ2-CFjӱhF +OO h34ڈj riGzBӽ2 Hh! -3ڈj9FBFG04zBH +3ڈj9FBFG04zBH Ohj 3ڈj@YiG -)KB -8( -K[nKnKoK[o{)FGO3`5a - - +)KB +8( +K[nKnKoK[o{)FGO3`5a + + -3CEрLYF -t`hhGFȹ(F1FJ,(F1FJ'(F1FJ"J(F1FLL - -L L)FF - -**JhiGiipj JjkLhihGH +3CEрLYF +t`hhGFȹ(F1FJ:(F1FJ5(F1FJ0J(F1F+LL + +L L)FF + +**JhiGiipj JjkLhihGH ** -Ji JVkFi*F#FGFH +Ji JVkFi*F#FGFH FFFF -1hiaF -uAF(FJF#FF +1hiaF +uAF(FJF#FF RB@7! OqOq@ ! -jGF`YFO@B +jGF`YFO@B 2h+< -2hFYF - -AF"F -pjF +2hFYF + +AF"F +pF KB -" -QF +" +F AF F,GF)@5Iph+~9F2F(F/KFp -@ F,CFf(XB3%I - F - - -F +@ F,CFf(XB3%I + F + + +F N N -N(FN - -F +N(FN + +F `bF -L -F/#;F"#" +L +F/#;F"#" KB -E)F +E)F& L -L +L F -O +O F -!i$#c
ai.Kh$#jk -N F N -$h - FMck -. *F -"`+` -# -K!O -0F +!i$#c
ai.Kh$#jk +N F N +$h +. *F +"`+` +# +K!O +0F !h+1 !h[ 1!+i[h1!! -!ii!p"iڱ +!ii!p"iڱ Kh:F3F@F - + !"0#F"F -LLK"h@ > F&pZ3(2 -L - - +LLK"h@ > F&pLR32 +L + PO 3E -[kf +[kt 03CD -0F -!"` 0*SF8F -FFF& -O -TPH - -LH!B(F$ F K3Z3 -+FIFS:F@D -IFh +0F +!"` 0*SF8F +FFF& +O +TPH + +LH/P(F2 F B3DR3 + F8 ++FIFS:F@D +IFh W(h - - -7O*9_D?%_4]FOU_IF"FU + + +7O*9_D?%_4]FOU_IF"FU V!F(hJF3FF -
-(,D#2`!F!B"(Fw!>#XCC7B#7` -A +
+(,D#2`!F!B"(Fw!>#XCC7B#7` +A #F -l0F!FhBI0F!*FKFnh5QFB"00B)L+F - +l0F!FhBI0F!*FKFnh5QFB"00B)L+F + " -# -#"0 -# -E +# +# +E $ -EF@_@F5)FF@#@Fpd -GF0k0FI:F #GF0FVL -[F -#GF0eiPF9I #GFPFL -iI)GFPF -"o0, B +EF@_@F5)FF@#@Fpd +GF0k0FI:F #GF0FdL +[F +#GF0eiPF9I #GFPFZ +iI)GFPF +"}0, B +a%b @@ -407,53 +404,53 @@ $ - - - + + + Oc@DcOHsOhs` KBOsOss` - -hch
#ihMKBSBSB@0@@*F + +hch
#ihMKBSBSB@0@@F @FlG -@FyG -&KB&KB %H%H%H%H%H +@FyG +&KB&KB %H%H%H%H%H -F -lGB.(FFPK"H@Q - - +F +lGB.(FFPK"H@Q + + -hch`Hh
#iciii-KBS(F# -L F"0( -hkh`Hh
+ikiiiDKB.أCB)أ -khgF +hch`Hh
#iciii-KBS(F# +L F"0( +hkh`Hh
+ikiiiDKB.أCB)أ +khYF +KlG+h(`B(LH0F,F
K"L@A -H
F +H
F N(ر(("J@DAH *I"F -3h2`BL!)F(F -K L" -KL" -p$3K3 -Gih
Gi)iG0F8F - -pK3 +3h2`BL!)F(F +K L" +KL" +p`3C3 +Gih
Gi)iG0F8F + +pC3 -pK3 -GiiG0Fj8F -KBsBHH +pC3 +GiiG0Fj8F +KBsBHH - +
-KB%ңsBO3B3BIaE $KB@aE-!KB8)F2F#FB*')F2F#F. )F2F#FJ4c -A - -~*hiFK@F`jh[m"aJFGhQF:FL>hFh'I -L(+ +A + +~*hiFK@F`jh[m"aJFGhQF:FL>hFh'I +L(+ F, FFKBsB% @@ -466,18 +463,18 @@ L(+ KB%PAq)KB3B3B F@@@? F( -)H>(H;(H8'He'Hb&H_&H\%HY%HV$HhhF0V3xO - - +)H>(H;(H8'He'Hb&H_&H\%HY%HV$HhhF0V3xO + + @FlG -@FqG +@FqG o?L khh g5LT 9 H@eK" -@F9F2FPF`K@m
H" -L +L B1 @@ -485,44 +482,44 @@ F( O -O
x2xixBHK +O
x2xixBH5 zOj O -O
x3xixBHFȱ 1"9F#O FCF0F" +O
x3xixBHFȱ 1"9F#O FCF0F" zOj O -O
x3xixBHIF +O
x3xixBH~IF DHFQF:FOFq] - J@qUZU5-< + J@qUZU5-< - + 03 -"F +"F CC<# -҂"<#=#S@=3#!C<#=#C=#>#b>#?#B?#@#"@#A#S@A3# 3$#SCL3 -JOp3FR#0"FiG -l#c\2l#\32l# #*#OpFY" i"FG #52< # +҂"<#=#S@=3#!C<#=#C=#>#b>#?#B?#@#"@#A#S@A3# 3$#SCL3 +JOp3FR#0"FiG +l#c\2l#\32l# #*#OpFY" i"FG #52< # '' 7''7' '' 3F' -T'5J@ 3+:hB;`0F! F4-GFFF -%DOS +T'5J@ 3+:hB;`0F! F<4-GFFF +%DOS F F@
H @q@ T@L Z#@ LLD]3+ hFDF F!F @
HT@LDY#@\D7L3 + f.F F!F4FZ#`^D
Hu `3V@l0+ 5DeF&D!F4F.FddP
Hf U@\DZ#PMD8 P3@+ b -F5D +F5D K Fհ F*F#F8LOe,M@e @@ -552,7 +549,7 @@ Kb KCbFpG pG FF;FZFOU pU - + Kb` K` Ka @@ -574,51 +571,51 @@ CckCs{Cs#O OHEh A OBjJOCjJ Eg G -E -2BE +E +2BE O viHFYF -_J@! - - +_J@! + + 4 ,
J -KC$PH 4 ,HO4 +KC$PH 4 ,HO4 4 ,J -KC$PH 4 ,HO4 +KC$PH 4 ,HO4 4 ,J -KC$PH 4 ,HO4 w -ah -G - - -IQ" )FjFG +KC$PH 4 ,HO4 w +ah +G + + +IQ" )FjFG -Eѻ -IQ" )FiFGFPF\\J@T3+0F Fp4-OFFFF { +Eѻ +IQ" )FiFGFPF\\J@T3+0F Fp<4-OFFFF { AF"6?'
(i@FYFG Eѹ JAFR#0FrjG!8F +FoйF;|\#T34tLE\U4,1F -+FW ++FW i
bi 1F
Dd -hi +hi iIF
ci"3F@FF F ci
3F&`F;#iO l iGch -i ih +i ih qH 0 QF -& F - 4F -!CZF" - .i
nii.ji#F"{F@T KhkG -al5m FG9 FADGF -i
IF8FCFF[i
GG#40!hGh"ah8F +& F + 4F +!CZF" + .i
nii.ji#F"{F@T KhkG +al5m FG9 FADGF +i
IF8FCFF[i
GG#40!hGh"ah8F F QFZFKFF GF @@ -629,36 +626,36 @@ IQ" )FiFGFPF\\J@T3+0F Fp4-OFFFF { FGF GF *jGF0iGFpi)iGF@iiiGF#+`+j - -8FIFBF( + +8FIFBF( m O
< d ! "()+ ,lxhG F -F8F!h2SFB - +F8F!h2SFB + J+@XFF -F --FB?P{B?LXF4K3F@h K[iG -@:F -4JUmFGF +F +-FB?P{B?LXF<4C3F@h K[iG +@:F +4JUmFGF GF GF -GF +GF F -Qi"GF +Qi"GF LlGF#mGF F (`h` .0;@<EAF``,u,a(bke
cg*clc0 <@c0PeBed@,fx@@@ @@@ ->F -PFC +>F +PFC $Ꭽ!#)``b:+c -`,u,ablc<@cȃCD +`,u,ablc<@cȃCD - $
$ + $
$ 2`"bB"b5k`F`*cbOcje" @@ -667,24 +664,24 @@ PFC j`FbObbB#`+cke#e0tc<@c - -t - - + +t + + F)F=( F!F*F;hXhF!F8F Kh+F F - + OepS%`%UiFu@FS&`u@&S&`Fu@.qq.Nq. =qS%`_*%iFu@FS&` 'Prih@P@S$ P@S* B ssJs -s +s OepS%`%eiFu@FS&`u@&S&`Fu@.qq.Nq. =GqS%`ղ%iFu@FS&`*u@&S&`Fu@.rr.Nr. S"P rE ssJs -s +s ? ?\'pX+'FMOW+pGFIOjW+pEOW* 'V'pGU'piT)ph3h1_@? X* @@ -694,31 +691,31 @@ X* BU" gT'p $J'R'p"J GR'piJ -R)pBOr1K@J@Os$b@$33Z@AK@A2S@C`` +R)pBOr1K@J@Os$b@$33Z@AK@A2S@C`` @% @$ 2* 7 28* @$?~p?P%`Q"pG -@%2*3+ - - +@%2*3+ + + 40 F9FG8O B80 FGC6F.O+pnp.#pkp5?҂#pkp3 p5 ҃#.qkp3p3 p5 F -GFk FGEѳk FGFNAF3lG K[iG!FmFG -3 +GFk FGEѳk FGFNAF3lG K[iG!FmFG +3 u a(1"0F V<VṾ+M @]J@BP1`6%u%a(4$
#8F -$$ +$$ FXFF #8F -o +o _F MF F :Xcx @@ -728,7 +725,7 @@ a(1"0F E0F F -OO
@FS208 (KVpGd pG +OO
@F;J208 (KVpGd pG !(h !p\ !p(hp\ @@ -752,9 +749,9 @@ a(1"0F !sip\X ! t(j !p\M -!`t(jp\E#tZ ?#sbp +!`t(jp\E#tZ ?#sbp $p҃#,qkp#p# -$pV88(O +$pV88(O FHF F F F%h(F @@ -773,7 +770,7 @@ O O O O
-PF +PF @@ -797,7 +794,7 @@ hB`# ` 8F F -## +## F0F F0F 0F @@ -819,7 +816,7 @@ hB`# (F F -# +# F(F }(F yF(F @@ -841,61 +838,61 @@ x@Xp` HF 0F -$$ +$$ # BTPFy M - + 0GF 0F8ZF 0F HFZF HF -Y +Y PFQFZF PFQFZF PF[FR@RFPGF FFJRiGJ - G + G FGF FGF FnGF FGF FGF OFFmGF -!FKFmGF +!FKFmGF OF;nGF ~OFFmGF qOFmGF -NF3nGF +NF3nGF QO!hFmGF CO FnGF -OmFGF +OmFGF uOFmGF -`h)FmFGF +`h)FmFGF i AF
"0F#` -0F -K(F*F@KFGF -7pZ( RmG -FGF +0F +K(F*F@KFGF +7pZ( RmG +FGF gI0F_z1F O#F{OO !F 7OE -!F!F!F -ch" +!F!F!F +ch" FKFFF;F -:/FF +:/FF @6K FF +I*H -x0F -FJ`Y`h```h`KhQ` F)Ft -Q2$ -زBؕBشB3B +x0F +FJ`Y`h```h`KhQ` F)Ft +Q2$ +زBؕBشB3B ȿ$,($+U -+, ++, ; ܸ#fи*fи @X.jи0и-@_U 3h6C{j @@ -908,7 +905,7 @@ x0F " " Fx<F
F " #x( ! AqFFT
ZF - 3 3 3 3H1@@8@Bddhl +333n3H1@@8@Bddhl ;< E պ @@ -918,42 +915,41 @@ x0F : 2ZE{ #a -;9 +;9 -Xn`vh`mh`42,88Fi - - Fb0
FF +Xn`vh`mh`42,88Fi + (F!F:Fsih4 oF
FFOhF -8 -) - - -"c -C -` +8 +) + + +C +` FFFsi[i :*+$$**V<hFhp`2`h zhh -7 +7 ! -F +F " -cj##jF>pFF OqvF85 -F FFF -F F8Fh\ Fah -h!q2FQ@BF +cj##jFpFF OqvF85 +F F8F +F Fܽ8Fh\ Fah +08FFilP(F!m(kh(F!FG8F8lFj +h!q2FQ@BF php qCqˈ qˈ1q0Kx xCcxCxC#` -yKyC#yy1C#"À05 -i9F2F +yKyC#yy1C#"À0 +i9F2F ü pG } pG D pG - pG-AFFFF{d)F@p"~(F9F2F#FA -AFFFF۱I)F@p"c)FBp"])FDp"W(F9F2F#FAj F + pG-AFFFF{")F@p"~(F9F2F#FA -AFFFF۱)F@p"c)FBp"])FDp"W(F9F2F#FAj F '' 'T74',T7 @@ -1094,39 +1090,34 @@ h`:`9F"F3F""?GE Fx1BxFF3x - + GoQcpn g))/F '&&\8!.*Zm,M߳
8ScTs ew< jvG.;5,rdL迢0BKfpK0TQlReU$* qW5ѻ2pjҸSAQl7LwH'Hᵼ4cZų9ˊAJNscwOʜ[o.h]t`/CocxrxȄ9dnj(c#齂lPyƲ+SrxqƜa&>'!Ǹ}xnO}orgȢ}c
?G5q}#w($@{2 -<L
gCB>˾L*~e)Y:o_XGJDlS2=22102222a2 - - - +<L
gCB>˾L*~e)Y:o_XGJDl222%02y2K +2 2 2 + + + '8!.m,M
8STs e -jv.,r迢KfpK£Ql$օ5pjl7LwH'49JNOʜ[o.htocxxȄnjlPxqr2 -2'2D2a2~22 -2222262 - - -3 - -3` -3 -3 -33T33 -3 -333S33 -3 -33
3R
3
3 - - - - - +jv.,r迢KfpK£Ql$օ5pjl7LwH'49JNOʜ[o.htocxxȄnjlPxq.2 +2+2L2m2 + + + + + +3N +3 +3 +3A333 + + + |B| !\hT[:.6$g WҖO aiKwZ @@ -1165,7 +1156,7 @@ o/Dyeڜ - + @@ -1176,12 +1167,17 @@ o/Dyeڜ - - + + + + + - + + + @@ -1191,7 +1187,7 @@ o/Dyeڜ FSR 0x%x PC 0x%x TTBR0 0x%X CONTEXIDR 0x%X CPUID 0x%x CPSR 0x%x (read from SPSR) - + @@ -1242,7 +1238,7 @@ CPUID 0x%x CPSR 0x%x (read from SPSR) - + @@ -1285,14 +1281,14 @@ CPUID 0x%x CPSR 0x%x (read from SPSR) - + - + @@ -1318,4 +1314,4 @@ CPUID 0x%x CPSR 0x%x (read from SPSR) SECP112R1 ;3+#>6.&=5-%
<4,$
- + diff --git a/secureos/txlx/bl32.img b/secureos/txlx/bl32.img index 43e7e79..50d9d3e 100644 --- a/secureos/txlx/bl32.img +++ b/secureos/txlx/bl32.img @@ -1,66 +1,60 @@ e4' -o -/fZ(RnCi_` - - +o +/fZ(RnCi_` + + + FOzq# H O N # -# - - -" - M -" -N F -N -oI -iI -۲F -F +# + + + +& +uI +oI +۲F +F +)KE,)i +%K +FF9 +GF -*" F -IGF FIG F%v - +*"F + +GFxHF "%X_K"_HOq +FdFO Kka -KZh*b5`]`HH +KZh*b5`]`HH BohXXP K" -H@( - -;` -!F2F@ -+ F9Fj -%! 9F%P0` - -GF`E -`)F*F+F -[SzMKhG -QDM(h$ -'%x.KhOV@F"1%\ - -V"79F%L88FAF"%V4 ,"L/M - -GFXK!F.ihO!sGhFG -LLFKB Fj322 - +H@( + +;` +!F2FD ++ F9Fj +%<I"
%8Kh +Y@F" %g +QF%V8PFAF"%``4 ,-L+)M Q Q -Q -KEsa#a +Q +KEsa#a -A$ƽ# F3`K+` +A$L# F3`K+` + -E +E , -E""@ -CB`V" B3B`pG - -p +E""@ +CB`V" B3B`pG + +p @@ -69,347 +63,346 @@ CB`V" B3B`pG / / / -/F FF -Zh:x"p -Z` +/F cFF +Zh:x"p +Z` K SBSL B3S -FF130F
KBS,BSL:B +FF)30F
KBS,BSL:B #
'wF?
?K P 5 AF - + PCFSS, -CCL - -HOqJ +CCL + +HOqJ -k@F!hhر +k@F!hhMر BV8/ "h8XB&`hhzhBhbhyhB4FF h{`B, -0`#ahE= +0`#ahE i
=
'w-?
#-?? F3h @h+- - JEEE0iB@ L\CCP`L}B``ap + JEEE0iB@ L\CCP`L}B``ap Z B`E E DG`1 )H3+Ѣkh0 -C`eck" +C`eck"c8|O3-GFFFF -kBYCh8FIFh'pk +kBYCh8FIFhpk -kXYZQhFk@F![h@k]hCD -KB - +kXYZQhFk@F![h@k]hCD +K%B + ?O 2?#?#P?@j k@i :_вRB@` - -M
- -K"! H(FPK``cb -FG + +M
+ +K"! H(FK``cb +FG Eѝ -0 -JOq
H +0 +JOq
H - -#hG8" - + +#hG8" + +yB K" -H! --F( -PF( - -F( +H! +F( +F( + +F( -H[ -q -F( -N8F(I -F( -*WK"HOq - -F@6K - - - - - - - - - - - - - - - - - - - - - - - - - - +H[ + +]F( +8F(I +:F( +WK"HOq + + + + +F7K + + + + + + + + + + + + + + + + + + + + + + + + + + Hh - - -2c(2cM2cr2c2c2c2c28c,2؈cS2܈cz2Ԉc2Јc2dc2`c2\c:2hcd2lc2pc2tc2c2̈c2ȈcD2ck2"FnKnIoHh - - - - - - - - - - - - - - - - - -(` + + + + + + + + + + + + + + + + + + + +R(` (JhK
"`JhK`pG0 -pYp p p -
K -K -K -K - #$cd#Bddl -K -K -K -K -H! -"!cd"AddH 2M2kF:* K +pYp p p +
K +K +K +K +K +K +K +2k7F
F;+ K *( -@j@h -K`0FmK`Zh"p""?B +@j@h +K`0FK`Zh"p""?B J``KhB `"h dbhJdhdhdL -"i+J`bi`٣iBJ`iS`k+ѣl=J`#jbcjcjScjc+6K "` j5K``j3K`j2K`j0K`k#lak +"i+J`bi`٣iBJ`iS`k+ѣl=J`#jbcjcjScjc+6K "` j5K``j3K`j2K`j0K`k#lak hsl"@rB#`rj -hsl"@rB#`sj2Ks`2K`2K`2K3a2KsaZ0Ks`0K`0K`0K3a0Ksa0Ka0Ka.Ks`.K`.K`.K3a.Ksa.Ka.Ka.K3b -'O 'O'O@"'BFB "FFIF;"F QFr*K -! ! +hsl"@rB#`sj2Ks`2K`2K`2K3a2KsaZ0Ks`0K`0K`0K3a0Ksa0Ka0Ka.Ks`.K`.K`.K3a.Ksa.Ka.Ka.K3b +'O 'O'O@"'BFB "FFIFg"F QF*K +! ! O O -!FJF - "h -K@b -5 -3o0+pOpѫ~(F!Cvp(F! +!FJF + "h +K@b +5 +3o0+pOpѫ~(F!Cvp(F! J``a J -K`:Z`pG8cj?* +K`:Z`pG8cj?* C## +&J)&KOU2`$J$J)$KO2`#JOU2Z`"!K)OU1O1`Y`J)hC*C##*` -K" -H#F@ K" Hc! -H -HAFF:F0F +K" +HOF@ K" Hc! +H +HAFF:F0F - + +2 2,2K - -` + +` ca4Kh a3Kh -a1KhhB#`C"c.KhhB#`C*KhB"h"* h+0$KhhB#`C"F +a1KhhB#`C"c.KhhB#`C*KhB"h"* h+0$KhhB#`C"F
h - -#EGFFOqhCo d! -` 8OrXO0@ -+0+Op`1F8F(̿0 * + +#EGFFOqhCo d! +` 8OrXO0@ ++0+Op`1F8F(̿0 * 1+l"F+F 0w6pEڴF -3@P2@o(F<#(F*'$! -HI8+h3(K`Kh2`KhBє,0%ei - Fp +3@P2@o(F<#(FNKHE +HIF+h36K`Kh2`Kh,Bє,0%ei HF3h+`'x F0 F:FhGFHFeMO - ` F -J -F)Fhh$iG8l38FK -F)FhhdiG8l3KXh - + ` F +J +F)Fhh$iG8td38FK +F)FhhdiG8td3KXh + +F1FG FB!
<B @@# - + "FHF -1F - +1F + -F> O - - -kGFx@FeF 5F +jb O + +kGFx@FeF 5F OF9(F!F KFG - -=F O=F O + +=F O=F O ?(F 1FG -@#G`*$ -JFy%OD%E -IF FOF - - -@ +@#G`*$ +JF%OD%E +IF FsF + + +@ * -O0!XFF +O0!XFF * -+++h0FKй` ++++h0Foй`
,
#iˎ -SF +SF - FYX -6FEKFK + FY| +6FEKFK -KKF -GKGHhZh
#B% -FF #FF$$F4 F F -@+"i QF +KKF +GKGHhZh
#B% +FF #FF$HF4 DF @F +@+"i QF h +ED3BO OF# -1FX +1FX E B -FFFFUFWF6"h#KB/FAFV +FFFFUFWF6"h#KB/FAFz -4Eѳh JB2Bѥb +4Eѳh JB2Bѥb - -h
FChB10K+h -OO h34ڈj rRiGzBӽ2-CFjӱhF -OO h34ڈj riGzBӽ2 + +h
FChB10o+h +OO h34ڈj rRiGzBӽ\2-CFjӱhF +OO h34ڈj riGzBӽ\2 Hh! -3ڈj9FBFG04zBH +3ڈj9FBFG04zBH Ohj 3ڈj@YiG -)KB -8( -K[nKnKoK[o{)FGO3`5a - - +)KB +8( +K[nKnKoK[o{)FGO3`5a + + -3CEрLYF -t`hhGFȹ(F1FJ6(F1FJ1(F1FJ,J(F1F'LL - -L L)FF - -**JhiGiipj JjkLhihGH +3CEрLYF +t`hhGFȹ(F1FJZ(F1FJU(F1FJPJ(F1FKLL + +L L)FF + +**JhiGiipj JjkLhihGH ** -Ji JVkFi*F#FGFH +Ji JVkFi*F#FGFH FFFF -1hiaF -uAF(FJF#FF +1hiaF +uAF(FJF#FF RB@7! OqOq@ ! -jGF`YFO@B +jGF`YFO@B 2h+< -2hFYF - -AF"F -pF +2hFYF + +AF"?F +pzF KB -" -F +"9 +aF AF F,GF)@5Iph+~9F2F(F/KFp -@ F,CFf(XB3%I - F - - -F +@ F,CFf(XB3%I + F + + +%F N N -N(FN - -F +N(FN + +F `bF -L -F/#;F"#" +L +F/#;F"#" KB -E)F" +E)FF L -L +L F -O +O F -!i$#c
ai.Kh$#jk -N F N -$h -. *F -"`+` -F@OI#<kGF -# -K!O -0F +!i$#c
ai.Kh$#jk +N FD N +$h +. *F +"`+` +# +K!O +0F !h+1 !h[ 1!+i[h1!! -!ii!p"iڱ +!ii!p"iڱ Kh:F3F@F - + !"0#F"F -LLK"h@ > F&pl32 -L - +LLK"h@ > F&pd3h2 +L + PO 3E -[k +[k 03CD -0F -!"` 0*SF8F -FFF& -O -TPH - -LHy(Fd F 8]3l3 -+FIFS:F@D -IFh - +0F +!"` 0*SF8F +FFF& +O +TPH + +LH(F F (U3d3 ++FIFS:F@D +IFh W(h - - -7O*9_D?%_4]FOU_IF"FU + + +7O*9_D?%_4]FOU_IF"FU V!F(hJF3FF -
-(,D#2`!F!B"(Fw!>#XCC7B#7` -A +
+(,D#2`!F!B""(Fw! +>#XCC7B#7` +A +1 #F -l0F!FhBI0F!*FKFnh5QFB"00B)L+F -LL;`LL&cF 3! - +l0F!FhBI0F!*FKFnh5QFB"000B)L+F + " -# -# -E +# +# +E $ -EF@_@F5)FF@#@Fpd -GF0k0FI:F #GF0FL -[F -#GF0eiPF9I #GFPF -iI)GFPF -"0, B +EF@_@F5)FF@#@Fpd +GF0k0FI:F #GF0FL +[F +#GF0eiPF9I #GFPF +iI)GFPF +"0, B @@ -419,85 +412,77 @@ $ - - - + + + Oc@DcOHsOhs` KBOsOss` - -hch
#ihMKBSBSB@0@@*F + +hch
#ihMKBSBSB@0@@F @FlG -@FyG -&KB&KB %H%H%H%H%H -3 -3G3N3 - -F -lGB.(FFPK"H@Q -5 - -5 - -5 - -hch`Hh
#iciii-KBS(F# -L F"0( -hkh`Hh
+ikiiiDKB.أCB)أ -khgF +@FyG +&KB&KB %H%H%H%H%H + +F +lGB.(FFPK"H@Q + + + +hch`Hh
#iciii-KBS(F# +L F"0( +hkh`Hh
+ikiiiDKB.أCB)أ +khYF +KlG+h(`B(LH0F,F
K"L@A -He F +He F (ر(("J@DAH *I"F -3h2`BL!)F(F -K L" -KL" -p33]3 -Gih
Gi)iG0FF8F - -p]3 - -p]3 -GiiG0F8F -KBsBHH - - +3h2`BL!)F(F4 +K L" +KL" +p+3U3 +Gih
Gi)iG0F\8F + +pU3 + +pU3 +GiiG0F8F +KBsBHH + + -
-KB%ңsBO3B3BIaE $KB@aE-!KB8)F2F#F*3')F2F#F )F2F#F&4c -A - -5 -5 -*hiFK@F`jh[m"aJFGhQF:FL>hFh'I -L(+ +
-KB%ңsBO3B3BIaE $KB@aE-!KB8)F2F#F*3')F2F#F )F2F#F&4c +A + +*hiFK@F`jh[m"aJFGhQF:FL>hFh'I +L(+ F, -FFKBsB% - +FFKBsB% + (F' --KBPJF*F# +-KBPJF*F# KB%PAq)KB3B3B F@O@@ -F( - -2Hr1Ho1Hl0H0H.H.H-H,H+H+H)H)H~(H{(Hx'HhhF0V3x"O -5 - - +F( + +2Hr1Ho1Hl0H0H.H.H-H,H+H+H)H)H~(H{(Hx'HhhF0V3x"O + + @FlG -@FqG +@FqG o?L khh 5LT y H@eK" m@F9F2FF`K@m
H" -XL +XL B1 @@ -505,44 +490,44 @@ F( O -O
x2xixBH +O
x2xixBH zOj O -O
x3xixBH\Fȱ 1"9F#O FCF=0F" +O
x3xixBHFFȱ 1"9F#O FCF'0F" zOj O -O
x3xixBHIF -DHFQF:F
AFq] - J@qUZU5-< - - +O
x3xixBHIF +DHFQF:F
WFq] + J@qUZU5-< + + 03 -"F +"F CC<# -҂"<#=#S@=3#!C<#=#C=#>#b>#?#B?#@#"@#A#S@A3# 3$#SCL3 -JOp3FR#0"FiG -l#c\2l#\32l# #*#OpFY" i"FG #52< # +҂"<#=#S@=3#!C<#=#C=#>#b>#?#B?#@#"@#A#S@A3# 3$#SCL3 +JOp3FR#0"FiG +l#c\2l#\32l# #*#OpFY" i"FG #52< # '' 7''7' '' -3F' -T'5J@ 3+:hB;`0Fa F 5-GFFF -%DOS +3F' +T'5J@ 3+:hB;`0Fa F5-GFFF +%DOS F F@
H @q@ T@L Z#@ LLD]3+ hFDF F!F @
HT@LDY#@\D7L3 + f.F F!F4FZ#`^D
Hu `3V@l0+ 5DeF&D!F4F.FddP
Hf U@\DZ#PMD8 P3@+ b -F5D +F5D K Fհ F*F#F8LOe,M@e @@ -561,7 +546,7 @@ J
p6P.WDO D*FF -ODaED[D``aDa +ODaED[D``aDa Kb` K` Ka @@ -569,10 +554,10 @@ KCa Ka Ka Kb -KCbFpG pG +KCbFpG pG FF;FZFOU pU - + Kb` K` Ka @@ -580,7 +565,7 @@ KCa Ka Ka Kb -KCbFpG pG +KCbFpG pG y Okqx0 #JK CxJ$ E C4y)Cx$
#ECC Cty)C$y6#fE@ 2O@p# A; @@ -594,74 +579,55 @@ CckCs{Cs#O OHEh A OBjJOCjJ Eg G -E -HFLI( +E +HFLI> O
-PF -3 -3$ -5-OFFFF -KS&0h FF -3 -3 -3$ -5 -3-AFFF -5 3 -3 -3-CFFF%X +PF +KS&0h FF O -viHFYF -_J@! - - -5]3pFȱN -5]3FH p,HKS$0 = 9 -5FH X,HKS$0 % ! -58F H +viHFYF +_J@! + + 4 ,
J -KC$PH 4 ,HO4 +KC$PH 4 ,HO4 4 ,J -KC$PH 4 ,HO4 -58FH +KC$PH 4 ,HO4 4 ,J -KC$PH 4 ,HO4 -5FȱH
I -J -5-OFFFFOP -ah -G - - -IQ" )FjFG - +KC$PH 4 ,HO4 +J +ah +G + + +IQ" )FjFG + -Eѻ -IQ" )FiFGFPF\\J@T3+0F Fp 5-OFFFF { -AF"6?
(i@FYFG +Eѻ +IQ" )FiFGFPF\\J@T3+0F Fp5-OFFFF { +AF"6?%
(i@FYFG Eѹ JAFR#0FrjG!8F +FoйF;|\#T34tLE\U4,1F -+FW ++FW i
bi -1F
Dd -hi +1F
Dd +hi iIF
ci"3F@FF F -ci
3F&`F;#iO -l iGch +ci
3F&`F;#iO +l iGch qH 0 --F -& F -5]3 -5<,%!mFGF - 4F -!CZF" - .i
nii.ji#F"{F@T KhkG -Il5m FG9 FADGF -i
IF8FCFF[i
GG#40!hGh"ah8F +-F +& F + 4F +!CZF" + .i
nii.ji#F"{F@T KhkG +_l5m FG9 FADGF +i
IF8FCFF[i
GG#40!hGh"ah8F +F lF QFZFKFF GF @@ -672,66 +638,63 @@ IQ" )FiFGFPF\\J@T3+0F Fp 5-OFFFF { FGF GF *jGF0iGFpi)iGF@iiiGF#+`+j - -8FIFBF( + +8FIFBF( m O
-
< d ! "()+ ,lxhG F -5-OFFFF - -h -J+@XFF -F -5-OFFFOh --FB?P{B?LXF -5]3F@h K[iG -5]3OhF -@:F -4JUmFGF - +
< d ! "()+ ,lxhG F + +h +J+@XFF +F +-FB?P{B?LXF5U3F@h K[iG +@:F +4JUmFGF + GF GF -GF +GF F -Qi"GF +Qi"GF LlGF#mGF F (`h` .0;@<EAF``,u,a(bke
cg*clc0 <@c0PeBed@,fx@@@ @@@ -h@$[n
c -&F -PFC +h@$[n
c +<F +PFC - - $Ꭽ!#)``b:+c -`,u,ablc<@cȃCD - + + $Ꭽ!#)``b:+c +`,u,ablc<@cȃCD + - -2`"bB"b5k`F`*cbOcje" + +2`"bB"b5k`F`*cbOcje" - -j`FbObbB#`+cke#e0tc<@c + +j`FbObbB#`+cke#e0tc<@c -F - -\ - - F)F%( F!F*F;hXhF!F8F +F + +a +r + + F)F;( F!F*F;hXhF!F8F Kh+F -t F -u + F + OepS%`%UiFu@FS&`u@&S&`Fu@.qq.Nq. =qS%`_*%iFu@FS&` 'Prih@P@S$ P@S* B ssJs -s +s OepS%`%eiFu@FS&`u@&S&`Fu@.qq.Nq. =GqS%`ղ%iFu@FS&`*u@&S&`Fu@.rr.Nr. S"P rE ssJs -s +s ? ?\'pX+'FMOW+pGFIOjW+pEOW* 'V'pGU'piT)ph3h1_@? X* @@ -741,225 +704,214 @@ X* BU" gT'p $J'R'p"J GR'piJ -R)pBOr1K@J@Os$b@$33Z@AK@A2S@C`` +R)pBOr1K@J@Os$b@$33Z@AK@A2S@C`` @% @$ 2* 7 28* @$?~p?P%`Q"pG -@%2*3+ - - -5-OFFF -5-CFFFF -5]3( +@%2*3+ + + 40 F9FG8O B80 FGC6F.O+pnp.#pkp5?҂#pkp3 p5 ҃#.qkp3p3 p5 F -GFk FGEѳk FGFNAF3lG K[iG!FmFG -3 +GFk FGEѳk FGFNAF3lG K[iG!FmFG +3 u -a(1"0F +a(1"0F V<VṾ+M -@]J@BP1`6%u%a(4$
#8F -:F - +@]J@BP1`6%u%a(4$
#8F +:F + E0F - F -OO
@F[a208 (KVpGd pG -!(h -!p\ -!p(hp\ -!phh -!p\ -! qhhp\ -!`qh -!p\ -!qhp\ -!qh -!p\ -! rhp\ -!`r(i -!p\ -!r(ip\ -!rhi -!p\ -! ship\x`s+jiiN -!siz -!p\` -!sip\X -! t(jg -!up\M -!`t(jmp\E#tZ ?#sbp + F +OO
@FW208 (KVpGd pG +!(h +!p\ +!p(hp\ +!phh +! +p\ +! qhhp\ +!`qh +!p\ +!qhp\ +!qh +!p\ +! rhp\ +!`r(i +!p\ +!r(ip\ +!rhi +!p\ +! ship\x`s+jiiN +!si +!p\` +!sip\X +! t(j} +!p\M +!`t(jp\E#tZ ?#sbp $p҃#,qkp#p# -$pV 8(O -{FHF -wF F -sF%h(F -8F -| -vYF"F 8 +$pV68(O +FHF +F F +F%h(F +8F + +YF"F 8 O -<aBFYD(F -6 +RaBFYD(F +L +]b `i -#`O0FF -8F -(F -O +#`O0FF +8F +(F +O O O
-PF -5-OFF +PF E -tF0F -pF@F -lF$h F -y8F -u -oCm +F0F +F@F +F$h F +8F + +Cm -N# +d# 0D -" +8 (F:KAFS"0[iG@EFQ!FZF;F9 hB`# -!F -D2 +!F +D2 ` -8F - F -## -5 -5-OɰFFS -~F0F -zF0F -v0F -rF4 F -{(F -wF -r -k<+# F:RFYF -.@F +8F + F +## +F0F +F0F +0F +F4 F +(F +F + +<+# F:RFYF +D@F JF -( +> BoR E -`.['0[mGF +`.['0[mGF aRmGF['0)FmGFH(FAFJF -U`@F - -(F - F -# -5-O˰ FFU -iF(F -e(F -aF(F -]FF -fF -a -[ -T -[' RmGF +U`@F + +(F + F +# +F(F +{(F +wF(F +sFF +|F +w +q +j +[' RmGF 1Fm"GF m GF IFmBFGF QFmGF -"IFX 0BF -8FQFoFD -WQF -W"U +"IFX 0BF +8FQFoFD +WQF +W"U x@Xp` -HF - -0F -$$ -5 -5-OFS+FF<D^* +HF + +0F +$$ # BTPFU -5 - -5-AFFF -J0FlGF(FlGF +K + 0GF 0F8ZF 0F HFZF HF -Y +Y PFQFZF PFQFZF PF[FR@RFPGF FFJRiGJ - G + G FGF FGF FnGF FGF FGF OFFmGF -!FKFmGF +!FKFmGF OF;nGF ~OFFmGF qOFmGF -NF3nGF +NF3nGF QO!hFmGF CO FnGF -OmFGF +OmFGF uOFmGF -`h)FmFGF +`h)FmFGF i AF
"0F#` -0F -K(F*F@KFGF -7pZ( RmG -5-AFFF -FGF -gI0F_z1F O#F{OO +0F +K(F*F@KFGF +7pZ( RmG +FGF +gI0F_z1F O#F{OO -!F - g7OE - -!F!F!F -ch" -FsKFFF;F -:/FF -@6K FF -+I*H -x0F -FJ`Y`h```h`KhQ` F)Ft -Q2$ -زBؕBشB3B +!F + }7OE + +!F!F!F +ch" +FKFFF;F +:/FF +@6K FF ++I*H +x0F +FJ`Y`h```h`KhQ` F)Ft +Q2$ +زBؕBشB3B ȿ$,($+U -+, ++, ; ܸ#fи*fи @X.jи0и-@_U 3h6C{j -`H`" -FO +`H`" +FO AEq0 " " Fx<F
F " #x( ! AqFFT
ZF -/303/3/3H1@@8@Bddhl +'3 (3'3'3H1@@8@Bddhl ;< E պ @@ -969,99 +921,100 @@ x0F : 2ZE{ #a -;9 +;9 -Xn`vh`mh`42,8t8Fi4U<[j`kG#ij+U<iG8@3-CFFFF FiFF#;`#AF;`Y<pk"hjkFG!FFhF(F -AFF
Fi - +Xn`vh`mh`42,88FiJU<[j`kG#ij+U<iG8@I-CFFFF, FiFF#;`#AF;`Y<pk"hjkFG!FFhF$(F -AFF
Fi# + (F!F:Fsih4 -oF
FFOhF -8 -) - - -C -` +oF
FFOhF +8 +) + + +C +` FFFsi[i -:*+$$**V<hF8hp`2`h +:*+$$**V<hF"hp`2`h zhh -7 -!XF +7 +!BF " -cj##jFpFF OqF85 -F F<F -F F8Fh\ Fah -h!q2FQ@BF +cj##jF pFF OqF85 +F FF +F F8Fh\ Fwah +h!q2FQ@BF +FF!"F@0
FF php qCqˈ qˈ1q0Kx xCcxCxC#` -yKyC#yy1C#"À0ȼO -i9F2F +yKyC#yy1C#"À0ȼ# +i9F2F pG pG z pG -B pG-AFFFF{)F@p"(F9F2F#FA -AFFFF۱)F@p")FBp")FDp"(F9F2F#FA F - +B pG-AFFFF{~)F@p"(F9F2F#FA -AFFFF۱c)F@p")FBp")FDp"(F9F2F#FA F + '' 'T74',T7 Tu8F)F 73T+7T8FYF - -O -wa + +O +wa wa YW V -U )F +U )F Z \ ] -^ )F -pbJphO"php +^ )F +pbJphO"php f,h i -j <)F -pbJphO"php +j &)F +pbJphO"php L - 48)F + 4")F pJpbhO"pbhpx -qbJq"hO"qT+q -` 8kh --GFFF -萇Fpi -FBO --GFFFF@:7. -7 !.Fp +qbJq"hO"qT+q +` 8kh +-GFFF +萇Fpi +FBO +-GFFFF@:7. +7 !.Fp +3ah?+VF -86 -%D
iF - BFIF0Fd Fm -(BF0F[ FdHF ! -8 -*)(F"F -*4..2 F*F +86 +%D
iF + BFIF0FN Fm +(BF0FE FdHF ! + +8 +*)(F"F +*4..2 F*F pq"qbq -q +q pq"qbq -q +q pq"qbq -q +q pq"qbq -q - -FFUFZ +q +FFUFZ ( EѨ
- ?+߀k"hB#`
+1#0#-3pOup#-#psp#?҂#psp+ p# ҃#5qsp+p+ p#"h -#`;hhxh - +#`;hhxh + "FF -3 -%F +3 +%F - a -%a8F -+8(x0lxвB$ + a +%a"F ++8(x0lxвB$ ?҂"pbp* p" ?҂"pbp* @@ -1073,15 +1026,15 @@ ZO O LɲѡT2 -D +D &p҃#%qcp+&p+ -p +p =F<F C p#(!rh 3h ;#*FFO p҃#,qkp#!p# -p\T2Bъ2`(0(0?00` +p\T2Bъ2`(0(0?00` &p҃#%qcp+&p+ -p +p Jh01 F B FAFh @@ -1129,7 +1082,7 @@ B 1 FFF!F9FBF#F1F FFF!F9FBF#F}1F -FFF!F9FBF#FN1F +FFF!F9FBF#FN1F ڰG Z6:h 8X'O (F OI @@ -1141,46 +1094,39 @@ h`:`9F"F3F""?GE 3FE !FXF -Fx1BxFF3x - +Fx1BxFF3x + GoQcpn g))/F '&&\8!.*Zm,M߳
8ScTs ew< jvG.;5,rdL迢0BKfpK0TQlReU$* qW5ѻ2pjҸSAQl7LwH'Hᵼ4cZų9ˊAJNscwOʜ[o.h]t`/CocxrxȄ9dnj(c#齂lPyƲ+SrxqƜa&>'!Ǹ}xnO}orgȢ}c
?G5q}#w($@{2 -<L
gCB>˾L*~e)Y:o_XGJDl222107222I22 - - -3 - -3 - -3 +<L
gCB>˾L*~e)Y:o_XGJDls2]292%0212222 +2 + + + + '8!.m,M
8STs e -jv.,r迢KfpK£Ql$օ5pjl7LwH'49JNOʜ[o.htocxxȄnjlPxq -3 -3, -3I -3f -3 -3 -3 -3 -3, -3 -333;3X3 -333\3 - - - -3K333 - - - - - +jv.,r迢KfpK£Ql$օ5pjl7LwH'49JNOʜ[o.htocxxȄnjlPxq3 +3'3D3 + +3? +3 +3{33{ +3 +3 +33 + + + +3K3333O3 + + + + |B| !\hT[:.6$g WҖO aiKwZ @@ -1219,7 +1165,7 @@ o/Dyeڜ - + @@ -1230,12 +1176,17 @@ o/Dyeڜ - - + + + + + - + + + @@ -1245,7 +1196,7 @@ o/Dyeڜ FSR 0x%x PC 0x%x TTBR0 0x%X CONTEXIDR 0x%X CPUID 0x%x CPSR 0x%x (read from SPSR) - + @@ -1296,7 +1247,7 @@ CPUID 0x%x CPSR 0x%x (read from SPSR) - + @@ -1339,14 +1290,14 @@ CPUID 0x%x CPSR 0x%x (read from SPSR) - + - + @@ -1372,4 +1323,4 @@ CPUID 0x%x CPSR 0x%x (read from SPSR) aml-sha1 ;3+#>6.&=5-%
<4,$
- + diff --git a/ta_export/host_include/conf.h b/ta_export/host_include/conf.h index f534ec8..2d358ae 100644 --- a/ta_export/host_include/conf.h +++ b/ta_export/host_include/conf.h @@ -1,6 +1,7 @@ #ifndef _out_arm_plat_meson_include_generated_conf_h_ #define _out_arm_plat_meson_include_generated_conf_h_ #define CFG_ANTIROLLBACK_TA 1 +#define CFG_ANTIROLLBACK_TA_SW 1 #define CFG_ARM32_core 1 #define CFG_ARM32_ta_arm32 1 /* CFG_BOOT_SECONDARY_REQUEST is not set */ @@ -60,7 +61,6 @@ #define CFG_LIBUTILS_WITH_ISOC 1 #define CFG_LPAE_ADDR_SPACE_SIZE (1ull << 32) #define CFG_LTC_OPTEE_THREAD 1 -#define CFG_MAP_VMEM 1 #define CFG_MESON_UART 1 #define CFG_MMU_V7_TTB 1 #define CFG_MSG_LONG_PREFIX_THRESHOLD 3 @@ -73,6 +73,7 @@ #define CFG_REE_FS 1 #define CFG_RPMB_FS_DEV_ID 0 /* CFG_RPMB_WRITE_KEY is not set */ +#define CFG_RSV_MEM_SIZE 0x2000000 /* CFG_SECURE_DATA_PATH is not set */ #define CFG_SECURE_STORAGE 1 /* CFG_SECURE_TIME_SOURCE_REE is not set */ @@ -96,6 +97,8 @@ #define CFG_TEE_TA_LOG_LEVEL 1 /* CFG_TEE_TA_MALLOC_DEBUG is not set */ /* CFG_ULIBS_GPROF is not set */ +#define CFG_VDEC_MMAP 1 +#define CFG_VIDEO_FW_LOAD 1 #define CFG_WATERMARK 1 #define CFG_WITH_ARM_TRUSTED_FW 1 #define CFG_WITH_DEBUG 1 diff --git a/ta_export/host_include/conf.mk b/ta_export/host_include/conf.mk index b5b2f4e..42deb0d 100644 --- a/ta_export/host_include/conf.mk +++ b/ta_export/host_include/conf.mk @@ -1,9 +1,10 @@ # auto-generated TEE configuration file -# TEE version ATOS-V2.4-49-g94a260c4 +# TEE version ATOS-V2.4-62-g073ca4a ARCH=arm PLATFORM=meson PLATFORM_FLAVOR=gx CFG_ANTIROLLBACK_TA=y +CFG_ANTIROLLBACK_TA_SW=y CFG_ARM32_core=y CFG_ARM32_ta_arm32=y CFG_BOOT_SECONDARY_REQUEST=n @@ -63,7 +64,6 @@ CFG_KERN_LINKER_FORMAT=elf32-littlearm CFG_LIBUTILS_WITH_ISOC=y CFG_LPAE_ADDR_SPACE_SIZE=(1ull << 32) CFG_LTC_OPTEE_THREAD=y -CFG_MAP_VMEM=y CFG_MESON_UART=y CFG_MMU_V7_TTB=y CFG_MSG_LONG_PREFIX_THRESHOLD=3 @@ -77,6 +77,7 @@ CFG_REE_FS=y CFG_RPMB_FS=y CFG_RPMB_FS_DEV_ID=0 CFG_RPMB_WRITE_KEY=n +CFG_RSV_MEM_SIZE=0x2000000 CFG_SECURE_DATA_PATH=n CFG_SECURE_STORAGE=y CFG_SECURE_TIME_SOURCE_REE=n @@ -100,6 +101,8 @@ CFG_TEE_PANIC_DEBUG=y CFG_TEE_TA_LOG_LEVEL=1 CFG_TEE_TA_MALLOC_DEBUG=n CFG_ULIBS_GPROF=n +CFG_VDEC_MMAP=y +CFG_VIDEO_FW_LOAD=y CFG_WATERMARK=y CFG_WITH_ARM_TRUSTED_FW=y CFG_WITH_DEBUG=y diff --git a/ta_export/host_include/signed_hdr.h b/ta_export/host_include/signed_hdr.h index 962b3dd..684a99f 100644 --- a/ta_export/host_include/signed_hdr.h +++ b/ta_export/host_include/signed_hdr.h @@ -69,8 +69,7 @@ struct shdr { uint32_t img_type; uint32_t img_size; uint32_t key_type; - uint32_t ta_ver; - uint32_t rsv[7]; + uint32_t rsv[8]; uint8_t nonce[TA_ENC_AES_IV_SIZE]; uint8_t aes_key[TA_ENC_AES_KEY_SIZE]; diff --git a/ta_export/host_include/utee_syscalls.h b/ta_export/host_include/utee_syscalls.h index 63af5f4..4853512 100644 --- a/ta_export/host_include/utee_syscalls.h +++ b/ta_export/host_include/utee_syscalls.h @@ -95,7 +95,6 @@ TEE_Result utee_mask_cancellation(uint32_t *old_mask); TEE_Result utee_wait(unsigned long timeout); -void *utee_memset(void *buff, uint32_t x, uint32_t size); /* cat has type enum utee_time_category */ TEE_Result utee_get_time(unsigned long cat, TEE_Time *time); diff --git a/ta_export/include/utee_syscalls.h b/ta_export/include/utee_syscalls.h index 63af5f4..4853512 100644 --- a/ta_export/include/utee_syscalls.h +++ b/ta_export/include/utee_syscalls.h @@ -95,7 +95,6 @@ TEE_Result utee_mask_cancellation(uint32_t *old_mask); TEE_Result utee_wait(unsigned long timeout); -void *utee_memset(void *buff, uint32_t x, uint32_t size); /* cat has type enum utee_time_category */ TEE_Result utee_get_time(unsigned long cat, TEE_Time *time); diff --git a/ta_export/lib/libmpa.a b/ta_export/lib/libmpa.a index c3f4a78..3f7f282 100644 --- a/ta_export/lib/libmpa.a +++ b/ta_export/lib/libmpa.a @@ -1,18 +1,18 @@ !<arch> -/ 1508740949 0 0 0 1608 ` - - - - - -__mpa_set_unused_digits_to_zero +/ 1512712347 0 0 0 1608 ` + + + + + +__mpa_set_unused_digits_to_zero mpa_montgomery.o/ mpa_mem_static.o/ -mpa_misc.o/ 1508740947 790 502 100644 39036 ` -ELF -Jh01 - - +mpa_misc.o/ 1512712346 7593 7000 100666 39120 ` +ELF +Jh01 + + @@ -23,46 +23,47 @@ mpa_misc.o/ 1508740947 790 502 100644 39036 ` B B - - - - - - -@ - - - - - - - - - -. #[!)2/V# Y`"D + + + + + + + + + + +7 + + + + + + +. #[!)2/V# Y`"D A -*D - - - +*D + + - + F I H - -ELF + +ELF F - B FAFh - -K -. - - - - - - + B FAFh + + +K +. + + + + + + @@ -78,27 +79,28 @@ F - - -# -' - - - - -6 - - - - - - -f#> + + + + + + +" + + +G +- + + + + + +f#> A -*D - +*D + - + H E E @@ -155,8 +157,8 @@ S - -ELF + +ELF 8A0F_z1F O#F{OO !F @@ -182,15 +184,12 @@ S o/Dyeڜ - - -@ -# - - -a - - + + +@ +# + +a O!Pv @@ -206,31 +205,32 @@ O!Pv - + - - - + + + - + - - - + + + - - - + + + - + - - + + + @@ -246,26 +246,30 @@ O!Pv - -"
- - - - - - - - - - - - -thKhi!K=2%!/].t/hKKKLK~X4.$F%uK!< <
+ +"
+ + + + + + +9 +H + + + + + + + + +thKhi!K=2%!/].t/hKKKLK~X4.$F%uK!< <
A -*D - +*D + - + K L M @@ -307,11 +311,11 @@ X - -ELF - - -7 + +ELF + + +7 @@ -319,30 +323,28 @@ X B -B - - -4 - - - -< - - - - - - - - -X +B + + + + +$ + + + + + + +( + +- +X A -*D - +*D - - -ELF + + +ELF D; O GYh @@ -358,21 +360,21 @@ X : ? E; O -DEмB +DEмB + -V -9 - - +V +9 + + - + f - + - -. + @@ -389,26 +391,25 @@ X - - + + - - - + + + - - - - - + + + + - + @@ -423,25 +424,25 @@ X - - - -9 - -) - - - - - - - + + + + + + + + + + + + + A -*D +*D - + - + D G E @@ -499,20 +500,21 @@ V - -ELF + +ELF *Fch - - -@ -# - + + +@ +# + - + - - - + + + + @@ -526,28 +528,28 @@ V - - - - - - - - -$ - - - - - - -G + + +8 + + + + + + + + + + +A + += -XgggLggdf!J!K!KZKKKKKKKC..r../KKL1!/9PzX f;j;[hg/[0r<JYKKK..4z 5$ggMZ//? !-!W +XgggLggdf!J!K!KZKKKKKKKC..r../KKL1!/9PzX f;j;[hg/[0r<JYKKK..4z 5$ggMZ//? !-!W A -*D +*D - + E E F @@ -647,17 +649,17 @@ G - -ELF -FHhFhR<R`R,FhS`i`HiG - - - -a -D - + +ELF +FHhFhR<R`R,FhS`i`HiG + + + +a +D + $ - + @@ -670,40 +672,41 @@ FHhFhR<R`R,FhS`i`HiG B - - -" - - - - - -M - -& -# - -9 - - - + + + + + + + + +@ +6 + +1 + + + + + A -*D +*D - + N - -ELF + +ELF R#F -O - -K -. - - - - - +O + +K +. + + + + + + @@ -713,25 +716,28 @@ N B - - - - - - - - - - - - - - + + + + + + + + + + + + + +5 + + + A -*D - +*D + - + F F D @@ -747,11 +753,11 @@ K L - -ELF -ch" - -< + +ELF +ch" + +< @@ -760,42 +766,45 @@ L B - -" - - - -{ - -( - -, - - - - -.$ + +" + + +T + + +` + + + + + +! +) +.$ A -*D - - +*D + + - + R S T -R - -ELF +R + +ELF T!8 B T! Bت - gE5T% - - + gE5T% +9 + + + @@ -804,64 +813,60 @@ T!8 - - - - - - - - - -9 - - - - -> -4 - -.!; .x ; J!!!Yh!G<9.G:tF.;J0/DJ>. + + + + + + + + + + + + + +4 +.!; .x ; J!!!Yh!G<9.G:tF.;J0/DJ>. A -*D - +*D + - + C G H C G H - -ELF + +ELF F Y%:F5PFshB Y' &v OD - *F6MFW - + *F6MFW -K -. - - - +K +. + + + - - - - - - + + + + + + - - - + + + @@ -874,33 +879,38 @@ Y%:F5PFshB - - - - - - - - - -; - - - - + + + + +< + +2 + + + + + +6 + + + + + + fm !! <0!N/-!OgL\OgPK=NX5< <Rx w (MdM[ <//-!NNg]gk1Ir"@0NK=LX7< < !/ J<P!@=!3KMY=Z#0! - = + = A -*D +*D - + - + G I E @@ -957,52 +967,52 @@ N - -ELF -@BF - + +ELF +@BF + B - - - - - - - - - - - - -@ - - -
-< y 5Y + + + + + + + + + + + + + + + + +< y 5Y A -*D - - - +*D + + + - + B B B - -ELF + +ELF FKFFF;F -:/FF - -@ -# - - +:/FF + +@ +# + + @@ -1011,27 +1021,30 @@ FKFFF;F B - - - - - - - - - - -E - - - -C + + +I + + + + + + + + + ++ + + + + + A -*D - - +*D + + - + D D D @@ -1050,11 +1063,11 @@ F J J J -J -ELF - -f -Q2$9 Q0Pu +J +ELF + +f +Q2$9 Q0Pu @@ -1062,29 +1075,31 @@ J B - - - - -5 - - - - - - - - - - + + + + + + +, + +& + + + + + + + + A -*D - +*D + - + D - -ELF + +ELF 74 50_( @@ -1096,19 +1111,19 @@ D B 0\>HFQ2F1) 1 - - + + - + 4 - - + + - -C -b - + +C +b + @@ -1118,11 +1133,11 @@ B -0 - +0 + - - + + | @@ -1149,39 +1164,41 @@ B - - - - -4 - - - - - - -< -D - - - - - - + + + + + + + + + + +E + + + + + + +9 +2 + +0 + ./w. -. +. A -*D +*D - - -/ + + - + _ ` _ @@ -1197,17 +1214,17 @@ g - -ELF + +ELF FFF!F9FBF#F1F FFF!F9FBF#F1F -FFF!F9FBF#F1F - -@ -# - - - +FFF!F9FBF#F1F + +@ +# + + + @@ -1217,34 +1234,31 @@ g - - -! - - - - - - - -G - - - - - -< + + + + + + + + + + +H + + + .M#>gvK ..M#>gvK -..M#>gvK .Pz &z 4K\Y=Z"LZ=gMP)L +..M#>gvK .Pz &z 4K\Y=Z"LZ=gMP)L A -*D +*D - - + + - + C E F @@ -1269,4 +1283,4 @@ G G F M - + diff --git a/ta_export/lib/libpng.a b/ta_export/lib/libpng.a index cf175ba..0ecf789 100644 --- a/ta_export/lib/libpng.a +++ b/ta_export/lib/libpng.a @@ -1,7 +1,7 @@ !<arch> -/ 1508740949 0 0 0 8436 ` - -ELF +/ 1512712347 0 0 0 8436 ` + +ELF CiHiBۀB̿ TT KF!hF{D FiF @@ -117,102 +117,103 @@ Copyright (c) 1996-1997 Andreas Dilger Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. - - -/ - - - + + +/ + + + + - - - - - - - k -8z + + + + + + + k +wz - - - - - - - - + + + + + + + + - - - - - - - - - - - - - -PS -Q~ -Uf -Vf -W -X$ -Zq -[ + + + + + + + + + + + + + +PS +Q~ +Uf +Vf +W +X$ +Zq +[ \$ -^e -_ -aH -bs -c< -e) +^e +_ +aH +bs +c< +e) f$ -g$ - -) +g$ + +) h -j - - +j + + #Py - + - + - - + + $#Py $#Qy#Pu -$#Q0#Py +$#Q0#Py #Q0#Pt - - - - + + + + #Pu #Q0 - - - + + + - + - + #Qt #Qu - - - + + + @@ -223,71 +224,71 @@ $#Q0#Py - - - - - - - - + + + + + + + + + - + - - - - - -) -Y + + + + + +) +Y -z - +z + ) - + -) -) -Y - -) - - +) +) +Y + +) + + - - -& - - - - - - - - - - - - + + +& + + + + + + + + + + + $ - + - - - - - - - -@$ - -|) -!$ - - + + + + + + + +@$ + +|) +!$ + + & @@ -415,28 +416,29 @@ $ R$ - - - - -q -L -+ -c - - -' - -C - - -. -
; -` - - -] - + + + ; + + ++ + + + + + +' + +. +Ϩ + + +; + + + + + .v.=>+=>6u. u.0 !%.YKf .(.O M9<s!M#j`q%11/G%
f !/h1,%1##>xX .%J " @@ -452,14 +454,15 @@ X!1u4z P!Rfjjf(Jc. <mk73?<`y .g n."=!,Y!,K4/y7 ." K#{. #+?. - v.Kft %) 1E < ... + v.Kft %) 1E < ... A -*D +*D - - + + + @@ -476,7 +479,7 @@ X!1u4z P!Rfjjf(Jc. - + @@ -708,10 +711,10 @@ c < S W - + - -ELF + +ELF !QHF !QDf |,4F&HF @@ -721,108 +724,107 @@ W #\ *3+G FF FF -F@ - - - - - - - - - - - - - - - -i - 3 -v - - - - - - - - - - - - - - -{ - - - - - - - - +F@ + + + + + + + + + + + + + + + + +i + 3 +v + + + + + + + + + + + + + + +{ + + + + + + + + - + P - - -Q/ -U -V -W -X -Z" -[ + +Q/ +U +V +W +X +Z" +[ \ -^n -_E -a -b$ -c -e) -f +^n +_E +a +b$ +c +e) +f g - -E -) -hF - - - - - - - - + +E +) +hF + + + + + + - - - - - + + + + + - - - - - - - - - - - - + + + + + + + + + + +F + + % - - + + % - -& - - + +& + + & @@ -848,45 +850,43 @@ hF - - - -y - - - - - - - - - -/ -k -} -L -
S - - - -g -f - + + + r + + + + +_ + + + + +; +zk + +L +R +ӯ + + + + 1s./ z 0# .J v. q , Y l.#*+ j.j h<% <vJ .L0 -.5z4~. !-![ +.5z4~. !-![ A -*D - +*D + - + w w x @@ -936,10 +936,10 @@ v - + - -ELF + +ELF J0FF @FOrF# F@FOrF# F@ @@ -951,123 +951,121 @@ m Hl` k`Kk;`k3`
k+`,l#`F hIr #h` - - - - - - - - + + + + +U + + - - - - + + +B + - - - - - -zw + + + +Lw - - - - - - - - - -$ -RPt - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + +$ +RPt + + + + + + + + + + + + + + + + + + + + + + + Pt - - - + + + Pt - - - - + + + + - - - - - - - - - - + +
+ + + + + + + + + - + - - -$ -% + + +$ +% - - - + + + - - - - + + + - + - + - + - + - + - - - - - - - - - - - -) + + + + + + + + + + + +) - + +- & @@ -1092,39 +1090,35 @@ $ - - -9 - - - -z - - - - -` - - - -} - -Z: - - - - - - -.Z5YA + + + +0 +/ + + + + +i +N +' += +H ++: +4 + + + + +.Z5YA A -*D - +*D + - + c c p @@ -1153,55 +1147,55 @@ s # ( * - + - -ELF + +ELF GF@FpFF I(FyDO0FB(Fp@ - -9, - -] - - -2 - - -2 - - -l - 6 -Ss + +, + + + + + + + + +l + 6 +>s - - - - - - - - - - - - - - - - - - - - + + + + + + + + + +r + + + + + + + + + + + + $Qt -$Q0Pt - -9 - - -# +$Q0Pt + +9 + + +# & @@ -1216,37 +1210,35 @@ $Q0Pt B - -jN - - -k - -b - - - - - -L -o - -h - - -(Q - - - - -R - - + +ON + + + + + + + + + + + + +|h + + +
Q +5 +d + + + J!001i!J -<#/ +<#/ A -*D - +*D +B + @@ -1256,7 +1248,7 @@ J!001i!J - + q o q @@ -1295,10 +1287,10 @@ t - + - -ELF + +ELF -!*-!* ؝-=$- UIB 2B?t F)FOIB @@ -1314,120 +1306,121 @@ t 2B? F)F$IB"B? F)FFKB2љB? F)FB?w F)F ҚI FyDBЗI FyDh1 @ F1 F=єi1+:%i1+ F - - -0 - - - - - - - - -T - -y + + +. + + + + + + + +T + +x - - - - - - - - - - - - - - - - - + + + + + + + +Q + + + +B + + + + + + + - - + + - - - - - - + + + + + + - + - - + + ^r) - - - - - -Y* -~* -O* - + + + + + +Y* +~* +O* + * - + + - + \) - + Rb+ - + + - + + - + (+ - + - + 79, - + d, - + 2, - + F, - + , - + - - + #;- - + f- - + - - + -- - + A- - + <. - + K=. - + h. - -. + +. e. -. - -D/ +. + +D/ ) }/ - + & @@ -1493,40 +1486,43 @@ e. - - - - - -y - -g -p -Bn - -P -[< -Z - - - - - + +Z + + + + + + +l + + +0 +%m +} +N +>; + + + + + + fi,!!=YZ fgYY}fz &?/X !-$,5@F>0:>> t,<-?M0-/M"K[YK0>u>K|!A!.u./3K% --0!-/ /i.. !/$M- n /Xs ^<" /gK0/>?0!!!?+3?=!!:3!=3!=y.t. .3YKg=Y//k>0=^KL X XK9 ? -JM##6z.KA +JM##6z.KA A -*D - +*D + - + @@ -1665,10 +1661,10 @@ JM##6z.KA " - + - -ELF + +ELF O ԧBѻ# @@ -1765,80 +1761,76 @@ D)++ K F1FB FI FyDIyD #3SCB2Ӹ -IyDF -"/ - - - - - +IyDF + +. + + + - - + + - - - - -{ + + + + +{ - - - - - - - - - -% - -9 - - - - - - - - -9 -U -P -Q -U -V -Wg -Xs -Z -[g + + + + + + + + + +% + +9 + + + + + + + + +9 +U +P +Q +U +V +Wg +Xs +Z +[g \s -^ -_ -a -b -c -e4 -fs -gs - - -4 +^ +_ +a +b +c +e4 +fs +gs + +4 h -j -= -= - - - - +j + + + + - - + + - - - + + + " $ %z "?%1$" @@ -1848,82 +1840,82 @@ j " $ %#Q1#Pv " $ %"<%1$" " $ % -x +x - + F - -F -5 -i + +F +5 +i -F - - - - - -v +F + + + + + + z -8 - -* - - - - - - - - - - - - - - - +8 + +* + + + + + + + + + + + + + + U U - - - - + + + + U - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - -4 - + + + + + + + +4 + - - - + + + + & @@ -2011,29 +2003,23 @@ $ - - - - - - - - - - -m - - -N -a: -w -! - - - - - -g + + + + + + + + + += + +M +): + + + + 106=0=>!?." ^J" 2[+X !"!"!"!" J? 3!z #"#t J!"/C=S6QQ @@ -2051,13 +2037,13 @@ J0 < / <0 <0 <0=^0B0B0C0C0B0 -<BNg<Y#+B+o.[+? +<BNg<Y#+B+o.[+? A -*D +*D - + @@ -2076,7 +2062,7 @@ J0 - + @@ -2314,35 +2300,37 @@ G C D H - + - -ELF - - - - - - - - - - -M - -s - - - - - - - - - - - - + +ELF + + + + + + +$ + + + + + +M + +r + + + + + + + + + + + + & @@ -2357,36 +2345,33 @@ H - - - -m -\ - - -o - - - - - -u -H, -_ -ܑ -7 - - - - - - + + + + + + + + + + +U + ++ + +/ +7 + +I + +& + A -*D +*D - + d f @@ -2406,10 +2391,10 @@ f - + - -ELF + +ELF Eђ IyD @@ -2532,58 +2517,53 @@ OHHHOJ xAy8 -0+hҲ - -^. - - - -U - - - - - -w +0+hҲ +;. + + + + + + + + +w - - - - - -` - - - - -2 - - - - - - - -z + + + + + + + + + +2 + + + + + + + +z w -w +w - + -&Pt - - -0 +&Pt + +0 - - - - -U - - -: + + + + + + +: @@ -2595,16 +2575,16 @@ U - - 0 -o> + + 0 +o> - - + + - - - + + + @@ -2619,7 +2599,7 @@ U - + D $ $ @@ -2634,31 +2614,31 @@ E -S +S d-P - - + + - - - - - + + + + + ^Q - -0 -0 - -. -* -WR -2wR -R -R -R -R + +0 +0 + +. +* +WR +2wR +R +R +R +R -S +S & @@ -2900,25 +2880,25 @@ $ . - - - - - - - - - -N -n -3 - -M -9 - - -H - + + + +( + + + + + +. +_ + +L +9 +F +W +@ + + w.&)=~.<" 26tuO<jgSf. $1Kd%$g^gd##_?-/N3#i,2/KL!M%t<[1[h .zXL0 @@ -2937,12 +2917,12 @@ Xi)'#YAYv#[KL=! .x..x .u<x .x ]"0><z.#<$v22v22vJz <]"1?<z.#"v22v22vJz <y,":X,"v-G
XrY//4I/Ihv5y.5yt"/1-<J{.HC],"v-GJv/0y X}J }.X } !0e1=/< .+"//KKz.<*"///KKK0,/Lu.<1>%y. .,#K*<*"////-0y.<kL> -f="="[# +f="="[# A -*D - +*D + - + @@ -3050,10 +3030,10 @@ f="="[# & 6 < - + - -ELF + +ELF K "{D FiF 0-PF*F"F2 AF Fo @@ -3111,57 +3091,59 @@ v M}D M}DR4P$@FFFGp .l1+@ -k!*(@ (* *0 - - -щ - - - - - - - - - -| +k!*(@ (* *0 + +q + + +V + + + + + + + + +h +T{ - - - - - - - - - - + + + + + + + + + + ) -) +) - - - -) -%( - - - - + + + +) +%( + + + + - + - + - + - + @@ -3171,110 +3153,110 @@ M}DR4P$@FFFGp - - - - - + + + + + - - + + - - - - - - - - - - + + + + + + + + + + - -T -I -I - - - - -) - - - + +T +I +I + + + + +) + + + - - - -K -) -0 - - -WX - + + + +K +) +0 + + +WX + x - - - - -Y -SY - + + + + +Y +SY + - - + + Z ;Z - + - + ) - + ) - + ) - + =[ - + - + ) - + ) - - + + - - + + - + - + - -) + +) - + - + <) - + ^g^ - -^ -n^ - + +^ +n^ + & @@ -3410,21 +3392,26 @@ $ + + - - - - - -n -$ - - -Р -9 - - - - + + + +/ + + + + + +e + + + +Š +j9 + + + + + < </?1![rJLJf@*.@2#/.0=3!..u.(1$%>w<Xw< .bf ?!2-4/Z![ X!-? @@ -3441,15 +3428,15 @@ J003!(0L3$##=(0v1!!! .Q>@*2/wXJ .Y0/+C(-4= J22"0#>gh - r.!/M/JKLf@"//6YZ + r.!/M/JKLf@"//6YZ A -*D +*D - + @@ -3473,7 +3460,7 @@ J22"0#>gh - + @@ -3794,10 +3781,10 @@ O $ 2 S - + - -ELF + +ELF "hC `0FFjF# ,
(FQF @@ -3814,90 +3801,91 @@ S zFC'F 8FIF" IyD8@0B F) -74 .5F5F'FkN,,<; - - -. - - - - - - - - - - -Bx +74 .5F5F'FkN,,<; + +. + +& + + + +& + + + + + + +& +1x - - - - - - - - - - -5 - + + + + + + + + + +O +5 + - + 5 - + - + - + - + - + - + - -) + +) - + - - + + - + - - - + + + - + - + - + - + - + - + - + - + - - - + + - + @@ -3905,63 +3893,63 @@ F) - - - + + + - + - + - + - + - + ^4 - - -5 + + +5 ) - + c5 - + ) - + 5 - + - - - + + + 6 - -) + +) &7 - - + + ) - + ) - + d7 - - + + n8 - + x - + - - + + - -^9 -8-9 + +^9 +8-9 CW9 Gv9 @@ -4041,40 +4029,36 @@ Gv9 - - - - -y - - -n -6 - - -l - - -S: - - -; - -E -o + + + + + + + + +v +l + +B +<: + + + + XA x !/////0LhK+. # <v<v. Xz[?!\,/0,"0 # <.Qy ' -<?;!/ +<?;!/ A -*D +*D - + @@ -4104,7 +4088,7 @@ Xz[?!\,/0,"0 # - + @@ -4240,10 +4224,10 @@ Xz[?!\,/0,"0 # ) - + - -ELF + +ELF xC+B@B Bh x<Sx2<B+F"r"rz*< @@ -4254,43 +4238,42 @@ hz@A[BSCJhi)f<eVeeeb% x:AO P@IyD0@ 00 J*jZ:zF&fV6vN.n^>~A!aQ1q I)iY9yE%eU5u
M-m]=}C#cS3sK+k[;{G'gW7wO/o_? JZ*j:zN^.n>~CS#c3sGW'g7wK[+k;{O_/o? -*:JZjz+;K[k{,<L\l|
-=M]m}.>N^n~/?O_opng_set_filler is invalid for low bit depth gray output - -- - - - - - - - - - - -T - 5 -d -7u +*:JZjz+;K[k{,<L\l|
-=M]m}.>N^n~/?O_opng_set_filler is invalid for low bit depth gray output + +, + + + + + + + + + +T + 5 +t - - - - - - + + + + + + - - - - - - + + + +t + + + - - - - - + + + + + d & @@ -4315,36 +4298,35 @@ d - - - - - - - - - - - - - -, -e -ԓ -8 -ɭ -W -, - - + + + +m + + + + + + + +, +( + +38 + +M + + +^ + J#K{##/K` X0 -->- +->- A -*D +*D - + s u @@ -4367,37 +4349,35 @@ u - + - -ELF - - - - - - - - - -) - -M - -s - - - - - - - - - - - - - + +ELF + + + + + + + + + + +M + +r + + + + + + + + + + + + & @@ -4412,38 +4392,30 @@ u - - - - - - -< - - - - -] - - -` - -', -3 - -7 -ƫ - - - - - + + +O + + + + + + + + ++ + +; +7 + + + A -*D +*D - + d @@ -4462,10 +4434,10 @@ d - + - -ELF + +ELF b~(F (F0C B(F6 @@ -4476,58 +4448,52 @@ D)++ F -F* F F( Fi F F F1Fp@p - -1- - - - -% - - +F* F F( Fi F F F1Fp@p +, + + + + - - -% - + + - - - -% -x + + + +Lx - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + - + 0 - -( + +( ) - + - + - - + + @@ -4537,50 +4503,50 @@ F* F F( Fi F F F1Fp@p - - - -v+ -+ + + + +v+ ++ ^+ - -
+ -+ - , -@, -p, - -, -!, -& - -A3- -Fq- -W- -L- -R- -. -69. -1c. -,. - -. + +
+ ++ + , +@, +p, + +, +!, +& - +A3- +Fq- +W- +L- +R- +. +69. +1c. +,. + +. - -`D/ -\_/ -/ -i/ -/ -/ -H0 -c0 -^0 - - -0 - + +`D/ +\_/ +/ +i/ +/ +/ +H0 +c0 +^0 + + +0 + dA1 - + & @@ -4661,40 +4627,42 @@ dA1 - - - - -& - - - - -7 -l -{ -L -=9 -ó - - - -= - + + + +C + + + + + +O + +l +: +>L +8 + + +W + +T +l + . .c.PJ///!O/L`fe&.X # <=j=j==&==>YkX.r. < <=P -X / +X / A -*D +*D - + @@ -4715,7 +4683,7 @@ X / - + @@ -4833,44 +4801,50 @@ X / % - + - -ELF + +ELF !iz6C,C jz*4ؔ1ih+* *+ Q ,Q QQ ,, QB -<,7E00TX*z@1*(jz)h*O - - - - - - - - - -H - - ) -:s +<,7E00TX*z@1*(jz)h*O +~ + + + + + + +" + + + + +H + + ) + +s - - - - - - - - - - - - -; + + + + + + + + + + + + + + +; @@ -4878,11 +4852,11 @@ X / - - - - -! + + + + +! & @@ -4898,42 +4872,36 @@ X / - - - - -} - - -V - - - -N -; -2 -" - -b, - - -7 - - - - -r - - - + + +I + + + +D + + + + + + + +(, +h + +7 +ˬ +/ + + .!=!Kk}X }.AL .v !#*%$*$!50!%0h-BC,"Q*K+ .} .}<9.} 2$91z.&z< .o.X$*&?Q1d ~ >!?z.&z<v..m.<~ >N11c/"+.~.!?z.&z<6!n..o<.O~X ~. ~."Cy. ."!!/! ~ <#!!!///"!" ~ <0Cy. .,#/-+X#!!!!! -.+#9Xy '/
<k +.+#9Xy '/
<k A -*D +*D - + ` a b @@ -4976,10 +4944,10 @@ c - + - -ELF + +ELF ,m= + @@ -5046,34 +5014,28 @@ F#A FIF:F+FDa!ou FIF:F+FB H1DaD1HaF F9F*FDa F9F*FB H1DaD1HaF@ FIF:F+FDa @ FIF:F+FB H1DaD1HaF FIF:F+F Da FIF:F+FBH1DaD1Ha - -m -G- - -\ -. - - - - - - -v + +, + + + + + + + + +v - - - - - - - - - -V - -V - - + + + + + + + + + + @@ -5081,52 +5043,51 @@ V - -V - - + + + - - - + + + - + - -
-$ -( -) - - - -F -F - - - - + +
+$ +( +) + + + +F +F + + + + -cI -0 - -WJ +cI +0 + +WJ x - -.K -IK -nK - - - - + +.K +IK +nK + + + + ^VL - - + + & @@ -5268,27 +5229,24 @@ x - - -v - - -+ - - - -i - -S -l -K -?8 -d - - - - - + + + + + + + + + +m +, +K +7 + + + + + Jv.#/4"/-5 .u. .11u - @@ -5300,14 +5258,14 @@ J J v </>>/Z1>,N,04z ( -.v +.v A -*D +*D - + @@ -5324,7 +5282,7 @@ J - + @@ -5477,6 +5435,6 @@ J & ) 6 - + diff --git a/ta_export/lib/libutee.a b/ta_export/lib/libutee.a index 5031783..8240df8 100644 --- a/ta_export/lib/libutee.a +++ b/ta_export/lib/libutee.a @@ -1,6 +1,6 @@ !<arch> -/ 1508740949 0 0 0 7602 ` - +/ 1512712347 0 0 0 7602 ` + tee_api_property.o/ tee_api_objects.o/ tee_api_operations.o/ @@ -10,51 +10,49 @@ tee_api_watermark.o/ utee_syscalls_a32.o/ default_regular.o/ -/0 1508740946 790 502 100644 81032 ` -ELF +/0 1512712346 7593 7000 100666 80592 ` +ELF ## H K" -H@{DxD - -S +H@{DxD +S } -l - - - +l + + -0 -m +0 +m -}t -7 +7 L}u -Y - +Y + - + -g}u +g}u - + }u - + }u - -}u + +}u }t -B -}u -B}u -%) +B +}u +B}u +%) @@ -76,71 +74,67 @@ B}u - -M* - -N - - -i - - - -2 - - -: - -* - -.##"3KL"2 + +H* + + + + + +T + + +R + + +.##"3KL"2 A -*D - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +*D + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -158,21 +152,20 @@ i - - -ELF + + +ELF HxD - -= -len - + +len + WP4} -B}u +B}u Pw Pw Qw -}u - +}u + @@ -180,13 +173,13 @@ B}u - + Qu - - -"# + + +"# ! @@ -200,28 +193,30 @@ B}u B -;G - - - - - - - - - - -D - - - -k -$K~.K=!.#m !-/J +dG + + + + + + + + +p + + + +E + + +$K~.K=!.#m !-/J A -*D - +*D + + + - + | | | @@ -261,49 +256,51 @@ k - - -ELF - + + +ELF + - + B - - - - -D - -r - - - -7 - - - + + + + + + + + +T + +u + + + A -*D - - -F -G - - -ELF +*D + + + + +C +D + + +ELF - - - - + +> + + N \ p - + 4 1 B @@ -312,130 +309,136 @@ p - - - -* - - -. - -g - - - - + + + + + + +M + + + + +i + ++ + A -*D - - - - - -E -I -D -I -K -H -L -M -H - -ELF -F +*D + + + + + +B +F +A +F +H +E +I +J +E + +ELF +kF B .?:;'< - - - - - - - - - - - + + +! + +Y + + +* + +T + + +G + + + A -*D - - - - -N -P - -ELF - - - +*D + + + + +K +M + +ELF + + + 4 B - - - - - - - - - - - - -+ - -.$#o !/<!@J.i .>ef.n f!K!"!Z!0b :#!"!Z!0X ) :#!"!Y!X + + + + + + + + + +1 + + + + + +.$#o !/<!@J.i .>ef.n f!K!"!Z!0b :#!"!Z!0X ) :#!"!Y!X A -*D - +*D + - + - + ) * - -ELF + +ELF K" H!{DxD F{D FpF
FF!F H LxD K" HA!{D - - - - - - + + + + + - -1 - - - - - - + + + + + + + - - - - + + + + - - + + I @@ -456,33 +459,33 @@ H LxD K" HA!{D B - - - -h -9 - -s -. - - -- -/ + + + + + +a +& + + + +7 +> J/4=
.% <."?/$N" .$ . 565#/P#/./R/Q6/Q=` . -f'{<.> +f'{<.> A -*D +*D - + - + @@ -594,9 +597,9 @@ f'{<.> - - -ELF + + +ELF O K" @@ -608,25 +611,24 @@ K" H@{DxD KB K" H@{DxD K" -HOq{DxD - +HOq{DxD a -b +b buf -x - - - +x + + + -}t - - -}t -$}t - -2}t -<}t -O +}t + + +}t +$}t + +2}t +<}t +O @@ -642,62 +644,63 @@ O B B B - -B - - - -$ -/ - - - - -m - - - + +B + + + + + + + +8 + + + +( + + o ./K"/pJJ20B+!" -l q<J! <.37%/"P!0"01!!0/:0m<O7%/#Z!"1 +l q<J! <.37%/"P!0"01!!0/:0m<O7%/#Z!"1 A -*D - - - - - - -y -| -z -~ - -y - -z - - - - - - - - - - - - - - - - - - - - - - - +*D + + + + + + +v +y +w +{ +| +v + +w +| +} + + +| +} + +| +} + + +| + +| +} + +| +} + +| +} + +| @@ -720,9 +723,9 @@ z - - -ELF + + +ELF K" H\!{DxD K" @@ -735,79 +738,79 @@ H@ K" H@S!{DxD K" -HOq{DxD - -i - - -R - - +HOq{DxD + +i + + +R + + - + -}t +}t }t }t -}t +}t $}u (}u ,}u -1}t +1}t 9}t -;}v +;}v E}t -G}v +G}v r}t u}t x}t -}t - -_}t +}t + +_}t - - - + + + - -}t - -}t - -}t + +}t + +}t + +}t -}t - +}t + }t - + - - + + -}t - + - + D}t - - - + + + -S}t -`}t - -p}t -}t -}t -}t -}t -}t +S}t +`}t + +p}t +}t +}t +}t +}t +}t :; @@ -896,179 +899,179 @@ p}t -" -5 -& - - - - -v -O - - - +"+ + +
+ + +O + + + + +4 +& + . #0/K/!!!!"w#0 1 -. +. A -*D +*D - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +a + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -1084,9 +1087,9 @@ O - - -ELF + + +ELF FFk˱gk1FjB4B(/F:Fkak8c BDckk<[BD 1[BD1F @@ -1120,34 +1123,34 @@ LH"@aq{DxD K" H@q{DxD K" -H@q{DxD - -k -o - - +H@q{DxD + +k +o + +" z$}v $}w -$}y - +$}y + $}u - + -z$}t +z$}t e$}u - + $}u -$}t - - - +$}t + + + $}u @@ -1161,99 +1164,99 @@ e$}u $}t $}u - - + + S$}u - -$}u + +$}u $}v $}v $}v $}v $}w -$}t +$}t $}u -#$}t -C$}t +#$}t +C$}t P$}t S$}u W$}u -`$}u +`$}u -$}u -A$}t - -$}t +$}u +A$}t + +$}t $}t $}u -$}u +$}u $}w $}w $}w $}w -$}t +$}t $}t - - + + )$}t - + `$}t - + l$}w o$}w r$}w -y$}t -$}t -$}t -<$}t -$}t +y$}t +$}t +$}t +<$}t +$}t $}{ $}x $}{ $}{ $}{ -$}t +$}t $}{ $}x . $}{ $}{ $}{ -$}t +$}t $}y $}v $}y $}y $}y -$}t - -p +$}t + +p $}x $}v $}x $}x $}x -+$}t ++$}t =$}{ ?$}v A$}{ D$}{ F$}{ -O$}t +O$}t a$}z c$}v e$}z h$}z j$}z $ -q$}t +q$}t $}y $}v $}y @@ -1264,30 +1267,30 @@ q$}t $}y $}y $}y -$}t -$}t -$}t -$}t -p -m -i -l -q -s -v -w -y - - - - - - -= - -} - - +$}t +$}t +$}t +$}t +n +k +g +j +o +q +t +u +w + + + + + + +. + +{ + + :; @@ -1352,102 +1355,104 @@ y # -# - - - -D - - - -^ - -E - - - - +# + + + + + + + + + + + + + + + X .Z=!!#=%"1 <!!/"'Y0#=?1/=/-!!/#/""PJ7 J -<!!/!!#=-/42;K2!L/"",A +<!!/!!#=-/42;K2!L/"",A A -*D +*D - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + @@ -1455,233 +1460,233 @@ X - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1702,49 +1707,50 @@ X -@ - -ELF +@ + +ELF 3#
p$K"$HY!{DxD h{"K h{"K -FFF'K"'H@{DxD - -bE -@K - - - - - - +FFF'K"'H@{DxD + +E +]K + + +j + + + - + -u - -{ -_ - - - - + + +q{ + +Z +l + + - + -}u -}t - +}u +}t + }t -}u -}t +}u +}t #}t - -#}t - + +#}t + + .?:;'I@B @@ -1759,116 +1765,121 @@ X - -7 - -_ - - -/ - + +J8 + + +! + + += + + + +z + + - + A -*D - - - - - -A - - -{ -| -} -{ -| - -{ -{ -| -{ -| - -{ -| -{ -| - -{ -| -{ -| -{ -| - -{ -| -{ -| -{ -| - -{ -| -{ -| - -{ -{ -| -{ -| - -{ -| -{ -| - -{ -| -{ -| - -{ -{ -| -{ -| - -{ -| -{ -| -{ -| - -{ -| -{ -| - -{ -| -{ -| -{ -| - -{ -| -{ -| -{ -| - -{ -| -{ -| - -{ +*D + + + + + + + +x +y +z +x +y +| +x +x +y +x +y +~ +x +y +x +y + +x +y +x +y +x +y + +x +y +x +y +x +y + +x +y +x +y + +x +x +y +x +y + +x +y +x +y + +x +y +x +y + +x +x +y +x +y + +x +y +x +y +x +y + +x +y +x +y + +x +y +x +y +x +y + +x +y +x +y +x +y + +x +y +x +y + +x @@ -1883,41 +1894,43 @@ A - - - -ELF -PP -PP + + + +ELF +B +PP +PP B - - - - - - - - - - - -) - -% - - + + + + + + + +H + + + + +] +6 +, + + + + A -*D - - - -= -= - - -ELF -E +*D + + +: +: + + +ELF p 3 @@ -1926,20 +1939,20 @@ E u - -x - - - - + +x + + + + - - - -O -z -~@ + + + +O +z +~@ @@ -1950,29 +1963,29 @@ z -J= - - -< - - - -m - -l -7 - - - - +-= +| + + + + + + +
+ + + + + + A -*D +*D - + n o n @@ -2025,15 +2038,15 @@ o - - -ELF -F + + +ELF +F a -b -Q!P1 -QP3 - +b +Q!P1 +QP3 + @@ -2041,25 +2054,22 @@ QP3 B - - - - - - -o - - - -a - - -- -.0#!0,"" zJ&/!E'[.'[;!/2. <w< 4"E1#/03.Dx<(4"71#/02.R^"z<$"#/0 + + + + + + + + + + + +.0#!0,"" zJ&/!E'[.'[;!/2. <w< 4"E1#/03.Dx<(4"71#/02.R^"z<$"#/0 A -*D +*D - + R S U @@ -2068,14 +2078,13 @@ U U U U - - -ELF - -pa -pa -va -pa + + +ELF +pa +pa +va +pa @@ -2084,85 +2093,86 @@ pa B - - - - - - - - - - - -H -[ - + + + + + + + + + + + +Z + + A -*D - - - -F -F -F -F -F - - -ELF -R -D -Q -| -R -D -Q -K +*D + + + +C +C +C +C +C + + +ELF +Y +D +Q +v| +Y +D +Q + B - -j, - - - - -N - - - -r - -l - - - - - + +, + + +p + + + +l + +z + + ++ + +; + + + A -*D - - -F -F - - -ELF -@ -7V -` -@ -7V -` -@ -7V -` -J -ZW +*D + + +C +C + + +ELF +g@ +V +` +g@ +V +` +g@ +V +` +AJ +:W @@ -2172,35 +2182,34 @@ ZW - -, -6 - - - - - - -8 - - - - - + +_, + +4 + + + + + + + + + + A -*D - - -F -F -F -F - - -ELF - -res -res +*D + + +C +C +C +C + + +ELF + +res +res 4 @@ -2208,37 +2217,41 @@ res B - -., - -9 - - - -l - - - - - - - + ++ + + + + + +s + + + + + +4 + +3 + + A -*D - - +*D + + -F -F - - -ELF - +C +C + + +ELF +" +t - + ! B @@ -2247,41 +2260,38 @@ F B - - -^' - & -!W -#qJ - -! - -` - - - - -0 - - - - -| - -b -6 + + +*' + % +!JW +#BJ + +! +; + + + + +] +& + + + + + A -*D - - -H - - -ELF +*D + + +E + + +ELF -Ʌ -- -$J + +9- +I @@ -2289,47 +2299,43 @@ $J B - -, - -& -o - - - - -` - -V - - - - -^ - - - - - -L + ++ + + +Y + + +` + + + + +M + +_ + + + + A -*D - - +*D + + -F +C - - -ELF -A( -A( -A( -A( -A( -YN -_( -( + + +ELF +' +' +' +' +' +M +' +' @@ -2340,42 +2346,42 @@ _( B - -OE - - - - -Z - - - - - - - + +D + + + + + + + + + +# + + + A -*D - - - - +*D + + + -I -I -I -I -I -I +F +F +F +F +F +F - - -ELF + + +ELF - + - + ! @@ -2384,90 +2390,94 @@ I B - -- - - - - - - - -j - - - - - -; -K - + +I- + + + +( + + + +b + + + + + + A -*D - - +*D + + I J I J - - -ELF + + +ELF h -{' +' -4 - -2 - - - - - - - - - +4 + + + + + + + + + + + + + + + +/ + A -*D - +*D + - -ELF -hBhB -( + +ELF +hBhB +( +G B - - -( - - - - - - - - - - - - - - - -@ + + +' + + + + + + + + + + + +1 +> + + A -*D +*D - + 8 8 9 @@ -2479,12 +2489,12 @@ h < - -ELF + +ELF K"(F3!{D - -6 - + +}6 + @@ -2492,22 +2502,22 @@ K"(F3!{D - -O + +O - + - + - + - + - - - + + + & @@ -2519,38 +2529,34 @@ O - - - - -C - - - - - - - - - - -9 - - -_ -d -+ - - - - - + + +r + + + + + + + + + +9 + + +_ + + + + + +& + A -*D - +*D - + g h @@ -2594,10 +2600,10 @@ s - + - -ELF + +ELF H"IKxDyD{D\B
bF@F
hB4B0FJ @@ -2605,14 +2611,14 @@ s hIh h SXFF !F0 B - -b - -= + +b + += W -h - -) +h + +) #p @@ -2627,27 +2633,30 @@ h -B - - - - - - - - - - - - +B + + + + + + + +6 +
+ + + + + +E <L//+$<<@!'x !]0kK-!""/$3!&0u"/ - u J + u J A -*D - +*D + - + ^ _ ` @@ -2656,25 +2665,25 @@ c e c e - -ELF + +ELF `HxDA`hF ` JzDh;`3@h - -_ -- - + +_ +- + - -[9M/ -E - - + +[92/ +E + + - + - + @@ -2686,95 +2695,96 @@ E - - - - - - - - - - - - - - - - -s -> -J>1< /.?fi#xX #/~.f<(.= + + +" + + + + + + +l + + + + + + + +J>1< /.?fi#xX #/~.f<(.= A -*D - - - -k -o -p -q -r -s -t -u -v -w -x -u -y -w -z -{ -| +*D + + + +h +l +m +n +o +p +q +r +s +t +u +r +v +t +w +x +y - - -ELF -PP + + +ELF +PP QQ -PP +PP QP -PQ -PP +PQ +PP QQ -PP +PP B B B -B -$ - - - - - - - -4 - - - +B +$ + + +! + + + +@ + + +' + + + A -*D - - - - - - +*D + + + + + + ELF p A *D -gprof_a32.o/ 1508740946 790 502 100644 618 ` +gprof_a32.o/ 1512712346 7593 7000 100666 618 ` ELF A -*D -ELF +*D +ELF @@ -2787,74 +2797,70 @@ gprof_a32.o/ 1508740946 790 502 100644 618 ` - - - -
-
-
-$
-.
-8
-B
-L
- - - + + + +
+
+
+"
+,
+6
+@
+J
+ + + -* -* -c -, - - - - - -( - - - -2 - - - - - - - - +* +* +^ +, + + + + + +( + + + +2 + + + + + + + + 4 - - - - - - - - -5 - - - -2 - - - + + + + + + + +> + + + + A -*D +*D - - -ELF + + +ELF @@ -2868,64 +2874,64 @@ c - -
-
-'
-1
-;
-E
-O
-Y
-c
-m
-- -7 - + +
+
+%
+/
+9
+C
+M
+W
+a
+k
+( +2 + -* -* - -, - - - - - -( - - - -2 - - - - +* +* + +, + + + + + +( + + + +2 + + + + 4 - - - - -+ - - - - - - - - - - + + + + + + + + + + + + +, +9 + A -*D +*D - - + + diff --git a/ta_export/lib/libutils.a b/ta_export/lib/libutils.a index 53807e9..80d7b0f 100644 --- a/ta_export/lib/libutils.a +++ b/ta_export/lib/libutils.a @@ -1,18 +1,18 @@ !<arch> -/ 1508740949 0 0 0 3136 ` - -j( -j( -l -l -l -l -l -l - - - - +/ 1512712347 0 0 0 3136 ` + +r( +r( +t +t +t +t +t +t + + +4 +4 arm32_aeabi_divmod_a32.o/ arm32_aeabi_divmod.o/ arm32_aeabi_ldivmod_a32.o/ @@ -49,8 +49,8 @@ s_propagateNaNF64UI.o/ s_commonNaNToF32UI.o/ buf_compare_ct.o/ -bget_malloc.o/ 1508740948 790 502 100644 66944 ` -ELF +bget_malloc.o/ 1512712347 7593 7000 100666 67032 ` +ELF [h l2 d@VH@E2UIVKxDyD{DP, @@ -59,41 +59,42 @@ BIKxDyD{D`O BlH@kIlKxDyD{DB3&.gHOrfIgKxDyD{DS,8S<AhB`H@`I`KxDyD{DC`D<D,1FD,9WK{Dh "*I*KxDyD{DN3A F)FF V5p -تBؑBبB3B - - +تBؑBبB3B + + + -0 -q -) -4 -
- +@0 + +]) +4 +
+ - - - + + + - -2 -5 - - - - - - - - + +2 +5 +B + + + + + + + + - + - -: + :; @@ -360,37 +361,40 @@ q - -"W - - - -; - - - -6 - -- - - - - + +"K + + +A +K +- +0 + + +J + + + + + + + + /= .= X#",0!=//=! <<n.{.J=f y /v..10 -.
+.
A -*D - +*D + - + @@ -469,25 +473,26 @@ q - -ELF - - - - - - - - - - - - - -A -*D - - + +ELF + + + + + + + + + + + + + + +A +*D + + @@ -958,6 +963,9 @@ q + + + @@ -1130,118 +1138,117 @@ q - -ELF + +ELF D -"F8F +"F8F Pv Rx -Pw +Pw B - - - - - - - - - -: - - -) - - - -A -*D + + +1 + + + + + + + +: + +A +*D - + 7 8 9 - -ELF + +ELF -(
( (аXBXApG pGa+A8( - +(
( (аXBXApG pGa+A8( + B .?:;'I@B B B -B - - - - - - - - - -+ - - -A -*D - +B + + + + + + + + + + + + +A +*D + - -ELF -* -* + +ELF +^ + +^ 4 B - - - - - - - - - - - - - - - -A -*D - - + + + +& + + + + + + + + + + + + + +A +*D + + " " - -ELF - + +ELF + B - - - - - - - - -* - - - -A -*D - -ELF + + + +$ + + + + + + + + +A +*D + +ELF ڰG Z6:h 8X'O (F OI @@ -1252,10 +1259,10 @@ h`:`9F"F3F""?GE BEBF 3FE !FXF"FF(FE@F!F F - + t i - t + t B @@ -1269,26 +1276,29 @@ h`:`9F"F3F""?GE - -7 -- - - - - -. - - -) - - + +* +
+ + + + + + + + + + + +6 + - + A -*D - +*D + - + 3 4 3 @@ -1334,440 +1344,447 @@ h`:`9F"F3F""?GE - -ELF + +ELF Pv Pt Rt Qv -Pu +Pu B - -' - - - - - - - - - -
-0 - - -A -*D + +' + +3 + + + + + + + + + +, + + + + +A +*D - + 4 5 6 - -ELF - - + +ELF + + B 1 - -' - - -& - - - -; - - - - - - -A -*D + +' + + +, + + + + + + + + +A +*D - + 4 5 6 - -ELF - + +ELF + B - - -- - - - - - - - - - - -A -*D - + + + + + + + + + + + + + + + +A +*D + +E +E - - -ELF - + + +ELF + -& - - - - - - - - - - - - -A -*D - - -ELF - +& + + + + + + + + + + + + + +A +*D +1 + + +ELF + - - - - - - - - - - - -A -*D - - -ELF + + + + + + + + + + + + + + +A +*D + + +ELF - + - - - - - - - -1 - - - - - - - - v .! -A -*D - - - -ELF - + + + + + + + +/ + + + + + + v .! +A +*D + + + +ELF + B - - - - - - - - - - - -A -*D - - - - -ELF -Fx1Bx - - - - - - - - - - - - - -A -*D - - + + + + + + + + + + + +' + + + +A +*D + + + + +ELF +Fx1Bx + + + + + + + + + + + + +A +*D + + - - -ELF - - - - - - - - - - - - - -A -*D - - - -ELF -B - - - -' -
- - - - - - - - - - - - -A -*D - - + + +ELF + ++ + + + + + + + + + + + + + +A +*D + + + +ELF +B + + + + + + + + + + + + + + + +A +*D + + - - -ELF - - - - - -$ - - - - - - - - -A -*D - - -ELF -B -b( - - - - - - - - - - - -A -*D - + + +ELF + + + + +! + + + + + + + +/ + +A +*D + + +ELF +B +h( + + +5 + + +- + + + + + + + +A +*D + - - -ELF + + +ELF B - - - - - - - - - - - - - - - -A -*D - + + + + + + + + + + ++ + + + + +0 +A +*D + - - -ELF - + + +ELF + B - - - - - - - - - - - - -+ - - - -A -*D - - + + + + + + + + + + + + + +A +*D + + - - -ELF + + +ELF -& - -" - - - - - - -% - - - -A -*D - - - - - -ELF - - - - - - - - - - - -% - - - -A -*D - - +& +" + + + + + + + + + + + + +A +*D + + + + +ELF + + + + + + + + + ++ + + + + + + +A +*D + + - - -ELF + + +ELF JOO;K? -&PF +&PF v -L +L & B - -{ - - - - - - -! - - - - -4 - - -A -*D - - + +S + + + + + + + +( + + +A +*D + - + 6 3 4 7 8 9 - + ELF A *D -/26 1508740948 790 502 100644 24912 ` -ELF - - - - - - - - - - - - - - - +/26 1512712347 7593 7000 100666 24996 ` +ELF + + + + + + + + + + + + + + + @@ -1776,29 +1793,27 @@ L B - - - - -
- - - -( - - - - - - -.! /=/N./Z[?./Z[?./ZZK1./Z -A -*D + +# + + + + + + + + + + + +.! /=/N./Z[?./Z[?./ZZK1./Z +A +*D - - + + @@ -1807,14 +1822,14 @@ L ! - + ELF A -*D -ELF - +*D +ELF + i -q +q 4 @@ -1826,78 +1841,83 @@ q - - - - - - - - - - - - + + +( + + + + + + + + + + + + + + <=0#/> -./u//tKK +./u//tKK A -*D - +*D + - - - + + + - -ELF - -.* -.* -4 -" - - - - - - - - - - - -A -*D - - - + +ELF + +Z* +Z* +4 + + + + + + + + + + + + + +A +*D + + + ELF A *D -/119 1508740948 790 502 100644 41472 ` -ELF - - - - - - +/119 1512712347 7593 7000 100666 41560 ` +ELF +y +y +y +y + + - + - + - + - -- + B @@ -1909,20 +1929,20 @@ q - - - - - - - - - - - - -A -*D + +& + + + + +* + + + + + +A +*D @@ -1931,7 +1951,8 @@ q - + +0 @@ -1940,7 +1961,7 @@ q - + % ' ) @@ -2004,158 +2025,161 @@ i - -ELF - + +ELF + a -b +b - -/ - - - -- - - -! - - - - - - -A -*D - - -ELF + +/ + + + +- + + + + + + + +A +*D + + + +ELF ~SED<]RF F)F -EE2FFXF HO{@Op -Oe - +EE2FFXF HO{@Op +Oe + :; B - -& - - - - - - - - - -.u .Y 2//1!//A/A!!/="x!/{/,2@!//00! -A -*D - - - + +&,= + ++ + + + + + +; + + +< + +.u .Y 2//1!//A/A!!/="x!/{/,2@!//00! +A +*D + + + - . . + / 0 -- -ELF -d - - +- +ELF +D + + % -6 +e6 ( B - - - - - - - - - - -: - -A -*D - + + + + + + + + +- + + + + + + +A +*D + , - -ELF - - - + +ELF + + +q % -13 +3 ( B - - - - - - - - - - -
- - - -A -*D + + +. + + + + + + + + + + + + +A +*D - + ( - -ELF - - - -0 + +ELF + + + + % -'3 +3 ( B - - - - - - - - - - - - - - -A -*D + + + + + + + + + + + + +A +*D - + ( - -ELF - -Oe - - + +ELF +Oe + + :; @@ -2163,58 +2187,54 @@ d B - - - - - - - - - - - - -; -A -*D - - - + + + + + + + + + + +A +*D + + + +> , , - . / -0 -ELF - +0 +ELF + a -b +b - -/ - - - - - -
- -2 - - - - - -A -*D - - -ELF + +/ + + + + + + + + + + +A +*D + + + +ELF FI -FhF - +FhF + @@ -2222,186 +2242,178 @@ FhF B - - -1 - -; - - - - - - - - - - -A -*D + + + + + + + + + + + + +A +*D , - -. -ELF - - -* +. +ELF + +# +
% -3 +N3 ( B - - - - - - - - - - - - -A -*D - -) -ELF + + + + + + + + +8 + + + + + +A +*D + + +) +ELF -KXxBpg@BaA - -U -0 - +KXxBpg@BaA + +5 +S + A -~3 - - - +a3 + + + ( B - - - - - - - - -$ - - - -A -*D - + + + + + + + + + + + + +A +*D + * -( -ELF - - -@ - - +( +ELF + + + + + -e3 - ++3 ( B - - - - - - - - - - - - - v.
:u.
! -A -*D - -) -ELF -KXxBp O0O1 - -P - - + + + + +) + + + + + + + + v.
:u.
! +A +*D + +) +ELF +KXxBp O0O1 + + +0 + + - 3 +3 ( B - - - -1 - - - - - - - - - - - - 0t
.,0s
! -A -*D - + + + + + + + + + + + + 0t
.,0s
! +A +*D + ( -* -ELF -yDO - -a +* +ELF +yDO + +a B - -/y - - - - - - - - - - - - - -A -*D - -ELF + +/ + + + + + + + + + +A +*D + +ELF #O #e OyOxIi -#i O sOrCc -OZ - +#i O sOrCc +OZ + :; @@ -2411,123 +2423,125 @@ a B - -&= - - -
-0 - - - -6 - - -8 - - -A -*D + +&1= + + +" +9 + + + + + + + + + +A +*D - . . + / 0 -- -ELF - - -~ +- +ELF + +: +a A -E6 +)6 ( B - - - - -8 - - - - - - - -. -A -*D - + + + + + + + + + + + + +. +A +*D + , - -ELF - -t - - + +ELF + +T +: + A -2 +2 ( B - - - - - - - - - - -( - -A -*D + + +1 + + + + +) +, + + + + + +A +*D - -) -ELF - -] - - - + +) +ELF + += +: + A -2 +2 ( B - - - - - - -
- - - - - - -A -*D + + + + + + + + +' + + + + +A +*D - -) -ELF + +) +ELF C# CO :C I -IOs -Ow +IOs +Ow + :; @@ -2538,465 +2552,461 @@ IOs B - - - - - - - - - - - - -A -*D - - - + + + + + + + + + + + + + + +A +*D + + + , , - . / -0 -ELF -yDO - -a +0 +ELF +yDO + +, +a B - -/w - - - - - - - - - - - - -A -*D - -ELF - - + +/ + + +$ + + + + + + + + +A +*D + +ELF + +9 + B - - - - -2 - - - - - - - - -; -A -*D - + + +% + + + + + + + + +; +A +*D + , - . / - -ELF + +ELF O4D;@4 -KY0xBp6 - - - -) +KY0xBp6 + + +2 + & - + ( B - - - - - - - -+ - - - - -7 - - -A -*D - - + + + +6 + + + + + + + +3 + +A +*D + + + ( -) -ELF +) +ELF
@t 4K -dBeEO4o - -_ -D - +dBeEO4o + +M +g + + A -?3 +03 ( B - - - - - - - -' - -+ - - - - -.
-A -*D - - + + + + + + + + + + + + +.
+A +*D + + + ( ) -( -ELF - K[0xBpTF - -+ - - +( +ELF + K[0xBpTF + + + + ->3 +!3 ( B - - - - -% - - - -2 - - - - - + + + + +3 + + + +6 + + + + .!-vJ .!/I0s.
.+/0! - + A -*D - - +*D + + + ( -) -ELF -
@t - - - +) +ELF +
@t + + +x -)3 +3 ( B - - - - - -( - - - -6 - - - - ht..,#,>s. L! -A -*D - + + + + + + + + + + + + + + + + ht..,#,>s. L! +A +*D + ( ) ( -+ -ELF - -a ++ +ELF + +a B - -/ - - - - - - - -" - - - - -A -*D -9 - + +/ + + + + +( + + + + + + +A +*D + ( - -ELF - - -a + +ELF + + +a B - -/_ - - - - - - - - - - - -.0 -A -*D - + +/o + + +1 + + + + + + + + +.0 +A +*D + ) ' - -ELF - -a + +ELF + + +a B - -/j - - - - - - - - - - - -A -*D - + +/ + + +3 + + +9 + + + + + + +A +*D + ( ) * - -ELF + +ELF K"F+F -RBcC - -a -<Pv +RBcC + +a +<Pv B - -/7 - - - - - - - - -$ - -A -*D -9 - -) -ELF - -a + +/G + + + +) + + + + + + + + +A +*D + +) +ELF + +a B - -/ - - - - - - - - - - -. - -A -*D - + +/ + + + + + + + + + + +A +*D + ( ) - -ELF - -a + +ELF + + + +5 +a B - -/ -1 - - - - - - - - - - - -3 -A -*D - + +/ + + + + + +9 + + + + + + +A +*D + ) ' - -ELF -TМ@ - -a - + +ELF +TМ@ + +a + B - -/ - - -& - - - -1 - - - - -A -*D - + +/ + + +1 + + + + + + + + +A +*D + ( ) * - -ELF - - + +ELF + a =
Q0
Pt -<
Q0
} +<
Q0
} B - -/_ - - -8 - - -! - - -7 - -# - - - -A -*D - + +/o + + + +1 + +' + + + + +8 + +A +*D + ( ) * - -ELF - -!
-( -& -' - -s - + +ELF + +
+( +& +w' + + + -# -7 -Pu +" +Pu ( @@ -3004,47 +3014,47 @@ s B - - - - - - - - - - - - -
-A -*D + + + +# + + + + + + + + +A +*D , - - . -/ -ELF +/ +ELF TOPO:@ ET@ eF"BZ%. -F
FKk2 - -7
-( -& -' - -e - +F
FKk2 +1 + +
+( +& +v' + + + u -" +" @$@& -@$@& +@$@& ( @@ -3068,33 +3078,30 @@ u - - - -. - - - -1 - - -5 -: - - -A -*D + + + ++ + +2 +% + + + + + +A +*D , - - . -/ -ELF -' +/ +ELF uiA -uiB +uiB Pv -0)( +0)( @@ -3108,36 +3115,40 @@ uiB - - - - - - - - - - - - -) -A -*D - + + + + + + + + + + + +# + + + +/ + +A +*D + + + , - - -ELF + +ELF 0 \oGWOV O8Pf E@
@Oq Ao CS -PFYF#FF -uiA +PFYF#FF +uiA @@ -3150,139 +3161,137 @@ uiA - - - - - - - - - - - - - -A -*D + + + + + + + + + + + + + +A +*D , , - -. -ELF - +. +ELF + + z -4 -1 - - - - - - - - - - -3 -A -*D +4 + + + + + + + + + + +A +*D + - + ) ' - -ELF - -z + +ELF + +z 4 B - - - - - - - - - - -1 - -3 -A -*D + + + + + + + + + + + + +A +*D - + ( - -ELF + +ELF 8O + -dCOx!FDD` - - - - - -B -$ -% -" -) - +dCOx!FDD` + +. +t + + + + +$ +% + +L + A -! -Pt + +Pt ( B - - - - - -4 - - -" - - - - - - - - -A -*D - + + + + + + ++ + + + + + + + + + +A +*D + ) * -* -ELF +* +ELF -@P_ - - -@ - - - - -$ -t% - -) -\ +@P_ + + + +U + + +~$ +X% + +L +? A - + ( @@ -3290,435 +3299,429 @@ A B - - - - - - - -! - - - - - - -. -A -*D - - + + + + + + + + + + + + + + + + +A +*D + + ) * -* -ELF +* +ELF - - -) - - - - - - - - - -A -*D - + +0 + + + +" + + + + + + + + + + +A +*D + - -ELF -KB @ - + +ELF +KB @ + B - -) - - - - - - - - - - - -+ - -A -*D - - - -ELF - - - -j + + + + + + + + + + + +A +*D + + + +ELF + + +H B - - - - - - - - - - -A -*D - + + + + ++ + + + + + + + +A +*D +N + ( ) - -ELF -: - -8 + +ELF +: + + +C B - - - - - - - - - - - -A -*D - - - + +* + + + + + + + + + + +A +*D + + + ) ' ' * - -ELF - - - - - - - - - - - -A -*D + +ELF +% + + + + +- + + + + + + + + +A +*D - -ELF - - - - - -3 - - - - - - - - -A -*D + +ELF + + + + + + + + + + +! + + +A +*D - + - -ELF - -+ + +ELF + +3+ B 4 - - - - - - - - -, - - - - - -A -*D + +* + + + + + + +( + + + + + + +A +*D - -ELF - - - + +ELF + + + B ! - -2 - - - - - - - - - - - - - -0 - -A -*D + + + + + + + + + + + +A +*D - -ELF + +ELF 5DO -D EE - - +D EE + a32 a0 -z +z mid 4 - - - -! - - - - - - - - - -A -*D - - -ELF - - -&! - - - - - - - - - - - -A -*D - + + + + + + + + + + + + +A +*D + + +ELF + +&
+ + + + + + + + + + + +! + +A +*D + - + - -ELF - -B - - - - - - -' - - - - -A -*D - - - -ELF - - -6 + +ELF +B + + + + + +# + + + + + +A +*D + + + +ELF +
+ +6 1 B - -&Y - - - - - - - - - -A -*D - -, -ELF -! + +&9 + + + + + + + + + + +A +*D + + +, +ELF +" .?:;'@B B - - - - - - - - - - - -% -A -*D - + + + + + + + + + + + +A +*D + & - -ELF + +ELF - -+ - - - - - - - - - - - - -A -*D - - -ELF -
IO0 @)@P -M + + + + + + + + + + + +A +*D + + +ELF +
IO0 @)@P +x .?:;'@B B - - - -( - -6 - - - - - - - - -A -*D - -& -ELF + + + +( + + + + + + + + +A +*D + +& +ELF O O FO - - - + + + 1 B - -& - - - - - - - - -6 - - -, -A -*D - -, -ELF -@p@@@ + +& + + + + + + + + + + +A +*D + +, +ELF +@p@@@ B - -1 - - - - - - - - - - - -A -*D - - - -ELF + + + + + + + + +" + +2 + + +A +*D + + + +ELF ; ܸ#fи*fи @X.jи0и-@_U 3h6C{j @@ -3739,18 +3742,17 @@ O 8 1YE{ # -;: -G! - - +;: +m! + @ - + - + 4 @@ -3770,24 +3772,23 @@ G! - -" - - - - - - - - - - -% - - -A -*D - + +" + + + + + + + + + + + + +A +*D + 2 3 4 @@ -3799,84 +3800,90 @@ G! 1 5 - -ELF -F - - -PQ + +ELF +F + + +PQ B - -! - - - - - - - - - - - - - -A -*D - + +! + + + + + + + ++ + + + + + + +A +*D + - + . - -ELF - + +ELF + +' -& -! - - - - - - - - - - -A -*D +& +! + + + + + + + + + + + + + +A +*D - - -ELF - + + +ELF + -& - - - - - - - - - - - -A -*D - - -ELF +& + + + + + + + + + + + + +A +*D + + +ELF q1JzD ȿ$,($+U -+, - ++, +5 @@ -3886,7 +3893,7 @@ G! } - + 4 B @@ -3897,24 +3904,24 @@ G! B - - - - - - - - - -6 -E - - -2 -A -*D + + + + + + + +# +2 + + + + + +A +*D - + P Q P @@ -3922,7 +3929,7 @@ P P P R -S +S ELF A *D diff --git a/ta_export/lib/libzlib.a b/ta_export/lib/libzlib.a index 7274573..011e7f5 100644 --- a/ta_export/lib/libzlib.a +++ b/ta_export/lib/libzlib.a @@ -1,11 +1,12 @@ !<arch> -/ 1508740949 0 0 0 1050 ` - -ELF -DD{DwDD8wDA8A3B FOqF(FFOq
FARB;F - -rem - +/ 1512712347 0 0 0 1050 ` + + +ELF +DD{DwDD8wDA8A3B FOqF(FFOq
FARB;F + +rem + 4 B @@ -20,25 +21,24 @@ rem 4 " -[ -3 - -% - - - - -$ - - - - - - - +[ +* + + + + + + + + + + + + + A -*D - +*D + ' ( ( @@ -46,20 +46,20 @@ $ ( ( ( - - -ELF + + +ELF 5lBɻ@l2u\E
Y=ѫ0&: |
<qPA' %hWo fa^)"а=Y
.;\l ұt9Gwҝ≻d>jm
Zjz ' }Dңhi]Wbgeq6lknv+ӉZzJgo߹ホCՎ`~ѡ8ROggW?K6H+
L J6`zA`Ugn1yiFafo%6hRwG"/&U;(Z+j\1е,[d&c윣ju m ?6grW -
TN³9a&g`MGiIwn>JjѮZf@;7SŞϲG0º0S$6к)WTg#.zfJah]+o*7Z- - - - - - +
TN³9a&g`MGiIwn>JjѮZf@;7SŞϲG0º0S$6к)WTg#.zfJah]+o*7Z- + + + + + B .:;'@B B @@ -68,23 +68,26 @@ $ B B - - - - - - - - - - - - + + + + + +& + + + + + + + + +( A -*D - - -ELF +*D + + +ELF T\h3UCa-Opnjko|oeE < PiT l `l 0o9g @@ -115,29 +118,28 @@ Taa FF.l ThhPT3 ThhPTz3hPTca F F)(Fi`i -O c `!ZbBce d:Be - - - - -{ - - - - +O c `!ZbBce d:Be + + +{ + + + + + - - + + - + - - - + + + @@ -145,19 +147,19 @@ FF.l - - + + - + + - + -+Q1 -3 ++Q1 +Q1 -+Qv ++Qv ' @@ -210,18 +212,18 @@ FF.l - -2 -, - -6 - - - - - - - + +2 + + + + + + + +1 + + ! .B)3 f?5w/?O#[KBy. ""=!K"Y=====!<.<.b <;v.= @@ -230,16 +232,16 @@ fXuJ= ."hE!$ J-/wJ=Y0A==!-!"$FYKYKYKh>^[$>L/=@//>=!/u -<M02"-V... +<M02"-V... A -*D +*D - + - + ? ? @ @@ -328,9 +330,9 @@ W - - -ELF + + +ELF C3f(82$nmB C " d5{DIfcmOl;;@[E5GF lL @@ -347,20 +349,21 @@ W - - -& - -# + + +& + +# { - -!Q1 -t + +!Q1 + +t ' @@ -381,48 +384,49 @@ W - - - - - - - - - - - - + + + + + + + + + + + + + . < o . -<!!+/0v!@":!/!A2 +<!!+/0v!@":!/!A2 A -*D - +*D + ? @ @ @ A - - -ELF + + +ELF &hmj 8>P* `xx4@2
->D - - - - -{# - - +>D + + + + +w# + + - + - - + + ' @@ -432,28 +436,24 @@ A - -) - - - - - -% - - - -& - - - - + + + +2 + + + + + + + + A -*D - - - -ELF +*D + + + +ELF @-c0o cbB:={D " @@ -494,28 +494,27 @@ DOs+ - - -( - -E$ + + + +( + +V$ $ - - -$Q1 - - - - - + +$Q1 + + + $Q1 -$Qu +$Qu + ' @@ -621,28 +620,24 @@ $ - -< - - - -- - - - - - - - - + + + + + + + + + + $!!!u/#:# w "!!!*&=/Lo .$ .4 //-5# X0KK>!/K<>-2/?!M!\= -<
.% +<
.% A -*D - +*D + I I I @@ -681,17 +676,17 @@ I - - -ELF + + +ELF <O6 \FFO N7
E p6` q7YE8E, - - - + + + .?:;'I@B @@ -699,25 +694,24 @@ I - - - - - - - - - - - - - - + + + + + + + + + + + + + A -*D - - -ELF +*D + + +ELF ,ܰJ4JJ4J}BO GahL @@ -776,29 +770,28 @@ CaizTO1hO.iaa
:A@21CaSi - - - - - - - -| - + + + + + + + +| + - - - - -# + + + + - + - + ' @@ -889,20 +882,18 @@ CaizTO1hO.iaa
:A@21CaSi 3% - -0 - - - - - - -/ -! - - - - + + + + + + +: + + + + + .G600n .! .@ `XCy '\JX! q.!=g= @@ -910,13 +901,13 @@ CaizTO1hO.iaa
:A@21CaSi X!@ X>!'y<5 <-!Kg"v"&x C=e/;=-/XO - + A -*D - - - - +*D + + + + G @@ -949,64 +940,65 @@ G - - -ELF - - - - + + +ELF + + + + + ' B - - - - - -& - - - - - - - + + + + + + + + + + + A -*D - - +*D + + " # $ $ - - -ELF -err -len -s1 -len + + +ELF +err +len +s1 +len B B B - - - - - - - - - - - + + + + + + + + + ++ + + + A -*D - +*D + diff --git a/ta_export/scripts/pack_arbt.py b/ta_export/scripts/pack_arbt.py new file mode 100755 index 0000000..da1de06 --- a/dev/null +++ b/ta_export/scripts/pack_arbt.py @@ -0,0 +1,186 @@ +#!/usr/bin/env python +# +# Copyright (C) 2016 Amlogic, Inc. All rights reserved. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# + +def get_args(): + from argparse import ArgumentParser + + parser = ArgumentParser() + parser.add_argument('--arb_table', required=True, help='TA antirollback table file') + parser.add_argument('--in', required=True, dest='inf', help='input Secure OS image file') + parser.add_argument('--out', type=str, default='null', help='output Secure OS image file') + return parser.parse_args() + +def ta_antirollback_table_check(infile): + import uuid + + tmp = [] + + try: + f = open(infile, 'r') + lines = f.readlines() + except: + print "Open File: %s fail!" %(infile) + return False + else: + f.close + + for line in lines: + line = line.strip() + if not len(line) or line.startswith('#'): + continue + + uuid_str = "{" + line.split(':')[0].strip() + "}" + try: + ta_uuid = uuid.UUID(uuid_str) + except: + print "Bad format UUID!" + return False + else: + if ta_uuid in tmp: + print "Dumplicate UUID: ", + print ta_uuid + return False + tmp.append(ta_uuid) + + return True + +def ta_antirollback_table_parser(infile, outfile): + import struct + import uuid + import binascii + + count = 0 + + try: + f = open(infile, 'r') + lines = f.readlines() + except: + print "Open File: %s fail!" %(infile) + return 0 + else: + f.close + + try: + f = open(outfile, 'wb+') + except: + print "Open File: %s fail!" %(outfile) + return 0 + + for line in lines: + line = line.strip() + if not len(line) or line.startswith('#'): + continue + + uuid_str = "{" + line.split(':')[0].strip() + "}" + try: + ta_uuid = uuid.UUID(uuid_str) + except: + print "Bad format UUID!" + return 0 + else: + ta_uuid_hex = binascii.hexlify(ta_uuid.bytes_le) + ta_uuid_bin = binascii.a2b_hex(ta_uuid_hex) + + try: + ta_ver_str = line.split(':')[1] + version = int(ta_ver_str.split('.')[0]) + assert version<256 + patchlevel = int(ta_ver_str.split('.')[1]) + assert patchlevel<256 + sublevel = int(ta_ver_str.split('.')[2]) + assert sublevel<256 + except: + print "Bad format version!" + return 0 + else: + ta_ver = struct.pack('<I', version<<16|patchlevel<<8|sublevel) + + f.write(ta_uuid_bin) + f.write(ta_ver) + count += 1 + + f.close() + + return count + +def main(): + import struct + import os + + arb_table_length_max = 32 + tmpfile = "./tmp" + + args = get_args() + if args.out == 'null': + args.out = args.inf + + if not ta_antirollback_table_check(args.arb_table): + print "BAD TA antirollback table format!" + return -1 + + count = ta_antirollback_table_parser(args.arb_table, tmpfile) + if not count: + exit(-1) + if count > arb_table_length_max: + print "TA antirollback table size exceed(max is %d)!" %(arb_table_length_max) + exit(-2) + + try: + f = open(tmpfile, 'rb+') + arb = f.read() + except: + print "Open File: %s fail!" %(tmpfile) + exit(-3) + else: + f.close + os.remove(tmpfile) + + # magic and count + magic = 0x40544154 + hdr = struct.pack('<II', magic, count) + + try: + inf = open(args.inf, 'rb+') + raw = inf.read() + except: + print "Open File: %s fail!" %(args.inf) + exit(-4) + else: + inf.close() + + try: + offset = raw.index("TAT@") + except: + print "Bad format of %s, pack fail" %(args.inf) + exit(-5) + + try: + outf = open(args.out, 'wb+') + outf.write(raw) + outf.seek(offset, 0) + outf.write(hdr) + outf.write(arb) + except: + print "Open File: %s fail!" %(args.outf) + else: + outf.close() + + print 'Packing TA antirollback table...' + print ' Input: arb_table.name = ' + args.arb_table + print ' Input: image.name = ' + args.inf + print ' Output: image.name = ' + args.out + +if __name__ == "__main__": + main() diff --git a/ta_export/scripts/pack_kpub.py b/ta_export/scripts/pack_kpub.py index 7a60df0..fd0a0ab 100755 --- a/ta_export/scripts/pack_kpub.py +++ b/ta_export/scripts/pack_kpub.py @@ -43,28 +43,27 @@ def main(): rek = kf.read() kf.close - # key count + # magic and key count + magic = 0x534F5441 key_count = 2 - key_hdr = struct.pack('<I', key_count) + key_hdr = struct.pack('<II', magic, key_count) key_hdr_len = len(key_hdr) # root sign key - rsk_magic = 0x534F5441 # KEY_MAGIC rsk_type = 0x70004830 # KEY_TYPE rsk_size = (rsk.size() + 1) / 8 - rsk_hdr = struct.pack('<III', \ - rsk_magic, rsk_type, rsk_size) + rsk_hdr = struct.pack('<II', \ + rsk_type, rsk_size) rsk_hdr_len = len(rsk_hdr) # root encrypt key - rek_magic = 0x534F5441 # KEY_MAGIC rek_type = 0x10000110 # KEY_TYPE rek_size = len(rek) - rek_hdr = struct.pack('<III', \ - rek_magic, rek_type, rek_size) + rek_hdr = struct.pack('<II', \ + rek_type, rek_size) rek_hdr_len = len(rek_hdr) inf = open(args.inf, 'rb+') diff --git a/ta_export/scripts/sign_ta.py b/ta_export/scripts/sign_ta.py index c3b0fee..349affe 100755 --- a/ta_export/scripts/sign_ta.py +++ b/ta_export/scripts/sign_ta.py @@ -22,6 +22,7 @@ def get_args(): parser.add_argument('--ta_aes_key', type=str, default='null', help='Name of aes key file') parser.add_argument('--ta_aes_iv', type=str, default='null', help='Name of aes iv file') parser.add_argument('--ta_aes_key_iv_enc', type=str, default='null', help='Name of encryped aes key iv file') + parser.add_argument('--ta_cvn', type=str, default='null', help='TA Current Version Number') parser.add_argument('--in', required=True, dest='inf', help='Name of input file') parser.add_argument('--out', type=str, default='null', help='Name of output file') @@ -63,6 +64,24 @@ def main(): if args.out == 'null': args.out = args.inf + # TA version + if args.ta_cvn == 'null': + ta_cvn = 0 + else: + try: + ta_cvn_str = args.ta_cvn.strip() + version = int(ta_cvn_str.split('.')[0]) + assert version<256 + patchlevel = int(ta_cvn_str.split('.')[1]) + assert patchlevel<256 + sublevel = int(ta_cvn_str.split('.')[2]) + assert sublevel<256 + except: + print "Bad format version!" + return 0 + else: + ta_cvn = version<<16|patchlevel<<8|sublevel + # aes key if args.ta_aes_key == 'null': aes_key_type = 0 @@ -133,10 +152,11 @@ def main(): version = 0x00000204# VERSION img_type = 2 # SHDR_TA_SIGNED algo = 0x70004830 # TEE_ALG_RSASSA_PKCS1_V1_5_SHA256 + arb_cvn = ta_cvn h_key = SHA256.new() shdr = struct.pack('<IIIIIIIIIIIIIIII', \ - magic, version, 0, algo, 0, img_type, img_size, aes_key_type,\ + magic, version, 0, algo, arb_cvn, img_type, img_size, aes_key_type,\ 0, 0, 0, 0, 0, 0, 0, 0) h_elf = SHA256.new() |