From a8f69cdf8fdaf7ebfeca77045d246f7a80d266ef Mon Sep 17 00:00:00 2001 From: Ylian Saint-Hilaire Date: Thu, 27 Jun 2019 16:14:14 -0700 Subject: [PATCH] MeshCMD fixes. --- agents/MeshCmd-signed.exe | Bin 5783232 -> 5783392 bytes agents/MeshCmd64-signed.exe | Bin 5365952 -> 5366112 bytes agents/meshcmd.js | 8 +++++--- agents/meshcmd.min.js | 8 +++++--- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/agents/MeshCmd-signed.exe b/agents/MeshCmd-signed.exe index 8523f986c8ba4d4fc3752aeb54112ba78d99fd37..ba7af211c31f074512e6c1a794bcac2a2c475929 100644 GIT binary patch delta 1136 zcmX}iZBUX28~|`0LNMx2mzrW41@z3*bO4Un+78i$>!E#vmyZg@hvEoo{~`2%`iTj3QXd&XJ=M2{QKn&X z2=zc}w@oNuf<%x6l0gbc1!;f<*dQHnKnBB4W$q~!bFVY%vf*{3*&wr7Ph z$a7-iU&;Kf>uFvUX}y~oZeQhqnEm;-d2ssO8hu0ex71%#&aCE~6;nilIj; z`eXfk`Z%5Ve?ky@46X*j;6-H*FHTih9f=Y4?0 zvNyx^I3>_~vDKN`{Ic|m=P9%R=~Q&o6We07dG_Y4_~d0v>|e6$rp-qr$-OZnU&W1@ehV+jo*Fx T;Yqi2S$uPteEyI(27~z*$ZG!k delta 1157 zcmX}ieNfT|9LI5fh$sp}5g+hjp#};~1$;aZSxr^OLCf{ zwWXD}%!~73rTB33A!X-EMbvXEO)Z_9iEGMEO0)KDf9#Lf-TUtInR_#b?%kS0Hy0oV zrEUkSiV+^dD(*w1eaJg#U;r?{5MY53Fa|ha0!#rO5WstY2+V*vAOQ$_dPHNY*${8!Z~u7}*TjcX>IQgMMl2mm|~2!cQ`2mzsh55hn=*adcj2(Sl4 z0s)8u(O@sw2V%f}5DVhK0q`M+S5B!C7LpMgd9SOmki{RB*r)O>gLYyQp9>?ASMIwO z7RpRemII3AbmNC(>&3SI^v+Ats*P?DW<<3AnlhUqB#>CTd#l@qd+iBv6XEj5%m1v( zNO)CfMr?P}ZH8!YiZ)|J{HlR=OK2JMyRk5t(4~<#`U{Km+X8Mhcn3Nw93-t196QO- zPR9U$n$A$4G`T|}GpI7Ac8Kb(q+S}gb7+#4iP+x##G{J>%5r+x*`O9_V)l`eMk3xm zd#R~8d}`y4*HK*3sITh$Vd;a*GkagP3|U-Z>yFqIZP2<0#_(r;Y>A@e4UUb>lxP}q z3Oabl36A-S+G{TxNoQ{QjxZG~27_+;^k-`g&LzJP`A#L`nxMhL$)6=IKh%ueKi6(m z`j$o3x_RBGsMbtBS)VrCU1Pi_+OPg}-dgYpB3W#dHmWcY9Gp!qVv^Lof(=($WhdIH z2fswc3FB5(&#Kx^^?%;Sj3g)g_2l8{yNLqN$1do5OgWn;e38%Ma5#rp&R86?G@?{b zKyVng6^8s>!`ZY4p2<>=wz@}VYLogu(k9|rg#S+nVu->NA*j3Ghm6m62!`ph3mOsQ z0=+#~GOgjI%tk52i{YOkAI;wi4*ONFGGE8XHVyygttXrI=yUGuyWNSqnDNEXW^2Dw zKH>7sL(Sht*9B^Q+%?Uz*G4)^S|eV|h{%g!xB7_>|KxBrv;6r=KtvB;rq;ykHqmIB zaI?N${YjztYVt8NMQu$WiBhBv)qQ+D;QILFOXRgRXF+UBV^#>wU7uFWR#UnPa{tUd z*;%>twSJ|h2$<$+S qI?Husxd)_+P9*J@6PYIW|6YxV>wdw*RDP3J8#aeMH`;|lq5cJG4-7#7 diff --git a/agents/MeshCmd64-signed.exe b/agents/MeshCmd64-signed.exe index 5c5f1c223380fb5721336577e45259cf1c88718b..28381079c906c9205b9372abafabd346f0834f0f 100644 GIT binary patch delta 1112 zcmX}idr;B`8~|{B2ns3S105!TqLvdZke~P>NyVbTSKE!kG#{zmdGmECojou!$ueVM z{pRDGGtqL+S<`S!%~nQer`f6NmZfKAdYW$DnoHB|yMOk_=f6+yeG`827ZbkiID#i4 z`T`^hd3x52XwArf@W28P01;RMD?kEdunAZL8$bb6Km)eG4%h<+KnIS%348(=z!_`? zE`SNP02W{aSKtOXz#Vu1Pp}niGnx^v;05e7$CaX`EqZ}Zfj8g+9`FI%!4AL&0^n<; zEeaivV0AK-gt3*V&KR^GrO>hHjU8l+os6omSLvuVmUt9(!n)JYVB=^qN=LLC=_v36 zBH#}KKp+SL!9Walf)F49yFe%i1K~glBEW922gtx)un)+A0z`r+5Dj9C8|krb$;chd zwLkU@fBwdYf^5NM<*1T5sm*%R+jt>JuXir_x$oAYV;n|j$6AG$wl(}?V`eugDen+E zXB_U2rP%Y!-lJ7svZV;0@E6a@_T-B`Z_3+!#^G(Kw8*Lu-&6JDjXL)f_PeycHG}nI z|JH*k81-fBSq)z>RX(xyop6RcyWTTB{aM-vMk(vw#o%= z>dYV#S@@En@J+&ymtT%E`DU&g_ldIH!cg6k+SRZ5yET_l?o;yZAVW2!duNEJ{i@^k zCs*jisa}7*7GDdv)ZAS2{}z==RV&=Bc3e?7Eih*`69E{AtQTs$G- zQ~pl~Lc|e@5FAZAWAEo3)mW%EC^J7Au5Gz{XW8YayX?y8xPy{n-v{3H(h+qfWgnAt zexN!PNglhDdD4HOt*xCm=GwV8q%;& zsnnLSaJf;8vaiIi5BL_f6Dyjon&NA(FrQgvtLff{CsY}7wVcCU(L0>xesMFbBLPQ! z93lw$=Ie2rd=}%$rAOk8`_#EcTW8KgR74mR_UBi3^(nHi>b_5ulInZaE@5q!OM&&P zwGTa*aXf>HP&3qQ7=A8_-xbGL4Z3%V7@E@hheu`LQ~LGu(L&B3QG?TQsM`z6F4&m| Ma5H~e<8Zit0Ya4OLjV8( delta 1133 zcmX}ieK6Yx9LMqevdAO^Aq1iO#Y0M~^-DywA?*-D2@7rNVXKFjOwW*1HZ`}9bjj$n z`Y;(zTWhDSt@^;4qgB!FNY?4L7PVTY^{^`=tuySpV&CqM{qeec-+exhZx7&&eFOL_ zWeC2$`b0UBgkTyoqBA3};K6Hv0Biseybf#u36Oyuum=?2033l6paN&$0%*V$xB)tF z2Ohu^Fn|~E1{=T|00m6o1AKuW@CPig(O^ab!sqmrKB%3JY7GE^U=!F3g1{EA6$Aqe zumQ(FwT8In>8UMZx}i6PYftl&evr4dL{XeyQ21V|R8de;iZTTPv`AT47>Kf1Xuzvo zznagjCHz-k$hg6JyELwoZcN4np@0X%z&5ZQ@Ig3;00OWB>;!LuNDu|0fe^%iw?Hh2 z1My%NNC1gI1d>29c-t^06HnzL?t0@7;wtRZ;mXyfd&HWO_8a!+H@=T@6HiOrQ1PN2 zufEZib!nmg(&o{FN;3bptZm62i{4_8-xX7wv6i27j*T~)P|gtwTZ)+)zO(V{q{Ps z*{`~YF6rpvh>Vtf^Ir17dPT1#@I<_sqfAJ&vcLK3LQmbdT#ieyKtUW3@=tcSi}2@L z3w5hs-TATEv%ke~Q5()-wAn-!_c)awVJ{`LzF<0pS_))A^$WSw>DqsM&dj9l?j6*` z4v$dUQl6F7%(kX`Qi669I~cl&dD9{tuimR?kBgtFFb*d)1M?-4HfiIuD-?u8V7n1$ z6AxxHE9gR3jnld1(F?>;N=WiUjPm~pL2PgYHG<2mB!^@Ng=LxfeR<=w=Vq@8)7gYG zzgbJ%1n$gYbt&o5Cowm+Gqld4Z1TypmmgntVEk=&py8cE-I>-As=RnILltvWVZ6?e zbOqSQXwYhUS6K7%9m=(p*mYD}6q2^{kH~f{aZVo9bf5b)ADuIOC|MU=aoOQFyI&de z?n2LsrR?#+yNBDG=Ls~*xWqB9bCi+&c?M>(L>#l^lukZ1GdyHQcP&}T{532Xi(kV% z7iJq*g^fi|#C7V$a8Z=B!XbHpB8|IV6}|9vqfwsR{ipCapD_6m{b8atx2og5hSe7} g+%T+4TwktwBvH(rBVm3=r54jPP1SA7!{KoM0_|w<-T(jq diff --git a/agents/meshcmd.js b/agents/meshcmd.js index d105e332..42532775 100644 --- a/agents/meshcmd.js +++ b/agents/meshcmd.js @@ -982,6 +982,8 @@ function activeToACMEx(fwNonce, dnsSuffix, digestRealm, uuid, allowedModes) { if (typeof cmd.password != 'string') { console.log('Invalid server password'); exit(100); return; } if (typeof cmd.nonce != 'string') { console.log('Invalid server nonce'); exit(100); return; } if (typeof cmd.certs != 'object') { console.log('Invalid server certificates'); exit(100); return; } + settings.xxprofileScript = cmd.profileScript; + settings.xxrawpassword = cmd.rawpassword; cmd.index = 0; // If we are in CCM mode, deactivate. @@ -1078,10 +1080,10 @@ function AcmActivationCompleted(result) { settings.xxsocket.end(); exit(1); } else { - if ((cmd.profileScript !== null) && (cmd.rawpassword != null)) { + if ((settings.xxprofileScript !== null) && (settings.xxrawpassword != null)) { console.log('Intel AMT ACM activation success, applying profile...'); - settings.scriptjson = cmd.profileScript; - settings.password = cmd.rawpassword; // This is only going to work if the server sends the raw password + settings.scriptjson = settings.xxprofileScript; + settings.password = settings.xxrawpassword; // This is only going to work if the server sends the raw password settings.username = 'admin'; startMeScriptEx(function () { console.log('Intel AMT profile applied.'); settings.xxsocket.end(); exit(0); }, stack); } else { diff --git a/agents/meshcmd.min.js b/agents/meshcmd.min.js index d105e332..42532775 100644 --- a/agents/meshcmd.min.js +++ b/agents/meshcmd.min.js @@ -982,6 +982,8 @@ function activeToACMEx(fwNonce, dnsSuffix, digestRealm, uuid, allowedModes) { if (typeof cmd.password != 'string') { console.log('Invalid server password'); exit(100); return; } if (typeof cmd.nonce != 'string') { console.log('Invalid server nonce'); exit(100); return; } if (typeof cmd.certs != 'object') { console.log('Invalid server certificates'); exit(100); return; } + settings.xxprofileScript = cmd.profileScript; + settings.xxrawpassword = cmd.rawpassword; cmd.index = 0; // If we are in CCM mode, deactivate. @@ -1078,10 +1080,10 @@ function AcmActivationCompleted(result) { settings.xxsocket.end(); exit(1); } else { - if ((cmd.profileScript !== null) && (cmd.rawpassword != null)) { + if ((settings.xxprofileScript !== null) && (settings.xxrawpassword != null)) { console.log('Intel AMT ACM activation success, applying profile...'); - settings.scriptjson = cmd.profileScript; - settings.password = cmd.rawpassword; // This is only going to work if the server sends the raw password + settings.scriptjson = settings.xxprofileScript; + settings.password = settings.xxrawpassword; // This is only going to work if the server sends the raw password settings.username = 'admin'; startMeScriptEx(function () { console.log('Intel AMT profile applied.'); settings.xxsocket.end(); exit(0); }, stack); } else {