From 5585f2e0c12ab1f0fbe74b0f02e443b574d9ba12 Mon Sep 17 00:00:00 2001 From: Lee Fine Date: Mon, 7 Oct 2024 18:30:48 +0000 Subject: [PATCH] ab#63856 --- .../CitrixAdcStore.cs | 9 +++------ .../Inventory.cs | 1 - ...r.Extensions.Orchestrator.CitricAdc.csproj | 5 ++++- .../bin/Debug/net6.0/CitrixAdcTestConsole.dll | Bin 24064 -> 24064 bytes .../bin/Debug/net6.0/CitrixAdcTestConsole.exe | Bin 151552 -> 151552 bytes .../bin/Debug/net6.0/CitrixAdcTestConsole.pdb | Bin 17396 -> 17396 bytes ...ctor.Extensions.Orchestrator.CitricAdc.dll | Bin 38912 -> 38912 bytes ...ctor.Extensions.Orchestrator.CitricAdc.pdb | Bin 22168 -> 22052 bytes 8 files changed, 7 insertions(+), 8 deletions(-) diff --git a/CitrixAdcOrchestratorJobExtension/CitrixAdcStore.cs b/CitrixAdcOrchestratorJobExtension/CitrixAdcStore.cs index be7a298..5955c14 100644 --- a/CitrixAdcOrchestratorJobExtension/CitrixAdcStore.cs +++ b/CitrixAdcOrchestratorJobExtension/CitrixAdcStore.cs @@ -31,11 +31,8 @@ using Microsoft.Extensions.Logging; using Newtonsoft.Json; using Org.BouncyCastle.Crypto; -using Org.BouncyCastle.Crypto.Parameters; using Org.BouncyCastle.OpenSsl; using Org.BouncyCastle.Pkcs; -using Org.BouncyCastle.Security; -using Org.BouncyCastle.Crypto.Paddings; namespace Keyfactor.Extensions.Orchestrator.CitricAdc { @@ -626,7 +623,7 @@ private systemfile UploadFile(string alias, string contents, bool isCertificate, systemfile file = new systemfile() { - filecontent = contents, + filecontent = Convert.ToBase64String(Encoding.ASCII.GetBytes(contents)), filelocation = StorePath, filename = fileName }; @@ -643,7 +640,7 @@ private systemfile UploadFile(string alias, string contents, bool isCertificate, if ((ne.HResult.Equals(0x80131500) || ne.Message.Contains("File already exists"))) { Logger.LogTrace($"File {file.filename} already exists. Trying again with new name."); - UploadFile(alias, contents, isCertificate, fileNameSuffix + 1); + file = UploadFile(alias, contents, isCertificate, fileNameSuffix + 1); } else { @@ -737,7 +734,7 @@ private X509Certificate2 ReadX509Certificate(string certString) } // ReSharper disable once PossibleIntendedRethrow - throw e; + throw; } return x; diff --git a/CitrixAdcOrchestratorJobExtension/Inventory.cs b/CitrixAdcOrchestratorJobExtension/Inventory.cs index fe72361..e328ac9 100644 --- a/CitrixAdcOrchestratorJobExtension/Inventory.cs +++ b/CitrixAdcOrchestratorJobExtension/Inventory.cs @@ -22,7 +22,6 @@ using Keyfactor.Orchestrators.Extensions.Interfaces; using com.citrix.netscaler.nitro.resource.config.ssl; -using static Org.BouncyCastle.Math.EC.ECCurve; namespace Keyfactor.Extensions.Orchestrator.CitricAdc { diff --git a/CitrixAdcOrchestratorJobExtension/Keyfactor.Extensions.Orchestrator.CitricAdc.csproj b/CitrixAdcOrchestratorJobExtension/Keyfactor.Extensions.Orchestrator.CitricAdc.csproj index ab70848..ff462bf 100644 --- a/CitrixAdcOrchestratorJobExtension/Keyfactor.Extensions.Orchestrator.CitricAdc.csproj +++ b/CitrixAdcOrchestratorJobExtension/Keyfactor.Extensions.Orchestrator.CitricAdc.csproj @@ -1,7 +1,10 @@ - net6.0 + true + net6.0 + true + disable diff --git a/CitrixAdcTestConsole/bin/Debug/net6.0/CitrixAdcTestConsole.dll b/CitrixAdcTestConsole/bin/Debug/net6.0/CitrixAdcTestConsole.dll index 3b40a2bb24391c0454233edb18091b52f66f3b82..17eb052626f6c029174aa7aba4edb0582045cfbf 100644 GIT binary patch delta 237 zcmZqJ!`QHgaY6@6!%fBA8+&5B1WcKaRevd4;=Nr;K(f#fC{dH34&Em4P^M?y}L5(R`-?7F9KJv`X@7_G8i(XF&Hr< z0$~ym8vywR3>HAKBp@~cvQik#8H|Bs8c;2WWeHSa0_0f$d1efzKz<64ZwM0Id_P=~ F4FLW9Nh1IN delta 237 zcmZqJ!`QHgaY6^nFB9oW8+&5B1cIN%Pio(_&u#b9;^vyH{4bk-cxkd~7#gNnq$MSr zrzV>jSeO_ZB^w%>TBMkzCK;I|8K7opCNm6vPs|+1*jnVMW`T1^|K4Fo4#);e61~29=-WR;0jiMLk2^J6b1{1 zG=?OGWCnAFR3K@_U;q>`0m>Kwd4>$e45mPS3Q#;1sLBW^lLQn?0rD(?vIamh5vbo3 MC}Xtwez+nV09)`(rvLx| diff --git a/CitrixAdcTestConsole/bin/Debug/net6.0/CitrixAdcTestConsole.exe b/CitrixAdcTestConsole/bin/Debug/net6.0/CitrixAdcTestConsole.exe index 317d584047dc749a85e00b86e33cb301a8a494c5..44c357c1a47986c574850e6d9ec3c20155bf603f 100644 GIT binary patch delta 99 zcmZozz}WyqEsR^38od3J8B!Sx8PXVx7!rXn35X4Vd;|0156ARR910 delta 99 zcmZozz}WyqEsR^38od1t84MXx7%Ujl7?K#08O#|{futFO0Z_yQC}RZV88R3%m;(7J kK=D+dDkGpw5>PA!$g>2>8UV>epng-JjM4V<-b{up0OltW82|tP diff --git a/CitrixAdcTestConsole/bin/Debug/net6.0/CitrixAdcTestConsole.pdb b/CitrixAdcTestConsole/bin/Debug/net6.0/CitrixAdcTestConsole.pdb index 249b66f43286e6701b476a56a1513698fa39f786..cd0d570b44c112c5bcd7ff809ee851105d09c8de 100644 GIT binary patch delta 526 zcmV+p0`dLyhXM450g!wYt+zi{DCTBLt8P@B7tmA!Qc)Vqv5?CQfA)|urDdR-0d9>n zOD^+>W}-;2vtUIA`bYhk^lX}sfq{221ONc7lTAwlF%X9Dg8yOgq=@^`uC`SX>Pp3f zAZ^iuc*t%h+dwvvWMbWaZ?-K<#SeOD_L7~vd1mrX631tI9ft>T4A;z)Ijc~kWrX}@ z6>P_RAsv*4BP^MNe@*~J0}RL*6?M|7*CcC%XS7ZleVIi`)KB{9D9UhSH3dC<>BU8^payq QixBSV-N)SevyT#GF`KgdHUIzs delta 526 zcmV+p0`dLyhXM450g!wY24d|l7#yHSk<>kMXP6zuW8s{Sv5?CQe`oH*?{u`}DHwu0 zSrm|RNfGpKcj|B9I*81G&T(}{D1mn}1ONc7lTAwlF%X9Dg8yOYNs;bXtG2cXb*17# z5G{HT57}gP8^|V-OsxCw&DOG1{Gf+sFWJePXD06?aopeQI6R1Bm@-eMU!g|J2*u?( z*p9_gI^aeiteAsNe*i@T49FN2bGzGS*W z7YIOYhEghonl-?gcL-8*V=Z!m0+;Mv8VgJdSV^Tq1e9?Evg~NI#IG6y$zoUJS83Du zm$U8L!ovgaq^{txafJ2c`)~Asr3!}$rc7Gt3v&+ZLNymZe+AKOvzD9sjp=4aWM$zA zk9xTb(~p_p3v`ql?To_S@$1e!UCPP_3qo{@dX0szcE`*^qc#oRf~29<;oBW^t4m|+ zbuCQ&!8=J)F)9mwj{Gbc4bzOLgVT{X!y+3N1A*f-8ME><%XUwDZ;kMr_GaorlES^w z{`Yl#nQyiq9AJCx?;fwbR05u@B+SDbm|IrWs0p|VIiq&pCzJFJtSB)tWH@GGV>e}E zHZV9eF*0K@Gc`D5Hf3TmG-5MkWjQf0IbmisGBUHs53d3k6k+1D0H6Q>f7g{uvWK%n Qlf&GmzJ;9rvyT#GF{TIi1ONa4 diff --git a/CitrixAdcTestConsole/bin/Debug/net6.0/Keyfactor.Extensions.Orchestrator.CitricAdc.dll b/CitrixAdcTestConsole/bin/Debug/net6.0/Keyfactor.Extensions.Orchestrator.CitricAdc.dll index 5ca05c1f37fbf46dc137894a6d26a712684606fd..d0c7dda066cfb1f08059dddaba584b1b8d9b74a4 100644 GIT binary patch delta 1562 zcmYk6Yitx%6vxlGGrKdpZ6~v{+p_GobuH2^k3zTI?t?zW0<{_lMKGk+2Q9lBh$IU{ zjD{xN0xiX~P1lPi#u#a}*eVESO!R|^_<_U)A@)NNA_Y`};3Lp9z7nIJnb|~U_MUrx z_ndqFXYS12%xRW6%|-{sxh>8wvqPnLEjzUphd5%DZT$xTTlj-)Iq$$Kyvh5pcj1{6 zU|wxx8Q4I60$^2b2bESdB>{3Bnm@Ld}2?eV~F zIX%H=OBa^N!Q(XLwy~fDVBfo|#BzE3i>ux<9I_?{pxB)mdYVLnlQdQBcG=U7MxId$ zPEYY|ejiTo{r<&R$jAK43s5ymJPtb)TnTF%ET8J} zidEpH$_$?@U6z9oY_iBx@VvMLc9=8(MT#Ak!ab9+-tX1x@>2NQBn~gqy%ZXn&79t= zstU`Xwb#U3j=N$Umcs^<`ed{j^kkkqHkIhvJUuSNp&C+odPY!*(k2a1(jVj%kTK~N z&f`z=O1S#4RcKI13L)^WwrC!Ilk4Emb-gBAuKTxSo%6!!oM*$NPMb!ae=xhA$9j^^;BKh5Bh$p^4%gR1~W) z2fK^nWDn6^&q0Pc#T=aVNbF@cskuc5yQg_6(j`0j$w&G-$Iz&14Cm>!-C;NJDPasz zYq5=Cf602X;{}GDb#JmIpodjp0-B2@mV<9-3$o_gEKYkmZ9Ca!)@{pTf~Ck-iz>XK z54RMc;1#FzH`f%QR3=u6)ncQ5YHbz*(_bC@7ga-b zMiK1VJ|}5puIOX0tiT6yT9=l&P#6%X09s;z6rkF3+Rg<53HjU+w~NUEhDN?Sc6vZV zN*lTq+@1`jYP-6+yJ|u;u~c^|97{y&5~*agE*=V}V$n!_JP{6s!dx8=ht7?JuIybc{YDqdRlYHOsBK7uu@8tZ!ftCX=o!R)u){7dS9R9RA zKgn2rl2WhO*{Sp_%gleRFDm-{RxG34b7IVo{VvPEirmkU#_CA4u@+?j?3_=goZP z&Aj)W*|{-BnK8-+`b5{GPv0IqRE!q~N1j20BbG}`J_LA*&tjFl4a@N|Ph^%;UvvZ#xb|_sZs2Q%{={$eF z5`K@sC$X>$;M(~@zU}9;i^|I1w;YPDgdpHE4sE8;;gi%=<@36_8mO^zfChIB^RA*o zJi!kZmEl}IT2!f$Ak-{vZ@{*Pz;6`Y`#-lZEw>QAXvw}v{VN)*!{Y_Z_yKK6ScknM| zA$;?gBQz|egeZ8HICKa9R;uA%D zo18@?pvD;qR>B1AaC{_&xfjEhbx!)-EXUmd4Xv<+I1PeQ>Rt{f>BP~epjEh_8Aff| z4;w%io8hcY&X%^o*V9I}z_;0vKA7)rfgh*&9*1k@Ka0Oa{KXt=ydcz0L1{pPDcF&h zAo~jK@)Q_M6wkvszs&ZsVLeZDv)j5ZPJveu#R*obxA3v0J)1_*QZ<5i=(GLFuHi;u z1W{imjbKmy6J(F&S~lZrm6EWJm0}W_0x~-fKhPEo*>i_*!oNv+j%{G=(hw$DC)p}d zgLloLWw|Km;%W2b@;sDhh#|3DjGLdY2r`VBlPyAn_VDV$UC)P4tvn#Dy1u8g;G%i+ zWsgvlVJeeC42ui=8nO}y=;=1JDkH;vy%~P5cUiF%!l0xIGOD7Cddee{C6#^@mJ3D_;Ez~H4Ef({qiKZo#peu(`O!E5&W@3g1 z`qsEFHOZy6X1={IhU4bjeGgHybWEy(OW&PCNsNs7(ZK~cb6nr58xx+8U`g`WAcsiE zIKTVaJe=euhrSO-qsjWt_Kvz#M?6wr6ODC5t843%@l<=ProB3uN<<@xt(~>87%%Rx zi9QIv`7z*{b&SsCIVwl!-aOK8ol@sPs(e(+skG7k*~ZiTv$fnC2lI~K_pctVTN^29 z8kYE({?B6B&Wdf>PAl};u}{ltj{e^INagyUhO^hN75FQw9U7dKk7vwJ4!7Z8#AB)h zbH%k$h(Z$Tp%dDngZ_povT=w|PYrouL{X@QTH+-2r)X4+Jnht%BubDsLUt?7uO&~+ S+<&A8*>?@5_vkH3BL4^Ywsfih diff --git a/CitrixAdcTestConsole/bin/Debug/net6.0/Keyfactor.Extensions.Orchestrator.CitricAdc.pdb b/CitrixAdcTestConsole/bin/Debug/net6.0/Keyfactor.Extensions.Orchestrator.CitricAdc.pdb index d8826ce284243de7ffd83c9dc735c17f7587721f..10325c5e0e846560164d4c2e0da716678ebb315f 100644 GIT binary patch delta 1855 zcmXYx2~<-@6hPKgUV8; zuFxYK1yR{d#9~_!txHwJZer_lpjIrkhznX;T5VszpL6fbdo!7tKl9J*ZG}TEQ1hY4 zEu4^Gm?JibJt9UvK@NwoG0(<4o9qu|lLn+2 z2?=A92;_ZatBOtTsit1U5?_AmVG+B@I*T}k1K|+BpYaJn3{lJumS;02-Xvxu3R|2p z>y8*>HO5U?&v+e2WBdjf7|#0~om`ABOjrmTF+qTA^5J61L->g4WbU5A97_T624XRp z6NXt~X^q$*wup#uNut;l$NG%zilY^nxZ+B)xJt}(C8=ncq#k|F=OoT~6MA$QL`nNG zux1h9k}jzT4ZccrjBhHs#GQx1l$9^L8cYaE=z&{l|=wE_f z7Eq6#9$3%t$h(0(Shti9qIb#(i%Ul3BJ|E6B`bqV9tEXhFgv&ey(YLGZK3EvCyEEr z#R?IdOZF&4CS0;LM2Sumr=r6`Q%!iJDpbjt%%I&>CFp)tJz5anCEycR)lWtn&Irue zqUdS&%ey96BOXq}L)(1L9zK6Aw{>M(ZcL&!rlq|gBaHrGWiQJ4bn&B$%I@optrnW> zFCP!`M>TyTzyCW@;e6xnim&6%3@+A}LDyNmRyeeO0{SKz{u}T9@nvbk`l_mdimPtd zA{|QA?scUVg?N~q37WV&V$0JrpE^aK) zZ|`|9@ar76TSuL4v3A70eWqxYA}BondCSQ&NwyzWRlJOksbaj3Y_D8%;>$i&O^VeW zT}Bz7TqC@Z)6;C8&kB$QpPg>{-P*z>+ZXg+N$#|Lk)OPKX5P6rdBNNZy(GxvgA9JL zqcVLP`=Z*3QE%B2_;1d7QeZk-+4(c8Kaz9MRW>>-xzua>LG&|8=h!{3&fr3`@$m)H zw({G~-Y>GxEW04csoj2A6X4J=AdYzGAlKEs;#(d&{CVeNUA@Di-m}t*-=7R_<5ce4 zVEI@lId%L}{CZRU!Ea9KN0!x^@1E^qk+NYR`C`rwO^ydnznA{FS^a2Kx~FJk+?s(I zN1j=HlU=yKI`*G$SFH~H$D;e@PLB;ceo9T=Wp;PCxZ#0MV~*mzMV%?V19fv2E?xLy zRDWP|lBfDv%=koKN8=vh-~ZXl9G<4F+kWZpsqPK6I~G3iwQKq)<TwkAKJ&Dg9RO?(BT3dUUXjQL-41b;m(G|VPin^R9>2p$qp`Xyvx|__<1-!j6Fdw z1pO?~$AG>7^anwI1N47EdjlBkUJq-KgCPM7xg01>gUw4f;su~h#-Yo3>t>|k#{(Pb zSK+zvDRqxfK@-i3P{S9r3+vbDOY|TOi&ViF-5MDUJoLR`kCYHAxB1&wrRY#^MVdt+na0{tyE2{<$)F4R8K%HG&%j1S~vh9@S#6h$}~ zGk?+jacb|`{K@vx`&K{_U$?V_ENJM27(G|$-SfgVhhG?*w1?wCu97Cu#8}%z#gGwFv~;uh!+Cnt5rg5MTi)A&XY?p z%)-_OnT^cx8*(2EIH3LK2{np{*Jt+NH@xKh)HtBefmqI&B~Nl6Djw6+svw8HtdgH98}D zn=Tt|imXTfHL?R;8`Z&x$g!wC>{seX(NlWD6Oy&jGW1lmk(VbVFU4eI@Q0Xs^iWI( zx+1m@ouM2>e;q613(0h>%u7h_8I0%*Wj6XmT(*~p{3p&R@MO@3O!ep#a|gQ7e8xvi z4w{BJvlo13@n!qoEo>B=`SH-q((}irHmC1k-LKo;zVUdpwjjQ@S2TBkPDmEW{BNqq zx2Z~Rj+eEMR=2FJOXS`EY_c0pH(fEjyYNxiWpXrL1CzfkAj+=wm zgp}!)J={BdCjX<(BVKPdHaK?RVfJLEr0`U8KlXmy+)smSFBJEzmuz`M7PMC{&6k4e&4P+HG`K!Xz9nLfzG90{*?LaO%~tb+YNU&I0TF2ZwV_33VM4U z$WEDF|0b}8_}N#M$+l`H4iELWZkc;;u-f|Bz1H`NT4%e(3;$KPzv@h&zVpKqgNcHU zw8QHb9R6mdC@{KF{gzcbBPq;_NUr#B8dub;IY@*XnWFSa=Y+8o1i-R*mtUs1UGH^121eW`iCcx!2j z{G)(xA3bnqeSSrD=R$4h8=XmG_LiSx9gh+YDoVEX>VFl{99Jm*F-`LMt)O<@YnsiX zrak*lwbb&cbKc42DpkJDmYWx0&C@D%;VN~WYL!NpueIi?!*f^VTO(D<$Q+wSt!B4M zuZBw7!Q}$ib#VO~Tu-1&09}irYX!}S`yTYHKHiU65|mzEpolNsUXoY6I;Wzt$f{Uf zUR_pMs>sMG&ndQ6TFWbFx+%==|BHE<*1YZIg_YH^UyS^Jh5Y=&l7fmP&$Aap_i3(z z?mp-q$0ES(3+^CrCxW{S+;P5=!#uya!# z-Y~X}^iz{VTo;s!UnkTz(3j0c&_)N$COAQ#OR&Isx-P*4gVc#0qhF(^=#s=_@TMh+ zH4sd{OFRl2Xls%Mw$PCzJ=9RCeg(5RC;91Yha^H zstT6S@Kh}r=+@M5NgXu#FipFO6bw?Vqw!7Jm6`;{>7&#r=%wLlX>f_|Ov?fhy_pub zz#>_|O_~w|sbWM*0!($nLM}5+wdoe6LhKoDxGe#)?%6m`>Nw3^j6OT(Dn)pm25>hu zUx1nUGU`eX%L?>tnCEcupmC3JcX1al%*TD@)nDdj@`FR3HVRL({AsjYF%QR9hKhw) z2QKQ*h`3($h5)QcN!1zI^OLdA1V$7