From 8cfc77262382d0a0cbd4b9afa8e2806c144d7d86 Mon Sep 17 00:00:00 2001 From: Kamil Sroka Date: Sat, 9 Nov 2019 01:18:41 +0100 Subject: [PATCH] [nrf52840] update nrf_security to 0.9.1 (#4311) --- .../nrf528xx/nrf52840/Makefile.platform.am | 2 +- .../platforms/nrf528xx/nrf52840/README.md | 4 ++-- .../lib/libmbedcrypto_cc310_backend.a | Bin 392386 -> 392354 bytes .../nrf_security/lib/libmbedcrypto_glue.a | Bin 23510 -> 23510 bytes .../lib/libmbedcrypto_glue_cc310.a | Bin 7926 -> 7926 bytes .../lib/libmbedcrypto_glue_vanilla.a | Bin 7992 -> 7992 bytes .../lib/libmbedcrypto_vanilla_backend.a | Bin 10748 -> 10748 bytes .../lib/libmbedtls_base_vanilla.a | Bin 625632 -> 625632 bytes .../nrf_security/lib/libmbedtls_tls_vanilla.a | Bin 364516 -> 364516 bytes .../lib/libmbedtls_x509_vanilla.a | Bin 127796 -> 127796 bytes ..._0.9.0.a => libnrf_cc310_platform_0.9.1.a} | Bin 61822 -> 61794 bytes .../include/nrf_cc310_platform_entropy.h | 2 +- 12 files changed, 4 insertions(+), 4 deletions(-) rename third_party/NordicSemiconductor/libraries/nrf_security/lib/{libnrf_cc310_platform_0.9.0.a => libnrf_cc310_platform_0.9.1.a} (92%) diff --git a/examples/platforms/nrf528xx/nrf52840/Makefile.platform.am b/examples/platforms/nrf528xx/nrf52840/Makefile.platform.am index 9c89b2493..10c191ab2 100644 --- a/examples/platforms/nrf528xx/nrf52840/Makefile.platform.am +++ b/examples/platforms/nrf528xx/nrf52840/Makefile.platform.am @@ -46,7 +46,7 @@ LDADD_COMMON $(top_srcdir)/third_party/NordicSemiconductor/libraries/nrf_security/lib/libmbedtls_tls_vanilla.a \ $(top_srcdir)/third_party/NordicSemiconductor/libraries/nrf_security/lib/libmbedtls_x509_vanilla.a \ $(top_srcdir)/third_party/NordicSemiconductor/libraries/nrf_security/lib/libmbedtls_base_vanilla.a \ - $(top_srcdir)/third_party/NordicSemiconductor/libraries/nrf_security/lib/libnrf_cc310_platform_0.9.0.a \ + $(top_srcdir)/third_party/NordicSemiconductor/libraries/nrf_security/lib/libnrf_cc310_platform_0.9.1.a \ $(NULL) endif diff --git a/examples/platforms/nrf528xx/nrf52840/README.md b/examples/platforms/nrf528xx/nrf52840/README.md index aac2dd095..fbb4b55b6 100644 --- a/examples/platforms/nrf528xx/nrf52840/README.md +++ b/examples/platforms/nrf528xx/nrf52840/README.md @@ -144,7 +144,7 @@ When building an external application with OpenThread libraries and CryptoCell 3 - `third_party/NordicSemiconductor/libraries/nrf_security/lib/libmbedtls_tls_vanilla.a` - `third_party/NordicSemiconductor/libraries/nrf_security/lib/libmbedtls_x509_vanilla.a` - `third_party/NordicSemiconductor/libraries/nrf_security/lib/libmbedtls_base_vanilla.a` - - `third_party/NordicSemiconductor/libraries/nrf_security/lib/libnrf_cc310_platform_0.9.0.a` + - `third_party/NordicSemiconductor/libraries/nrf_security/lib/libnrf_cc310_platform_0.9.1.a` - Include directories: - `third_party/NordicSemiconductor/libraries/nrf_security/mbedtls_platform_config` - `third_party/NordicSemiconductor/libraries/nrf_security/include` @@ -209,7 +209,7 @@ When building an external application that uses RTOS with OpenThread libraries a - `third_party/NordicSemiconductor/libraries/nrf_security/lib/libmbedtls_tls_vanilla.a` - `third_party/NordicSemiconductor/libraries/nrf_security/lib/libmbedtls_x509_vanilla.a` - `third_party/NordicSemiconductor/libraries/nrf_security/lib/libmbedtls_base_vanilla.a` - - `third_party/NordicSemiconductor/libraries/nrf_security/lib/libnrf_cc310_platform_0.9.0.a` + - `third_party/NordicSemiconductor/libraries/nrf_security/lib/libnrf_cc310_platform_0.9.1.a` - Include directories: - `third_party/NordicSemiconductor/libraries/nrf_security/mbedtls_platform_config` - `third_party/NordicSemiconductor/libraries/nrf_security/include` diff --git a/third_party/NordicSemiconductor/libraries/nrf_security/lib/libmbedcrypto_cc310_backend.a b/third_party/NordicSemiconductor/libraries/nrf_security/lib/libmbedcrypto_cc310_backend.a index d2eb2a6d8672e896f7db970a2826d8d988c218d2..8ce36c01e138e7c78a5b73351f4f2af5a5943d36 100644 GIT binary patch delta 4380 zcmbuB4Nw)=6@bsVdlz^F;X%;%1bMNBlt2afNsXYX2vw_uLd6(_79tT+QIw$4NizB} zpk$I5W84XwnU2^($E0c!<)vN*TE`N`7^2aPT2rHlNSY}#MJc{zjN$}4opi)OP=-k<8Mvd>YfQu%qea3r(!dJ$=W>t<5AlO za6h>3XYyEc`(1$X4S-3ZW0PJ4=!4r=_`lCN!GIb?e1UsqT`J&sG}HmUp5WGg4BjaL z)Y#Pr*pg+?x(u*`KX=_DJ?8;UhK>Si+!_{;z&;Q}b_0oY^PiY3e-ev;m}Kk);>+SB zAW!#LRJ;h}esGUB`3(Z(`|x`nl*R`QW7ByaNcYbz&hbri+}aPheAr^}C=iX|2q3o> zgA~vVQb^6%Bou)(77H3d%I9OFSvd(Ljmi;&jU#T5HgaJs_Va~J+A2Z18=uyKG@1)M zh|2^1TaMLdj!G{LLdA=47kM!i{Lctw6$jnsrtrm>`>GS~5F8MM2_9#TbWN1E!8Oa}E`c@~- zf@$`fI5+$z=55WYAD~j!fJDCiqIIP1TBa@e&(#ZYYV|@-g$Vuiz0EHiTWva_Er1HCY+4(~{N3%D^10hGro8?$#NH!?<8+`z3xolqA z>`fePb`U25CcsXwY|IY>{=F8LX8%6NS}hzp)w%DZ!)BO22p5z~vnJU}tIDgAo`u*A z%Du3fH&z4u4F_c%3kKY7fPyzD5dJAa0eN^qeaS1On0 zIMkwYV#oKC?7}$wwV^nOc08acT(L$|gulR@*f^PnGiXz;6vio0g-$hTH=lb%Nn0L= z8`Q8R)S>=k3!i*Usb3za1TS}npBy#ylyaKezO1ja?3iT7FO`Rj;&6+;P6$tk?>fE8 z`l2{xL9LUdpz=&@hV5kn;N%`BD-UHy%Uu${W%a{I5{p!sQylNtgIkKN9#r#JN|QZb zmmUi+O|&NTd{z-0+)C3_>HT|w9uS5J!|?G%{Mi?`5o+ZJXZSkHY-lTqz6nJ zwj&+?7%rsD9GnnlN~--5I@y{c{5H~8thsXRMc$CU9N z(K_r2R=NovL0dujv$^F}*;Uo*_RW~dPHe`v1Myeto#hy-zS4jRrf)smlMVQq2$wzc zIwnpq#~V9kC)@uHmdk#cO#ul%TP;DqDqbEokeXAlh)E zs1__)zano%d3El>1t~23DkgFp^|^mz9v)YjcH5=~4q*#FUwk3#Qcn(9r95;4trs#& zzKvhoL=?P24we=~x&#dfg&WRMEW zN>{lTlbxfiW)zamq9yclcUO?rKQu$obHfVWAcw71@9n2fmfTEU6@juNACO#O(0G+N z+4PUeQ-Q*ZzWVNN@;5O>-5p`G}84yN?u9Eqd6YU(Uz3p-W+dfRL`n?j^ zZ*P$dkxKo*3CaDV&r;XzSQ)fFyJ9v z^j|nXfyb)CNc zhq1KGf3X>9bkH*D&88)+ZVr7~RE%-epM<391|vB>28QZT!T+dgihWe)Os(u5zx;Yw;Q#;t delta 4324 zcmbuB4Nw)=6@bsZdlw#v@c0?tLXfDXA{Y%pq=8zoVxUTe7c~Ar2F9n-29-R~Vzm=r zYFej)X{g(}nPfyGlVn0N26-meXxb2JwIS+gH8GR;gG$VlN&M|FMh*7t?%TT$3e}7Y z-@SXzJ@@aNbML+#-?}=!bu~T^`bc(mPDb{le;WOJUnxL2QrXs@s+RyPYB~UhqOK3% ze(>E-=fV1R=K@LF0c1k@;N;W+3BngF{NMMYF+g<6aDsc~>0%&5v7re_LxE2(OkP|I zL}zOskmd@Lwpt+j@O}S1a;6uE#r2Cobo$~2)ImWI*8?=phs6j_f5xu`YLVLsG?g9(%Jdi;B?#s+F4_B5;u+b^n#u{V{_>uP@UdPpx;%4 z6w(1w#OA?CUklP;6ub+P8`}o5I2$CLrHLkWi9V3(P#BE2aAJ!+^&s7ikG6m`kW;vb z^Wpuu(gTtJ<1gJQHDHcd_-02_=wIQd=hvCq!HpmgJIEUwN3HUL=~ z4F=8wAP1B9FOcsY-}f=TyKU3wAP>cxnIQXak>=b zd!ZNYdQ0>3E8Pp1&8T^56_~Gc{E49_$6Mbct?N2b{LV>f;g-ffHE$NP1a)d&yuT&? z3rQ&4<#YY#3#DKSmtXq%5nIt-aMCZ_s>E=f8;Eq8ViY#04=+&?9NXfRx+$O zaXQI?k+C;OW%LbF^6E5pRC({!X;~jUT98qoPP=yO%KP3zXMwj6KA-?m1o2lq?j|A8 zI9e8HM}H!vHy>mYhplm(5eJg_Y>46EN;U88j*1ExA(;(0u3uo20 z=ZvH&i`64@KFLi^GOd%72h^j?6(?h@KglV9dQ6}m>+gEvCegwV$Z^_~>5@~uG+)tj zmry6!ucppVC9BjDEDx!xvHZ2V4a*bi!TG7`9~UTEu-(E9G2-xcK$F5FZZndhd zm5SfpJ>xM;!MCT8--@Aid!9FeOc-XhYmFaCF5ZwsHb)CpdpC3O9~Y6{NTJ%kle&0G z8R?DduUhmpxlYMcKChOfGjfctuOqD?(W5Zd_zxb;2R%Ke@cd`U4@vl}CCl@dd)>uJ4iuEGTv)PjiFa0E!6P^oPq<9ROT?iS zULz&ssHW*vqxRJ`(oCX_$;dyox380QDP> zpQnGba~(%lxN`^HC>F}mYL;!#b%`oG;_vi{P%(_LB3~!{RP-@6xAG*d5Z@VdCzsFB z9%00BsK>-8`gzvc_sZ$Krk7q0z7<^jH{a1*;Y-|yiyse>+U&gd4wqfLIYR0jA=YH5 z8q%fYBum9x3#7k_Q3AJtTWX3G1{sT`)BPtNw-kTeS?!u}2p_7GHfCEYW1q+0l3E7b zGB59uE;%hDju+4A7)vro*>p-;VXxnC-~;ES4iPNVUAL}CGlj~SYtbDkQS8C+#LEsw z`!9N5B+ImI+~o;;xWcB3>jlSAxHpLrJMoP9Ur1pdF`0QuI481if~@jc1@}y5^F+*e zdp>(dNE%8N{PUt915>qS_W!6#%Y#(B)iYoi4?j}PX4@m9LABa;0!_~jKsWh@5IQi9NM%-yF%!g2RO`By?RcXQ#8?CI|k&uRIB PVy(rq diff --git a/third_party/NordicSemiconductor/libraries/nrf_security/lib/libmbedcrypto_glue.a b/third_party/NordicSemiconductor/libraries/nrf_security/lib/libmbedcrypto_glue.a index 78ea6ad9e7926285b762c5fa9e49de80392293da..4b50d30333da0aada140ccdd1feb0246c8692a2c 100644 GIT binary patch delta 33 jcmcb%o$=as#tG8w#)ifQ7UmWkl~yyt*qg5~GDQIZyLp|NetN>Zj4f+58 delta 46 pcmexn`^|QOG`pdhnWcfb!9=CiFy`a}NwJNu>Lp|NetN>a74fg;5 diff --git a/third_party/NordicSemiconductor/libraries/nrf_security/lib/libmbedcrypto_glue_vanilla.a b/third_party/NordicSemiconductor/libraries/nrf_security/lib/libmbedcrypto_glue_vanilla.a index 6926aee0d3c5744402c4235fe81ac7c46cacc1b1..fdf857e90f0d62d4b3a2dda868e8a40807f1e032 100644 GIT binary patch delta 42 lcmdmCx5I9NG`q2(v4MrT#YCl(Fy_WjJ0)Q3&6_0KSOFNJ4DbK| delta 42 lcmdmCx5I9NG`pdhnWcfb!9=B#Fy_WjJ0)Q3&6_0KSOFN=4DA2_ diff --git a/third_party/NordicSemiconductor/libraries/nrf_security/lib/libmbedcrypto_vanilla_backend.a b/third_party/NordicSemiconductor/libraries/nrf_security/lib/libmbedcrypto_vanilla_backend.a index 216a0e000b36ce35225df94a2b35443b735f6708..ebbdcd4155891a62af147a55b1bcfa9067f652d3 100644 GIT binary patch delta 48 scmewp{3m#VG`q2(v4MrT`9`HoCK!A2J~gq;E139IU;>->so60D0B$G^*#H0l delta 48 scmewp{3m#VG`pdhnWcf5#YUw}CK!A2J~gq;E139IU;>->so60D0B}(a?f?J) diff --git a/third_party/NordicSemiconductor/libraries/nrf_security/lib/libmbedtls_base_vanilla.a b/third_party/NordicSemiconductor/libraries/nrf_security/lib/libmbedtls_base_vanilla.a index 53ba086e363b0d4155f1c0699924c286bc28b948..377cea9737a2814de73c2b915c6c5983019ab8a9 100644 GIT binary patch delta 893 zcmaDbUG2eiwF%Pf#)ifQ7UmWkl>#MU?CEv$I3zbumh@qViA?r$5ZnAm;juVOVEVb2 ztVx?aEdR5?L^k_5taOBP{xu#=hH=1}A3Xi9h%C_lhn;czA9kkor7%&jt<&Z0*gUt3 z)G@Kc?M4!BX+;tT8M}Q&50m#Cma96QTKE|~J^d3!j-x4#u+IkyH?=;l6_Yy2=Fu*GN2vCQX%iGV`m!}g@REQN4` zkz8%_gazRnpl0#yiLY4}X}~rAGhvt9t}Mcu;SUo6dt_xY>$EVq2uNG(F4io4n8`~q@&0vcsTxXx( z3=@I4&Oe$1#dYG__as2BP%S7LHQ5((ORwe+s}&&O6Jo7M@=~%9FOYyyQUS0C3bU{J_Cv2-5- delta 893 zcmaDbUG2eiwF%PfhGu4#2IdAEl>#LpY%|O0b@MnRH&2%IVTXxK_Hz*1{72!jI80#r zxtFX-n>{T5v%y3*`#G$1gmeBi9!-XEz?vUC{jUfSFgE}RwEtme-2R81X?-b78Q9k8 z@^);V+ePY_*x_~~iMO;OiGxhpzM_Z8dk)Nm$^RO~w+m`As};jUw%g5NE`&Q|`@A2l zMvPluu;{~GyVYn*W)wOKw*dVa@P|34uMbGMRN+7+eITEp``c zmOe~mJJ8NVcp!niX2Q5V>l3Rk+zB8tgbI+wTV>fE*}@C}yKp-&yaV8-fPL2E%I4mK zq6icz*SDX##8wG68|=cwn{3mfVJf!+z0nKz0mA#!f!^=i-qgyDq#5KH$sYD7Z}lg|lAOs}hE^4dH{f*)B_a`S2V z5M%+dW*hbGHtLM!%t(60w_ns^yyS=^BG!H&hjIIX9H#kvNTL$kfp$c~jcdQx#0135 U+wV28EIf~-PJH{^AXax<0D|2+CIA2c delta 191 zcmaDdU+l?zu?f=bhGu4#2Ihtvm6i%X*k+cS&k3Zm!#I=A2}n$@t7h`rJV$~bSyXcK zY55SSfVlxsnOL)p`gR+2#&Tw;p&&u=?H9EeFF7KKh_xTcVcdQohiN_^vK`xjc0|IA cGi<-t#0135+wV28EIf~-TYUT6AXax<0FbLYJ^%m! diff --git a/third_party/NordicSemiconductor/libraries/nrf_security/lib/libmbedtls_x509_vanilla.a b/third_party/NordicSemiconductor/libraries/nrf_security/lib/libmbedtls_x509_vanilla.a index 0ff47d59052859a4b5d3cccb41bb3ca0160bf4ff..77b0385278ed30c0109b1b74074f7c5a24378527 100644 GIT binary patch delta 182 zcmdn;jD5>9_6gGL#)ifQ7UmWkmG&~j*pua^h;9DEEUb(qAhB6bJ&+wqKy33Iz3Nn$ zz-GBAg~+lJo7c@oRo*PKc)QGE#>18{EkIi&w*R}sh@wn#d;Sx~7-W;cA}WmA`QI|C GvH<`qOEu{L delta 182 zcmdn;jD5>9_6gGLhGu4#2418{EkIi&w*R}sh@wn#d;Sx~7-W;cA}WmA`QI|C GvH<`_#x^ei diff --git a/third_party/NordicSemiconductor/libraries/nrf_security/lib/libnrf_cc310_platform_0.9.0.a b/third_party/NordicSemiconductor/libraries/nrf_security/lib/libnrf_cc310_platform_0.9.1.a similarity index 92% rename from third_party/NordicSemiconductor/libraries/nrf_security/lib/libnrf_cc310_platform_0.9.0.a rename to third_party/NordicSemiconductor/libraries/nrf_security/lib/libnrf_cc310_platform_0.9.1.a index 00b9ce193bd773212ae72daeae12ff3ddad9f571..7ca2e31101b2b43a198a7293c2b27b4eb954960f 100644 GIT binary patch delta 1344 zcmah|Z%9*76hC+W{Ik++Mw?rW^(-c3>os&W3I7b)W+F-X$pjs0ggRIWeUY4GehSn) z-@^RRhX_F^ZyzedMv26Pv~OiWOAx}KKT;%u(tYpky~l>pfgk7n&iUPY&%N)QomK7X zs&>qg&grun7&+erC^6*xc7)u@{fss*hWqRXWAsy=1p>LI54!X(+1YHn%{3{wr>2W z$>X2LLc|pd(eu?!1b2KMOx0|}&1@&az%y7t2Zz#JCvrV_nU~GPKKu-VUdrb{gPdeu z$X{Sk^Lfyf!HvLrLoue0!}YWvmw5~9h4D0(4k(2Cid;HiIwNle)*p%q1tb~N0*c_H zl9kp&M@L&M(%Tm8ih4SL9L8mB3H}MtDyDNfB(d{gmUl@Pb}}!Rvn1`0q`e#PN`s#| z>k@?U_|sQpW-Ta|A^k9bPF!+X(H=CB2Y4*#CYMFt&GUSY^d{!hS%n1^5iuWakWD*lX7kbVc^znR;_ZZ}!w@_2yz@(x51W?x)T9 zO81Km|Dm;8r_M_;?Tiq0UWE1@igKA-yz289l|5q)ojG3p^9y=8D;C(6{HBhVuzSzaoHDbNU%9JRCr)E(QoauzUHfkQ3kUH# A5C8xG delta 1330 zcmai!T}V@57{{OEK3px^rsC#iLx(i`P-jj}31>6UT%a2vU5MZZT|^-XhSZH4T|^fm z%clrL>>|8K5R11PLsDpUF{&kmgq00Zx+u)d3olB0&e_hH6QvjaJm>d3|M%;h_dQEX zimfF@$dX>>aF&->Iq%x00yO|$Qqyp%T5bVIY8waWJhivFF91mD9Rk=({fhwmDX?Eb z$cF}#8o3DYKTUK2?A9y~5IzqODFKMmMt8{q3ppSw_8efPPZHbU{%RBNsvI4iMy5MF zct}nJTTE=)d_*H9Sj=|zpakgeHZoUnrBY7BY&mSG?2|%HkOO^Q7mHLVk}jd!_v&}a z#B8kz>xz&28`U5*l~W8wV1`^6f4cUp-m3L!o6YCAYRJ#pb312F z^9~-}>vL<qMT$b5KHHA^0l1vPTDVCpHS%{skVqI%L&}5!pk-=N2N-h^8XdM=DQ-p*aeXuc7fc|G?A+lg<8JWBilCwV*e zc}%!U^clB#yDCV-YVcQO7S?+7+%oz+cJ7YYW03d0$>@?Z?>f=RjBbE+j$e`) zHbvBug9Td(FF9Dp#FtD7$ezPmXTPP~Bi0^%t&$zWy6YpW^2)>+e9;%Fm-EEJZFz;_W}>lC Rr8@p+#L~`OHn1|U{Rb(9Kh*#L diff --git a/third_party/NordicSemiconductor/libraries/nrf_security/nrf_cc310_plat/include/nrf_cc310_platform_entropy.h b/third_party/NordicSemiconductor/libraries/nrf_security/nrf_cc310_plat/include/nrf_cc310_platform_entropy.h index 76b41fad1..07271104c 100644 --- a/third_party/NordicSemiconductor/libraries/nrf_security/nrf_cc310_plat/include/nrf_cc310_platform_entropy.h +++ b/third_party/NordicSemiconductor/libraries/nrf_security/nrf_cc310_plat/include/nrf_cc310_platform_entropy.h @@ -27,7 +27,7 @@ extern "C" -/* @brief Function to generate entropy using Arm CryptoCell CC310 +/**@brief Function to generate entropy using Arm CryptoCell CC310 * * This API corresponds to mbedtls_hardware_poll. It provides TRNG using * the Arm CC310 hardware accelerator.