From 81fdcd199f0f31140d0b70c207ef409968a9be21 Mon Sep 17 00:00:00 2001 From: Sergey Beryozkin Date: Tue, 29 Nov 2022 16:39:17 +0000 Subject: [PATCH] Fix a typo in the BC CredentialsProvider test --- .../it/bouncycastle/SecretProvider.java | 2 +- .../src/main/resources/application.properties | 2 +- .../src/main/resources/server-keystore.jks | Bin 2215 -> 2423 bytes .../BouncyCastleJsseTestCase.java | 2 +- .../src/test/resources/client-truststore.jks | Bin 925 -> 2423 bytes 5 files changed, 3 insertions(+), 3 deletions(-) diff --git a/integration-tests/bouncycastle-jsse/src/main/java/io/quarkus/it/bouncycastle/SecretProvider.java b/integration-tests/bouncycastle-jsse/src/main/java/io/quarkus/it/bouncycastle/SecretProvider.java index 9eed67c40298d..ba0332d277ffd 100644 --- a/integration-tests/bouncycastle-jsse/src/main/java/io/quarkus/it/bouncycastle/SecretProvider.java +++ b/integration-tests/bouncycastle-jsse/src/main/java/io/quarkus/it/bouncycastle/SecretProvider.java @@ -15,7 +15,7 @@ public class SecretProvider implements CredentialsProvider { @Override public Map getCredentials(String credentialsProviderName) { Map creds = new HashMap<>(); - creds.put("keystore-password", "password"); + creds.put("keystore-password", "secret"); creds.put("truststore-password", "password"); return creds; } diff --git a/integration-tests/bouncycastle-jsse/src/main/resources/application.properties b/integration-tests/bouncycastle-jsse/src/main/resources/application.properties index 40f0793cd8e70..3a28e5d45804b 100644 --- a/integration-tests/bouncycastle-jsse/src/main/resources/application.properties +++ b/integration-tests/bouncycastle-jsse/src/main/resources/application.properties @@ -1,7 +1,7 @@ quarkus.security.security-providers=BCJSSE quarkus.http.ssl.certificate.key-store-file=server-keystore.jks -quarkus.http.ssl.certificate.key-store-password-key=key-store-password +quarkus.http.ssl.certificate.key-store-password-key=keystore-password quarkus.http.ssl.certificate.trust-store-file=server-truststore.jks quarkus.http.ssl.certificate.trust-store-password-key=truststore-password quarkus.http.ssl.certificate.credentials-provider=custom diff --git a/integration-tests/bouncycastle-jsse/src/main/resources/server-keystore.jks b/integration-tests/bouncycastle-jsse/src/main/resources/server-keystore.jks index d8991ddbd627d40f0254ddae7fa7e78f412b4a23..da33e8e7a16683d421c7a541bf0013521efb605e 100644 GIT binary patch literal 2423 zcmY+Ec{~%0AIE2#F-FpI8zM)pZO%+?a+T&jV$IbY%k@ZZM$1*9ri;vxay*4aBw_4$0h-#_0-5;OwH0YZ|XDiG)?vL%_t$HB!x zB|#;@B&g`2eH=;R4EtBa=?x}vdL7#ChvN+4{ofUghXY6@fqx=NU=~sd!t;Oo@VPh` z{u^~hzxbJY7jese*aWc5)4oDTXGhGCMrd-AXW!cv zCg}`o^yK?#Xs29}+FQ4Jm72&uWtOZ&dicTsSGB!=c>+ur9lJb~mp}ASUUF&Es=lGy z+VQ?ibX2yEzsF8X6Zme24pl{6%VXKQV@zm6$W}X9%e!Y}7Ao-zkFojqZmCuGx!G#+ z9!$dh1#8p5t*xJnP%Dfd|j`>1KWp9eXqsx`4fNfvHdxMue#CqA+0pS z%H?XwL|58}{6wuY`6XexN0)7aOEIBC7W&0bva*xaX^s@j1Mc$EgYv3HYG}qR)@6E1 z9sZ=SWA=>?q}=1`nahTN@LxU$n`AfXlpXoB^Rjo`V7E^ibz^(hZw+7YLr)uf57!rP zXEZrD=#np7@i1u<8!HNR31(w$3~WbYo@RP^7ze}Y8s68R7)!Gr|A@zofo!j(f9-9& zt|f(cHh3+yrGt@E^XRKld?hY7m}l?16&b(El2&PZ#fh!;)JUNiUdrA!NL_ou0O7Qm zgtJvdlL_<>~?>DZfB(?++8+g+I%|eO<^9l29*{eo3XyO z0|G@+8yLwsv&v-USqPsm7HhV!TfBja}Xv0t->)dRA`PdfFb=Wid=7u4vzZ zf}0|Z8}YB*Td+KV4#-OIVMeFbTpKj1Pd*Byu3R-9!nT{UzPFYxJBz?$on49Vdp$yz zFj4y0BD+?uHpLvTVk<1~LFbr=0RPWZ3VOwgLcQ~aYG#F>KKCcoXZp5}_m)=tDWjBF z+qb!;{;MT!SuxxG84wxzpg?$WNigCO>%0W7-L1-;sFTycn;Ao|=bFRsh}?V(tiS!O z*ZL@nccj_iF^Hk$a!I6Xj?W312EL?Cc zu2^BrIfvd^+8b?0fpXxq6}C6kBIskuZ+-kLbTh+vb9XHS#WviSR z4hn@Nf%5+@aY3jg(9J_D9moMVT%>;zj(?FB@?X*lr#Zil4v2*GGjs&cw`M)3E#v$D zB5e{0WO++h>s!Yu;ZX1LV`)T!T~+p!H@S?mT8>feY)0+I<-W;zK(ywI9u08<&|n0? z7&J3ugoZ-g*`QZs#j&&U%h=az#QiH)dUA4K9u27TyL6u4yeR|E)og#v7wuC9oESMv zS3a%a$6OplbI3VhMbE|1*+QyPSEoMO{RmX{-&%GI87#E|8+|a=Ulhe--k>T%vJDL9Jgz18_Nr4p@ z+TdjVWhL*Xo?-85<3=wbX~2Q^?75kbu92zqXrFDbSU>F|{sn9I_x%?e!bfG+7OL+Q zrt^p(lZ$`PMqa#bOVmjGQtfAJN5YmeXch_GEGC1f$e*U_NwwQH;^X@2@ZtV5uHlug z=G#Z^g#?hRjS)A-U-mS~X& zD&}5ZyUgS078SQqm+1QjGj_T6b~pnV?&m*?cy(PN_q50_vfsF9c`4?N=?YxxjzuZ^ z!q*k0&hdG!NW@6gG3=s)Zfmi42$bv7KELgQpoFx**mel<=kj&h5jG*nG-y|cIre(` z=TnMyM_kwYg~a$qn!dXf7$dk=8NCk((7JJ^i=?zSnsQ+1G}-^+xVm&((Yv!SE^LT( zO1q~)BB8rhPP1qUKA208zYD9nTbJx`2iSqrERpIm;O~iJaJS`w=RHRG5vbrwfY^ZA zrOJvWA;gOu+x1|th3U(-ed}OPGm!(6v{n!eZGtJ?voNh8n(7Rn2^S3;Jtb&ZKG7zb zdiqMen)hrq#{Rkan2Q)dGA(Vs;mJ24zs8Y-NAp&&NCYXCk^RW)H;sYMQ;%*1>F7Ox z&7lkW)?gh;(|lW)AifN&+Qf~lDalth4Sk}qu36l;j;HH=0;C%j(6^t(QiGuN6E_6K z7mV2rZNIOz-Rbt@mMlbQ_91)lJzqK@5%7bPUrHE(;nW|&dRPd$kZv0`uy3qXser?_ zxaQN;d6-u<2W(o921pqs6vC;@4+4sD0>E(IxBCh|Sez3?#v7b1OUA>|ocRe1|6w#- aH~3Ca%|*I@e88To>+D>~J`lt~rv3-)J!2gJ literal 2215 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 IX&!X?zsYvI$p8QV diff --git a/integration-tests/bouncycastle-jsse/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleJsseTestCase.java b/integration-tests/bouncycastle-jsse/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleJsseTestCase.java index 13b16316d1b1c..26be3a6af710a 100644 --- a/integration-tests/bouncycastle-jsse/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleJsseTestCase.java +++ b/integration-tests/bouncycastle-jsse/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleJsseTestCase.java @@ -45,7 +45,7 @@ protected void doTestListProviders() { .setBaseUri(String.format("%s://%s", url.getProtocol(), url.getHost())) .setPort(url.getPort()) .setKeyStore("client-keystore.jks", "password") - .setTrustStore("client-truststore.jks", "password") + .setTrustStore("client-truststore.jks", "secret") .build(); RestAssured.given() .spec(spec) diff --git a/integration-tests/bouncycastle-jsse/src/test/resources/client-truststore.jks b/integration-tests/bouncycastle-jsse/src/test/resources/client-truststore.jks index 112fb9857fbd71c688d2bdd6ea2bf647790def70..da33e8e7a16683d421c7a541bf0013521efb605e 100644 GIT binary patch literal 2423 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 aH~3Ca%|*I@e88To>+D>~J`lt~rv3-)J!2gJ literal 925 zcmezO_TO6u1_mY|W(3o$xs}cI8JL?G`56qF7`d357#SJb>>3m5 zZ=H#Lv+59Q`XPs%cW*|zcHdloqAxePpx)#s-v#GfEiaLcc0X6@y`H-%=v#*1=Oe7K z)qW-B>_$?)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)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