From 431f3bcb210a08d2d81a22df0182a9fee0b57f73 Mon Sep 17 00:00:00 2001
From: cstdev <pietomb00@hotmail.com>
Date: Tue, 29 Oct 2019 12:34:05 +0000
Subject: [PATCH] Use correct ports for MTLS native test

Native runs in prod profile and so doesn't use the set test ports,
need to explicitly use the same port as would be used in prod. Currently hardcoded though.

Use different method to include resources, specify all jks rather than using resource file.

Fix import order

Correct algorithm used in keystores, can't use DSA in Java 11+
---
 integration-tests/vertx-http/pom.xml          |   2 +-
 .../src/main/resources/resources-config.json  |   7 -------
 .../src/main/resources/server-keystore.jks    | Bin 1964 -> 2215 bytes
 .../src/main/resources/server-truststore.jks  | Bin 1278 -> 925 bytes
 .../it/vertx/VertxProducerResourceIT.java     |  19 +++++++++++++++++-
 .../it/vertx/VertxProducerResourceTest.java   |   2 ++
 .../src/test/resources/client-keystore.jks    | Bin 1959 -> 2214 bytes
 .../src/test/resources/client-truststore.jks  | Bin 1284 -> 925 bytes
 8 files changed, 21 insertions(+), 9 deletions(-)
 delete mode 100644 integration-tests/vertx-http/src/main/resources/resources-config.json

diff --git a/integration-tests/vertx-http/pom.xml b/integration-tests/vertx-http/pom.xml
index ee50b48162214..eef1a2e2f7c98 100644
--- a/integration-tests/vertx-http/pom.xml
+++ b/integration-tests/vertx-http/pom.xml
@@ -99,7 +99,7 @@
                                     <enableHttpUrlHandler>true</enableHttpUrlHandler>
                                     <!-- Include the server certificate -->
                                     <additionalBuildArgs>
-                                        <additionalBuildArg>-H:ResourceConfigurationFiles=${project.basedir}/src/main/resources/resources-config.json</additionalBuildArg>
+                                        <additionalBuildArg>-H:IncludeResources=.*\.jks</additionalBuildArg>
                                         <additionalBuildArg>-H:EnableURLProtocols=http,https</additionalBuildArg>
                                     </additionalBuildArgs>
                                     <graalvmHome>${graalvmHome}</graalvmHome>
diff --git a/integration-tests/vertx-http/src/main/resources/resources-config.json b/integration-tests/vertx-http/src/main/resources/resources-config.json
deleted file mode 100644
index fc0791cae1361..0000000000000
--- a/integration-tests/vertx-http/src/main/resources/resources-config.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "resources": [
-    {
-      "pattern": ".*\\.jks$"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/integration-tests/vertx-http/src/main/resources/server-keystore.jks b/integration-tests/vertx-http/src/main/resources/server-keystore.jks
index 544ed8f1311d85b3feeef2c97bd15905c634845f..d8991ddbd627d40f0254ddae7fa7e78f412b4a23 100644
GIT binary patch
literal 2215
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
IX&!X?zsYvI$p8QV

literal 1964
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
I`uuU!-;J0^H2?qr

diff --git a/integration-tests/vertx-http/src/main/resources/server-truststore.jks b/integration-tests/vertx-http/src/main/resources/server-truststore.jks
index b09ca9dc9054d8bb54c3f1adbd5dcf37b4ce45a3..8ec8e126507b61e0e602b71d9f67b3d7e3c7cae3 100644
GIT binary patch
literal 925
zcmezO_TO6u1_mY|W(3o$xs}<el|WvenJI4!18anysevT}19QAV6LYjd6O;1-W+p}^
zCKd-H3u6ObHcqWJkGAi;jEvl@3<hzA+y<O%%%Lo7!c2~#hI|G*AP$ExYjH_pNva{Q
z0XK-xF3gggSyE{zV893BatX5+mL?Wumlnema03;j7L^$C1I-62U>0Ue&dE&8D>0B0
z=QXr6G&C?YG&M3ZGLI7HHL^4`0AdK2=Jq!+Dj|EBk(GhDiIJbdpox)-sfm%1VUF3s
zo}9*=J}DCyv6d_>miqhX+0BER7vzr=weLB0SI~-EN4Tx;+oAX3sZu+AreC;W+rDov
z-#5*V51%D8KX(20xaE+MMC5UqlCZ}&*8kY~jW=TIFRK(mcF!wJ^TT7)vd&p~1Uy)$
z`pW;@Uk~HZlKvCjci1|P$j&@8Uwi5_z2paTO5a=hS@rqWe0&n}OLbn<?BD0xdAVOW
z+KD<g7w~+zJZo`BO2NvS8~1!as6Y6?;%pT5d`@`K{Bs>_nKBuLad&4PoF%w@U!d89
z+LCrv&mDH_wWWUYJ`36D%^-U7h-9RXpo^<=ZFc0HX`&2UWMlL9lv%uVR}CpmJg{;8
zx_~1U?x&fU85tNCD;mff$O0oymXAe@MTGhL(rFKW9uTVSSw3Zn;O1#zMYmj$0}+^R
zfPu)!z}8Xzu<fNrg~i{%oe41x`*u{S7rSp(&b%c1_E|@BYp_aC^Ay!Or)4&(?2Tu4
z3-+eyZ#j6>I^>`BBZaSb80!?+r7pc#`09np_Lozt4zJ}{d+W?|#aPK1E8H9tc&p84
z9$uW3|Ks-G6^q-888qdu-^`O)?fLIsY>e9J3v8=pk6rP))@~NVdhf7^xr%i0hj$v?
zKacmOG&aO636*{EblS9x!(U?iHAU{$t+Riy#c;{YELD{*se2P<ZxCB;khy$zkoo)b
zf1h*afB0om{bvXBtJ`dI6l&j8MMc+}oYTC|vaIs-tm#V1Q5TxlEn`*65k9WeZuZDf
oVe7fPV+RB?1pBA?oH%RWcDHj)Ui8V>T}_AU?Y+Xxvefqh07{ov?f?J)

literal 1278
zcmezO_TO6u1_mY|W(3o$xs}<el|WwZ=k)En8CWCqObsj<7+4M%G_mXf;`9Z~OpHuS
zEXj3S&l>QuaVE5RFs3rIFf*|-7$g{S8*s8QhqAB<GdYGD3L6N5I2^)U#re6Zy2T}l
zC8>tI2HYS)c43y}%#unNmrIzXB(=B%#^r```GGb76*CL7CFf+O=9L)8iSrs-8X6cG
z85$Xyn^;7N^BNf#7#aZ)m`ev2G%-6FG%=a7v1_$?oU>qI1adT(niv@w`YTOu?p*b9
z|LV6LRp&hew|&+-I?sB&xx|ZCN2bZ!{WW8I?i{%Ch=j4_4$kL?*2x6VUhW><dO>jQ
zjxCk#rJgOBF>CnxMK+spXe`qIr7p;2o3wJWs|n|Vf0;RM5kI`|Dm2b9=UgBVzH#c>
zvkc0%yFyyFY0A${>HE>_(pElw&Ks63Cd=07mA;%2`^a{Krv5>}p83D#Ha0#t?%h6V
zyTSFHk3A#xGdO1yiCT)jvd!*x3qEG-+TUPpwB*o(Pel_{^Ze|)tT`+e9tn8zut!RB
zaqa!Mh0gc9)Bdweu)BI*O!;BNmG)yCFY6U$ZpfZeKAmU5p87-SvC}>eAJ#HU%LJKg
z=}fW=yS`0Z)>`rX{=MhF(odEjZ+&mH$#~b(h68)9X2t@;h(T;wOoW0*K!IN=)8gsj
zEW9SStV}8nhFp2F^nk94-UI(>&*Z!>Oz_&frr-SC#s~8an=aW*a6X-)-@)LR@b>2^
z&dmyC%jXy^Q~%^{H?e*8q9e~;_9`@n_-u`C&@t<kUtxEp^Q9mEf{Z>Rr>>ZaBNfMb
zS=G18%(B|e&HYfvC1aZ9^ULQ-ZVO1IuF`J*=98gz+wQo&cj(M!?=5dP=+{hmxn$bq
zrLn=$um8AS`6l_z-uCV8c1zVmpHv={8*1jRXn!N;?(w7Ucl^EWAuWd4N=Emd2H#!J
zB&f|R&veURx{=C1^>w$p=Xz@@-Q3mvc;3y2%*$+o8o7^kY=89DS?u9^@!R*9n;2Oc
zKmozR<S@HrcFv+_B^wPVDA*leVZF>aoU^HA_VhLHh09-0V5>EKv$Cc@p8JZy-4nsT
z?ay7g`1FVU?8)~F{db%@lkxk@cE!ZS6XfNTf4^&USl<4rDQ2+-SL>ByN_h;I!cub=
zIlp?wyJ700g*Tp5zY*ETb%y2T4!L95>+8Nq?@IOFvFeZY@8efGIw!eErE#~g-0~3J
z`2AwqMC+TJv$U@r-g;8Q`-%3p{Z{K!=6ADIw@ryWqB!x;?O&>D2NuX3%zj%DGGF*s
zNj~2}*~Ge2<@;5P?58xPtPy>BSziCsV!6U=+L-~DrtW2SfAlxctNPuy2Yr3Ki(FXP
zZkVxV#vIq2kh0^}k5`Ko4de}EfmvIYk420{M7^?JV9i34*&X&1bLKVe7MsXkt&LW;
zFgq|9*aDMS|AGA~ew(#cKU}Oc(M|Be|I$OdMf&r+*KO8goz5gv+VbFh?N`_Tx4PyE
rotpcjYU$yt2YC8#%BS*7JG*h_UCs%g0{=U1(=@$vQA+9E-<6sGxo!tH

diff --git a/integration-tests/vertx-http/src/test/java/io/quarkus/it/vertx/VertxProducerResourceIT.java b/integration-tests/vertx-http/src/test/java/io/quarkus/it/vertx/VertxProducerResourceIT.java
index f5c9009658985..6b544f107015a 100644
--- a/integration-tests/vertx-http/src/test/java/io/quarkus/it/vertx/VertxProducerResourceIT.java
+++ b/integration-tests/vertx-http/src/test/java/io/quarkus/it/vertx/VertxProducerResourceIT.java
@@ -1,8 +1,25 @@
 package io.quarkus.it.vertx;
 
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.Matchers.containsString;
+
+import org.junit.jupiter.api.Test;
+
 import io.quarkus.test.junit.NativeImageTest;
+import io.restassured.builder.RequestSpecBuilder;
+import io.restassured.specification.RequestSpecification;
 
 @NativeImageTest
 public class VertxProducerResourceIT extends VertxProducerResourceTest {
 
-}
\ No newline at end of file
+    @Test
+    public void testRouteRegistrationMTLS() {
+        RequestSpecification spec = new RequestSpecBuilder()
+                .setBaseUri(String.format("%s://%s", url.getProtocol(), url.getHost()))
+                .setPort(8443)
+                .setKeyStore("client-keystore.jks", "password")
+                .setTrustStore("client-truststore.jks", "password")
+                .build();
+        given().spec(spec).get("/my-path").then().body(containsString("OK"));
+    }
+}
diff --git a/integration-tests/vertx-http/src/test/java/io/quarkus/it/vertx/VertxProducerResourceTest.java b/integration-tests/vertx-http/src/test/java/io/quarkus/it/vertx/VertxProducerResourceTest.java
index d0f326a136988..2a5e572ea7a47 100644
--- a/integration-tests/vertx-http/src/test/java/io/quarkus/it/vertx/VertxProducerResourceTest.java
+++ b/integration-tests/vertx-http/src/test/java/io/quarkus/it/vertx/VertxProducerResourceTest.java
@@ -10,6 +10,7 @@
 import org.junit.jupiter.api.Test;
 
 import io.quarkus.test.common.http.TestHTTPResource;
+import io.quarkus.test.junit.DisabledOnNativeImage;
 import io.quarkus.test.junit.QuarkusTest;
 
 import io.restassured.builder.RequestSpecBuilder;
@@ -37,6 +38,7 @@ public void testRouteRegistration() {
         get("/my-path").then().body(containsString("OK"));
     }
 
+    @DisabledOnNativeImage
     @Test
     public void testRouteRegistrationMTLS() {
         RequestSpecification spec = new RequestSpecBuilder()
diff --git a/integration-tests/vertx-http/src/test/resources/client-keystore.jks b/integration-tests/vertx-http/src/test/resources/client-keystore.jks
index 0ccfb70750c4eabf00ac75170b9218cab5c37481..cf6d6ba454864d18322799afac37f520673193d6 100644
GIT binary patch
literal 2214
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
DU~$&+

literal 1959
zcmchX`8(8$7sqGD$1tRFEtN1xF}C^4*mqgN<x1h&LyXL2D2?rs82di5mXsw*rsRs5
zs4RC75;1D*Lzc!hlq6Zd)BS$$FW*1lKF@jo@H*!_&pFR|&N+LWJq`o{fpG=>TfBs*
zKwK1;2w(hJ%iKsgNP?Au2jK$Ba3}y(f(b*Rybyo{OQV$EbgoKm2@Z);-7xDwdWPU1
ziyFmthIgSZ0;N3~gx3{1(lz;}K@`LNcK^wNHM(xkj>EjQpPAS$7@`ev^zD0;JJ`eM
zvj)S`PR%TO-D2aI;<H6De5Az~$%-qoR@QC{vaKtqS2TuVoHmUrs~HpJ)l2vYumYAR
z;RBR*yYf18a1;IfD#ZAiq8=)%`4g%;>F~SnUfb0MyZO809|I>CABsZ|!6OPXVTarX
z%3H&g8P8oWRtDrT%$3s;JzX90%AG~g<B>9K{J7kw(!{UF-+x(<`Qz+*f4VyV`4Sb6
zucWG>XHD1XCb@%HHlpyoiCz|5gibPT#2pLGR6iI@g#{{f^0JPTnPUd5p+=5heOT^g
zEeod_i0#c9WB-U>1C|&|U3uuh#tAni!fw_ul$v?ZY3VH7zPIYtg`<G{#np9LPRoYk
z)@PZPhEJ$61<;(ZXFPp_HIw~$y|aW}<l_{E)`$ze-$RJrvdBu{Cz|%wpXsJe)Jn}s
za87y8RgDNO34U6kBnhplr_Wv|iaQU7Tj49ePYX+CBruCS_QqA!2#hkPbsVi@m{A)r
z8NOWfa7^`*c$Ck2n18zVz~^jx+#;jqxrU=0Gg>WeC(B*_ZQ?fb7j?_n{qTCcWI#dH
zdKJ4sDI-v2=Uf-$rQPcYD#hNOHocvczvGEdN0ZGu^~V)m_bW#h>eEq!Qpc^&=^mqH
zBQN+~HqZ3@mOvW`VOrPLYq4yR(-|)g%^CkTTAapotM&DYvnY0MH04_#@#qsU;cLp9
z4Wz~5))Vd+fK%=hcKr#doCzbBpNb_pIKbw~;wbFu>Et>G{{xO?pJT?8<$Sy)G*rL7
z&tv^}Z(Y<hL0t$0Xah;WbFMCx@xY)k7~mV**bfT95#GsGP#h1y1LK8&-WWj;0q1c7
z;3BZoP8bnT_y_Qd2wV*z;8d>?eTX=W5GeS=$tME%;)zlJpnwQK#9bx+gM$CVL);47
zWF8T?Zx9|AOa!Hm2w`+FAQp?kVzf1M+>QugK@fxG+TZvubU@-U<zB8PoKGp)>WvNn
z<$@xN1cgF!qBKXJJ!H4ma#DXEus+xHMXmFWex3Hwk4yAIq|vSxe9`P&4gILPE)B8R
z@mSKK<i4eQ(xC7o+S90%FzZCT2jyUnXoD8NVg-6jL0G`>Vojcf2BK^aA9TiL(`Hg8
z{<b!v?67lv!J~f23BzW`#3mH7)GvE8!8|#l==L)3RHK@r7RE02oHcxcLbnTN-rXvV
zk6%>JqTZl_@1K3Jc0~suibKV8#g+^MGtM}4saxd4>0|G8u+~D!Cxh*b)Ajjv%IWrV
zGno>o%4^dX%FU*1{PzK}(a3=Ki5VA0N*6!-x~wEqs`o@+unr$?Q|^Q5ODkL6a9v$*
z$#<7vQjq42!s?{RZ_`tYTbFtwx|3G1f2cRl$F)5l!FzIN1QD<HaFMaHzibx<t1NN`
zgfzzVG$Pv_8FN)_s`6^AvxN)NHiP7!Ur=(iSL#`JF{B{_vRR)WIu&x-oAbRF(I69k
z|2DQ-Va?JgH>IS4zG(hJCf?Du(LGK@D+~F+h>^y&J5&~sjWtd8h@?k$W$`LdC2#4q
z2nx=qm<JT<E)KsTjvto5JycHFunjmhZq$voak`mc^OW-h9Ybc{D;%!!ba4M`$AYnO
zY{S@)(~_clvSUr26@ft!9;7TwTUu?#ZhK8p9TPEua@eVPhsipau(A*mHU<`9<@XdG
zk7bnFpyWoIGd|oIo#ClAI3F+Al}erEn2FD<9vPqFA#s2Fk3j%1lM-S{P{jhV9z&Kf
z>VBYKt?rB<C6*LXRz)KIBEzp~F4x3dMhY^($yW~B#%~yJ=QoW@@}{qxrM-C_u)R)|
z^{FHyrB7_HB%9n%StEH=Dhebqy5xc(L%-q(6=q8dLQe`R%9(S~%c3s@UIT2JbXQ<q
z?E3L$oDJ>aj{bHxBQ@=YxrD!9A~0qpR{!m-f3E&0;+FEeKO1`#ZRV7lTJ`Gu?q<NF
zlk;8avbi1OTPIJol}Wb;av~k?ii{CM4z^4A#P&wC%43c5Nq!Wu`C%k_ty22RJ7v86
zP{9ix%h}!FpQBecSlQV^73Kh(sl|);=thzKXk(j8m9iibl;WPY)ImTT5LJk}ewb3O
zQIcw$8+3=%BA&|^t^9w#g~tQ}8gf@Gr>#}qu0g4Grcx#MjPT%oSVxO!PO#161~uLy
zm}FQYYv9^fi~X_m(w}-uH-E4CbENG+&L|Rhps@cu^;i%q{%I&Zq_kD$7Yk{_5az~z
E0AS=^5C8xG

diff --git a/integration-tests/vertx-http/src/test/resources/client-truststore.jks b/integration-tests/vertx-http/src/test/resources/client-truststore.jks
index f072e6db68abd0a257b6e9ce8a8cf65dc17a65c6..112fb9857fbd71c688d2bdd6ea2bf647790def70 100644
GIT binary patch
literal 925
zcmezO_TO6u1_mY|W(3o$xs}<el|WvenZ;2j2G$5YQv*u|2IhE!Cgx~^CMM?v%uI|-
zOe|7cRtp&LvT<s)d9;1!Wn|=LWiW^{<Tl`BV-96u6J~M@HRLnk0dY8lS&K^&OHvJa
z4Y)ykc43y}%%T!Q0Ruh|mrIzvur#qKyR;alfE%bF6{vt8Xg*K@voKq6YEfBgk%62z
zuc4)(p@E^Hsga?9QIt5ZktL9}gmP(ae-on;vX>cI8JL?G`56qF7`d357#SJb>>3m5
zZ=H#Lv+59Q`XPs%cW*|zcHdloqAxePpx)#s-v#GfEiaLcc0X6@y`H-%=v#*1=Oe7K
z)qW-B>_<J;FS=ay^YfXUa~X?*BE0swYR9iFx!?EywOFd5Q;dRHEV~ZR2e*l*7@sp+
zxun;KHnPloJVpAz!vj}-7x0}^{#*V2rrnl9f?M8wzxa1TS$214xBTa}K6mq)+4?70
z%1%o7UCT_~8e=E%)=VY!mKclE0)8g3+#n;RoQ9y4r4#O5iMhEWd3p2dW6B4TY~P&_
zP-&SGQP_5T!Ca=rcc1o{KXcuux=k<UfC@*$zc(DIt9yP&9Q@dAvNS&>$?)l+O%qOP
zY5rU~k%^g+fpM{-fxLk%FydtSSj1RFgzrhQ6sa|LY5ME@@w;|V$wlpR7jhs1(+w~X
z85yJu_Xh_F$};l(IqMm5)_GpSy6dL=5m%H>zWY>H{I`CVzt}sMyehA$jr&-7PpP*z
zM48ljF&z(>+8^ZC_}KfmbhqPb-)8xgH)l67pO-z~qM~p}$NWZ#hk(j5-lwf^Z+9IR
zc2RuKX)N84ko-LLoWpNbiHME=d^>D69Nu<9Q%!uM<ZTa$pAt4#PY3vf8_Y>)C=*$E
z`%UAe|2n@mpUG}^eHO=ZUMDN|=Mhak)*TB!DV*2nlr){SFL#&7L?v}&&wkHmlGl&k
z3^#C^8TY=sB=b?#=~rQg60Xlac=V9r%)_@Gyd?kf1a~&vU$Fg3$o1A5_JX^7TZ`vz
kyRg-4({opScL4{{nL7JKu02z^Frzkj_mi(*L+#BK0Mrvya{vGU

literal 1284
zcmezO_TO6u1_mY|W(3o$xs}<el|WwZ=M?`!2G$5YQv*u|29{$6O)Q6iIBx+n6C)E7
z3-jhFZw+|aI1}1D7*m;9n3-4^43Z7G4LI4DLs{5_nH)n6g$)Ej91dZw;{4oH-QtqO
zl2k)p18$HYyD&>~W=SQC%O%WGl3H8><8ni}LIwgL#mvH-Ir+(nIT`uIB?fZhyoQ#B
z21Z7PMux^F=27CjMg|6kMnDAS(#H`^%+3Z)Or~t?T5TTZELa$U91W%>Mn;DIO4FM=
zSH0Z7`fW$mdC$OYpY@K;vtDm5@#58yY4Ub|&Dfqh2d+FKVQjgB^ZB85GQqQ#yGOTP
z5L~-sOJ#ehXG><x8oqv!&1M`Li}Zh~3v$^et(@#?!nxpIW{z9L5AVAQjdRR77YKxJ
zoVxZbgR<?ekd|$l@^e%Ael)wZl~14ZhGmP%vNd|8FK5I)vfZGme^9Vz{;#=>jn9pH
zw@=z`aDC@v&q)0Y&KX6bmZGn0v%B4bj~To6H&`1jIrQLD(FD~zKl?6g4vU3H0-ikV
zk<wgTdp~ZW^F8mh|11;iuAUcDei(73{TRo~dPSKVvZs_!=UK3){!n`Cw9mtbwan5o
zLFQUIlPtroZ_}2wR(!vI@A<FvljX---y3Z*-u1NMz@Dp_vA{555L*@#q2Liv;8)7D
zczQSsugNVdlZt~OSDq|ApsS+yz<=5^IqwS-y!Ni?H-ESB!F<D}OEwdnPp9a2FgPZ>
z{dtOWvqIVOIY!IWKe^jYY@fa8$a9yy3XLH?TcaCv%zEWl*j?#->BqkyqtD2xE2iQ|
z#j##i_3bjVtafvAKh$x_m}dF>^0|`R0#d1~wA;V=WT@S?JFf2?I<wh(%i9h5H4|Pg
znRa<;Y;g4JKdx84Nq)1peY?BeQuWX$l?Ua9nz<|5-^jUp{HXgKe{Xw8i($5s(Y>d^
zch@rsYV*o7-7=VNr1DRF-L3Aq-kM4`cXdCWck?0hGMk`A?qeO>AH8)Jd-z`b_C4k%
zMm7d;V(Ivwa^*xCf4`dAl=JP8ftM>UwOE|@pV}R<=B8HN#r4K>bAx?@;}~~#+<$&D
z`H;k_JF0JPFEV9#`=hHyQe8{+*4$s38wIZ4VwKtL>G{X}=YhCWW|yTeW@NgXG)BZ#
zds;`Gx?25{^G)R|OCDc?$7jW})_#0?EwIB=YL8y!vxyNuOfQLedTczmWx~$gE9UHy
z(3;tKY5ByI{-1F-?eDhyHtx&*|1$NlU3bCNm7k8j-uUN&=CbbZre#H1nFpB8=}TMp
zUFs4KKIN6RSAeH<8@u^5hT<0!ST1S)x+<=7mFqH#WyaA{rE7H*E|y$T%xCS64DnwX
z9sJ9Aiu!KejQ;IS=cc}1tY{!_APdalvV1IJEF$cF_s{>Rd!chFaE0TeW*^TB+fS>a
z6*0{A3<fq#GI@XZ{#qSe&vSmU+w7*7a+Av!EV)*YW4Eo;V46LXjEr=))JsFI3h`V0
r8s!J7-<n@%D`!<JX;9z9`>6AF@lGefzZDlOIbZL}ipZSEbIb++TDk=j