From d60b4459bf16e710b66a74cebd1e4e8b7a48f515 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Fri, 17 Jan 2020 08:46:20 +0100 Subject: [PATCH 1/3] Fixes #2643 - Switch SslContextFactory.keystoreType from JKS to PKCS12. Updated old keystores to new PKCS12 keystores. Removed unused keystores and truststores. Signed-off-by: Simone Bordet --- .../eclipse/jetty/embedded/Http2Server.java | 5 +- .../eclipse/jetty/embedded/LikeJettyXml.java | 7 +- .../jetty/embedded/ManyConnectors.java | 5 +- .../embedded/src/main/resources/etc/keystore | Bin 3697 -> 0 bytes .../src/main/resources/etc/keystore.p12 | Bin 0 -> 2565 bytes .../src/main/resources/etc/keystore.pkf | 20 ------ .../server/ConscryptHTTP2ServerTest.java | 6 +- .../src/test/resources/keystore | Bin 2206 -> 0 bytes .../src/test/resources/keystore.p12 | Bin 0 -> 2565 bytes .../jetty/alpn/java/server/JDK9ALPNTest.java | 5 +- .../alpn/java/server/JDK9HTTP2Server.java | 5 +- .../src/test/resources/keystore.jks | Bin 3697 -> 0 bytes .../src/test/resources/keystore.p12 | Bin 0 -> 2565 bytes jetty-distribution/pom.xml | 2 +- .../connectors/configuring-ssl.adoc | 4 +- .../proxy/DrupalHTTP2FastCGIProxyServer.java | 4 +- .../fcgi/server/proxy/TryFilesFilterTest.java | 6 +- .../WordPressHTTP2FastCGIProxyServer.java | 4 +- .../src/test/resources/keystore.jks | Bin 2206 -> 0 bytes .../src/test/resources/keystore.p12 | Bin 0 -> 2565 bytes .../src/test/resources/truststore.jks | Bin 916 -> 0 bytes jetty-http/src/test/resources/keystore | Bin 1426 -> 0 bytes .../client/http/DirectHTTP2OverTLSTest.java | 2 +- .../src/test/resources/keystore.jks | Bin 2206 -> 0 bytes .../src/test/resources/keystore.p12 | Bin 0 -> 2565 bytes .../jetty/io/SocketChannelEndPointTest.java | 3 +- .../eclipse/jetty/io/SslConnectionTest.java | 3 +- .../jetty/io/SslEngineBehaviorTest.java | 3 +- jetty-io/src/test/resources/keystore | Bin 1426 -> 0 bytes jetty-io/src/test/resources/keystore.p12 | Bin 0 -> 2565 bytes .../jetty/jmx/ConnectorServerTest.java | 2 +- jetty-jmx/src/test/resources/keystore.jks | Bin 2206 -> 0 bytes jetty-jmx/src/test/resources/keystore.p12 | Bin 0 -> 2565 bytes .../src/main/resources/keystore.jks | Bin 2206 -> 0 bytes .../src/main/resources/truststore.jks | Bin 916 -> 0 bytes .../src/test/config/etc/jetty-ssl.xml | 4 +- .../src/test/config/etc/keystore | Bin 2206 -> 0 bytes .../src/test/config/etc/keystore.p12 | Bin 0 -> 2565 bytes .../test/TestJettyOSGiBootHTTP2Conscrypt.java | 6 +- .../osgi/test/TestJettyOSGiBootHTTP2JDK9.java | 6 +- .../ClientCertAuthenticator.java | 6 +- .../src/main/config/etc/jetty-ssl-context.xml | 4 +- jetty-server/src/main/config/modules/ssl.mod | 4 +- .../src/main/config/modules/test-keystore.mod | 11 ++- .../config/modules/test-keystore/keystore | Bin 3697 -> 0 bytes .../config/modules/test-keystore/keystore.p12 | Bin 0 -> 2565 bytes jetty-server/src/test/config/etc/keystore | Bin 3697 -> 0 bytes jetty-server/src/test/config/etc/keystore.pkf | 20 ------ .../jetty/server/ConnectionOpenCloseTest.java | 3 +- .../server/OptionalSslConnectionTest.java | 3 +- .../jetty/server/ThreadStarvationTest.java | 5 +- .../server/handler/DebugHandlerTest.java | 5 +- .../handler/SecuredRedirectHandlerTest.java | 5 +- .../jetty/server/ssl/SSLCloseTest.java | 3 +- .../jetty/server/ssl/SSLEngineTest.java | 3 +- .../ssl/SSLReadEOFAfterResponseTest.java | 3 +- .../SSLSelectChannelConnectorLoadTest.java | 5 +- .../ssl/SelectChannelServerSslTest.java | 5 +- .../jetty/server/ssl/SlowClientsTest.java | 3 +- .../ssl/SniSslConnectionFactoryTest.java | 3 +- .../server/ssl/SslConnectionFactoryTest.java | 7 +- .../ssl/SslContextFactoryReloadTest.java | 6 +- .../ssl/SslSelectChannelTimeoutTest.java | 5 +- .../jetty/server/ssl/SslUploadTest.java | 5 +- jetty-server/src/test/resources/keystore | Bin 3697 -> 0 bytes jetty-server/src/test/resources/keystore.p12 | Bin 0 -> 2565 bytes .../src/test/resources/keystore_sni.p12 | Bin 7412 -> 8255 bytes .../test/resources/keystore_sni_nowild.p12 | Bin 4134 -> 4637 bytes .../src/test/resources/reload_keystore_1.jks | Bin 2243 -> 0 bytes .../src/test/resources/reload_keystore_1.p12 | Bin 0 -> 2581 bytes .../src/test/resources/reload_keystore_2.jks | Bin 2245 -> 0 bytes .../src/test/resources/reload_keystore_2.p12 | Bin 0 -> 2581 bytes .../jetty/servlet/SSLAsyncIOServletTest.java | 5 +- jetty-servlet/src/test/resources/keystore.jks | Bin 2206 -> 0 bytes jetty-servlet/src/test/resources/keystore.p12 | Bin 0 -> 2565 bytes .../src/test/resources/truststore.jks | Bin 916 -> 0 bytes .../jetty/util/ssl/SslContextFactory.java | 8 +-- .../jetty/util/ssl/SslContextFactoryTest.java | 68 ++++++------------ .../org/eclipse/jetty/util/ssl/X509Test.java | 12 ++-- jetty-util/src/test/resources/keystore | Bin 1426 -> 0 bytes jetty-util/src/test/resources/keystore.jks | Bin 0 -> 2279 bytes jetty-util/src/test/resources/keystore.p12 | Bin 2533 -> 4936 bytes .../src/test/resources/keystore_sni.p12 | Bin 7412 -> 8255 bytes jetty-util/src/test/resources/snikeystore | Bin 6462 -> 0 bytes jetty-util/src/test/resources/snikeystore.p12 | Bin 0 -> 7303 bytes .../websocket/core/WebSocketCloseTest.java | 2 +- .../src/test/resources/keystore.jks | Bin 2206 -> 0 bytes .../src/test/resources/keystore.p12 | Bin 0 -> 2565 bytes .../websocket/javax/tests/LocalServer.java | 3 +- .../src/test/resources/keystore | Bin 1426 -> 0 bytes .../src/test/resources/keystore.p12 | Bin 0 -> 2565 bytes tests/jetty-jmh/src/main/resources/keystore | Bin 1426 -> 0 bytes .../jetty/http/client/HttpClientTest.java | 6 +- .../HttpClientTransportDynamicTest.java | 2 +- .../client/ProxyWithDynamicTransportTest.java | 4 +- .../jetty/http/client/TransportScenario.java | 4 +- .../src/test/resources/keystore.jks | Bin 2206 -> 0 bytes .../src/test/resources/keystore.p12 | Bin 0 -> 2565 bytes .../src/test/resources/truststore.jks | Bin 916 -> 0 bytes .../jetty/test/HttpInputIntegrationTest.java | 5 +- .../src/test/resources/keystore | Bin 1426 -> 0 bytes .../src/test/resources/ssl.xml | 4 +- .../src/test/resources/keystore | Bin 1426 -> 0 bytes .../jetty/test/webapp/HTTP2FromWebAppIT.java | 2 +- .../src/test/resources/keystore.jks | Bin 2206 -> 0 bytes .../src/test/resources/keystore.p12 | Bin 0 -> 2565 bytes tests/test-webapps/test-proxy-webapp/pom.xml | 2 +- .../jetty/TestTransparentProxyServer.java | 5 +- 108 files changed, 111 insertions(+), 237 deletions(-) delete mode 100644 examples/embedded/src/main/resources/etc/keystore create mode 100644 examples/embedded/src/main/resources/etc/keystore.p12 delete mode 100644 examples/embedded/src/main/resources/etc/keystore.pkf delete mode 100644 jetty-alpn/jetty-alpn-conscrypt-server/src/test/resources/keystore create mode 100644 jetty-alpn/jetty-alpn-conscrypt-server/src/test/resources/keystore.p12 delete mode 100644 jetty-alpn/jetty-alpn-java-server/src/test/resources/keystore.jks create mode 100644 jetty-alpn/jetty-alpn-java-server/src/test/resources/keystore.p12 delete mode 100644 jetty-fcgi/fcgi-server/src/test/resources/keystore.jks create mode 100644 jetty-fcgi/fcgi-server/src/test/resources/keystore.p12 delete mode 100644 jetty-fcgi/fcgi-server/src/test/resources/truststore.jks delete mode 100644 jetty-http/src/test/resources/keystore delete mode 100644 jetty-http2/http2-http-client-transport/src/test/resources/keystore.jks create mode 100644 jetty-http2/http2-http-client-transport/src/test/resources/keystore.p12 delete mode 100644 jetty-io/src/test/resources/keystore create mode 100644 jetty-io/src/test/resources/keystore.p12 delete mode 100644 jetty-jmx/src/test/resources/keystore.jks create mode 100644 jetty-jmx/src/test/resources/keystore.p12 delete mode 100644 jetty-osgi/test-jetty-osgi/src/main/resources/keystore.jks delete mode 100644 jetty-osgi/test-jetty-osgi/src/main/resources/truststore.jks delete mode 100644 jetty-osgi/test-jetty-osgi/src/test/config/etc/keystore create mode 100644 jetty-osgi/test-jetty-osgi/src/test/config/etc/keystore.p12 delete mode 100644 jetty-server/src/main/config/modules/test-keystore/keystore create mode 100644 jetty-server/src/main/config/modules/test-keystore/keystore.p12 delete mode 100644 jetty-server/src/test/config/etc/keystore delete mode 100644 jetty-server/src/test/config/etc/keystore.pkf delete mode 100644 jetty-server/src/test/resources/keystore create mode 100644 jetty-server/src/test/resources/keystore.p12 delete mode 100644 jetty-server/src/test/resources/reload_keystore_1.jks create mode 100644 jetty-server/src/test/resources/reload_keystore_1.p12 delete mode 100644 jetty-server/src/test/resources/reload_keystore_2.jks create mode 100644 jetty-server/src/test/resources/reload_keystore_2.p12 delete mode 100644 jetty-servlet/src/test/resources/keystore.jks create mode 100644 jetty-servlet/src/test/resources/keystore.p12 delete mode 100644 jetty-servlet/src/test/resources/truststore.jks delete mode 100644 jetty-util/src/test/resources/keystore create mode 100644 jetty-util/src/test/resources/keystore.jks delete mode 100644 jetty-util/src/test/resources/snikeystore create mode 100644 jetty-util/src/test/resources/snikeystore.p12 delete mode 100644 jetty-websocket/websocket-core/src/test/resources/keystore.jks create mode 100644 jetty-websocket/websocket-core/src/test/resources/keystore.p12 delete mode 100644 jetty-websocket/websocket-javax-tests/src/test/resources/keystore create mode 100644 jetty-websocket/websocket-javax-tests/src/test/resources/keystore.p12 delete mode 100644 tests/jetty-jmh/src/main/resources/keystore delete mode 100644 tests/test-http-client-transport/src/test/resources/keystore.jks create mode 100644 tests/test-http-client-transport/src/test/resources/keystore.p12 delete mode 100644 tests/test-http-client-transport/src/test/resources/truststore.jks delete mode 100644 tests/test-integration/src/test/resources/keystore delete mode 100644 tests/test-sessions/test-mongodb-sessions/src/test/resources/keystore delete mode 100644 tests/test-webapps/test-http2-webapp/src/test/resources/keystore.jks create mode 100644 tests/test-webapps/test-http2-webapp/src/test/resources/keystore.p12 diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/Http2Server.java b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/Http2Server.java index 4250b1cdb98..22dfd38702a 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/Http2Server.java +++ b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/Http2Server.java @@ -100,13 +100,12 @@ public class Http2Server server.addConnector(http); // SSL Context Factory for HTTPS and HTTP/2 - Path keystorePath = Paths.get("src/main/resources/etc/keystore").toAbsolutePath(); + Path keystorePath = Paths.get("src/main/resources/etc/keystore.p12").toAbsolutePath(); if (!Files.exists(keystorePath)) throw new FileNotFoundException(keystorePath.toString()); SslContextFactory.Server sslContextFactory = new SslContextFactory.Server(); sslContextFactory.setKeyStorePath(keystorePath.toString()); - sslContextFactory.setKeyStorePassword("OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"); - sslContextFactory.setKeyManagerPassword("OBF:1u2u1wml1z7s1z7a1wnl1u2g"); + sslContextFactory.setKeyStorePassword("storepwd"); sslContextFactory.setCipherComparator(HTTP2Cipher.COMPARATOR); // sslContextFactory.setProvider("Conscrypt"); diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/LikeJettyXml.java b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/LikeJettyXml.java index 08f305f8ac6..ea16f69c68b 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/LikeJettyXml.java +++ b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/LikeJettyXml.java @@ -124,15 +124,14 @@ public class LikeJettyXml // === jetty-https.xml === // SSL Context Factory - Path keystorePath = Paths.get("src/main/resources/etc/keystore").toAbsolutePath(); + Path keystorePath = Paths.get("src/main/resources/etc/keystore.p12").toAbsolutePath(); if (!Files.exists(keystorePath)) throw new FileNotFoundException(keystorePath.toString()); SslContextFactory.Server sslContextFactory = new SslContextFactory.Server(); sslContextFactory.setKeyStorePath(keystorePath.toString()); - sslContextFactory.setKeyStorePassword("OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"); - sslContextFactory.setKeyManagerPassword("OBF:1u2u1wml1z7s1z7a1wnl1u2g"); + sslContextFactory.setKeyStorePassword("storepwd"); sslContextFactory.setTrustStorePath(keystorePath.toString()); - sslContextFactory.setTrustStorePassword("OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"); + sslContextFactory.setTrustStorePassword("storepwd"); // SSL HTTP Configuration HttpConfiguration httpsConfig = new HttpConfiguration(httpConfig); diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyConnectors.java b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyConnectors.java index 03ff66b6fed..40d4f1c2e34 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyConnectors.java +++ b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyConnectors.java @@ -42,7 +42,7 @@ public class ManyConnectors { // Since this example shows off SSL configuration, we need a keystore // with the appropriate key. - Path keystorePath = Paths.get("src/main/resources/etc/keystore").toAbsolutePath(); + Path keystorePath = Paths.get("src/main/resources/etc/keystore.p12").toAbsolutePath(); if (!Files.exists(keystorePath)) throw new FileNotFoundException(keystorePath.toString()); @@ -81,8 +81,7 @@ public class ManyConnectors SslContextFactory.Server sslContextFactory = new SslContextFactory.Server(); sslContextFactory.setKeyStorePath(keystorePath.toString()); - sslContextFactory.setKeyStorePassword("OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"); - sslContextFactory.setKeyManagerPassword("OBF:1u2u1wml1z7s1z7a1wnl1u2g"); + sslContextFactory.setKeyStorePassword("storepwd"); // OPTIONAL: Un-comment the following to use Conscrypt for SSL instead of // the native JSSE implementation. diff --git a/examples/embedded/src/main/resources/etc/keystore b/examples/embedded/src/main/resources/etc/keystore deleted file mode 100644 index d6592f95ee93575d659f28e1c2ebb81191484986..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3697 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 diff --git a/examples/embedded/src/main/resources/etc/keystore.p12 b/examples/embedded/src/main/resources/etc/keystore.p12 new file mode 100644 index 0000000000000000000000000000000000000000..e4657280ca540596f3abd3ab6c786355d0a24276 GIT binary patch literal 2565 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 NnR_g#fmC7He*w>()F}V} literal 0 HcmV?d00001 diff --git a/examples/embedded/src/main/resources/etc/keystore.pkf b/examples/embedded/src/main/resources/etc/keystore.pkf deleted file mode 100644 index 443818e87df..00000000000 --- a/examples/embedded/src/main/resources/etc/keystore.pkf +++ /dev/null @@ -1,20 +0,0 @@ -Bag Attributes - friendlyName: jetty - localKeyID: 54 69 6D 65 20 31 34 32 33 31 39 38 30 39 33 31 31 35 -Key Attributes: ------BEGIN PRIVATE KEY----- -MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAIPh4Q0t4xklXTzX -N2VAb47r5n7idAupp4CTNEhhT6lS70iA+A8i4+0lSEHWAogvd9jl3H7SvScr30QM -4ieC0JCGSOwGc8f+yqKrO56PPd5OuqW380BJ0r74jJczU9CcsuavHD7e6mRLUnmj -xM20NSxrcicMiPUHY1mJZtN9swtxAgMBAAECgYADS9P6Jll0uXBZIu/pgfDH27GJ -HlPULstW9VbrMDNzgfUlFMQebLrRpIrnyleJ29Xc//HA4beEkR4lb0T/w88+pEkt -7fhYeqRLPIfpDOgzloynnsoPcd8f/PypbimQrNLmBiG1178nVcy4Yoh5lYVIJwtU -3VriqDlvAfTLrrx8AQJBAMLWuh27Hb8xs3LRg4UD7hcv8tJejstm08Y+czRz7cO0 -RENa3aDjGFSegc+IUfdez7BP8uDw+PwE+jybmTvaliECQQCtR/anCY1WS28/bKvy -lmIwoI15eraBdVFkN0Hfxh+9PfR3rMD5uyvukT5GgTtY/XxADyafSTaipDJiZHJI -EitRAkBjeCBYYVjUbVlBuvi8Bb+dktsSzzdzXDGtueAy3SR7jyJyiIcxRf775Fg9 -TUkbUwoQ5yAF+sACWcAvBPj796JBAkAEZEeHEkHnxv+pztpIyrDwZJFRW9/WRh/q -90+PGVlilXhltBYr/idt43Z9mPblGX+VrAyhitx8oMa6IauX0gYRAkEAgnyVeXrD -jDLUZRA3P8Gu27k1k6GjbTYiUz3HKCz2/6+MZ2MK2qqwafgqocji029Q6dHdPD7a -4QnRlvraUnyQLA== ------END PRIVATE KEY----- diff --git a/jetty-alpn/jetty-alpn-conscrypt-server/src/test/java/org/eclipse/jetty/alpn/conscrypt/server/ConscryptHTTP2ServerTest.java b/jetty-alpn/jetty-alpn-conscrypt-server/src/test/java/org/eclipse/jetty/alpn/conscrypt/server/ConscryptHTTP2ServerTest.java index bd42c9d5d9b..92c09d3b7e7 100644 --- a/jetty-alpn/jetty-alpn-conscrypt-server/src/test/java/org/eclipse/jetty/alpn/conscrypt/server/ConscryptHTTP2ServerTest.java +++ b/jetty-alpn/jetty-alpn-conscrypt-server/src/test/java/org/eclipse/jetty/alpn/conscrypt/server/ConscryptHTTP2ServerTest.java @@ -79,11 +79,9 @@ public class ConscryptHTTP2ServerTest private void configureSslContextFactory(SslContextFactory sslContextFactory) { Path path = Paths.get("src", "test", "resources"); - File keys = path.resolve("keystore").toFile(); + File keys = path.resolve("keystore.p12").toFile(); sslContextFactory.setKeyStorePath(keys.getAbsolutePath()); - sslContextFactory.setKeyManagerPassword("OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"); - sslContextFactory.setTrustStorePath(keys.getAbsolutePath()); - sslContextFactory.setTrustStorePassword("OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"); + sslContextFactory.setKeyStorePassword("OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"); sslContextFactory.setProvider("Conscrypt"); if (JavaVersion.VERSION.getPlatform() < 9) { diff --git a/jetty-alpn/jetty-alpn-conscrypt-server/src/test/resources/keystore b/jetty-alpn/jetty-alpn-conscrypt-server/src/test/resources/keystore deleted file mode 100644 index 428ba54776ede2fdcdeedd879edb927c2abd9953..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2206 zcmcgt`9Bkm8{cNkoMUp6gmShKn!AQX*(l6Nj(i=TnQPOKYtv{*Wg>ItE=Q!pRYH8a z$Sp#S#2lYw#aw;$y9u4T}83H*%lp zAKZay0sy=q1Qoo85aAQh;$ zD(c2EIN#D7WwYDLKUg!CotQPD@dp;5FR#bgaace(^x$6g5frD~(_b(MI^J&*A2DRp zf5Q2onfE(zvUb9|9C`66)YFRNM6~xrz4;iVbU=P|*YT2eWHFJJtr+M@zt2qPm)K~rRcqcs=LM12)PX0TT%QO zlf*xkqD3}7l)1J`5W(>=9nR0e6j-<79<11v3ZuXXcQpoCsqY~n`$FN+S}hcVm5Y>G zXnD{@DYs1@{S0z(lW+?86LWKtku$$-(khsh>0qRUXn=84`GRn?77M^_JY`durnN;KE zW#OJ`h<6xcB{I))ekGpc*Ylt}0cx4|OMBDPQvx4`r`}4Ze5_ipdObGMTi3bZHd5PC zcY0;?uBWu$PSvjJeb87nY7ghNv?%M@SoDl6IWt`bQCosfSh$#D6$ea~QhKM^ud2Ut z+9PYJuVpoELmN-A`F$BicO{BSYg@#tS%avVfb}DxL)|NanJ)#zB!2~?#Ot%H7--9N zU$bs0fS5G!m5M4&WK3#a|H|Tgw*?X-;H+Lu@kwA>qSR~7UC7b)7MJXTn6PG>n@8jP zW+}F^X$$c;U~4ryqRF; z>`j!tbLMK4ZGyY643|~?%Mu#fm!l%wAKjBDmd+VYmp3S#$scD$~bxbf|z#)hShN0*AhRaPDcmqrftGlHq4^54MM$Xfy(2> zH8QYVMzmn_oHbvJCB`IN~E&{1*h&0gEM{e zKvWvzp(!BqMX8`t#)~0nq}Wa zr6>FRPyp;AAB&)1$5@;r$23J{K&~>TWjZf7V$wFzmGM95CXhFG1cJNVAXks}C+&2- zbf9Qn*D8N}Afd2kpwDxns3%1uaFhAqDV8ksWiWY|quuLGZ0)SqrJ!Y8yX}@}IyC$C zQ3rCUsn}#>F#D8%D?q~ySy4j&he%Bs{{7V%rl!ui`@KQP?NTi+_iN{cwom&9RaMRR zB~z!hz|0HAgB9_Ijvpe-zr#jLbckJsc>vmo{+im?t8lA;N#fD4?{lb&J0V8Gocq%; f1ihv=QIDh{M_<9V+45Z2{KE4_qW}V3B0uV%GgrOJ diff --git a/jetty-alpn/jetty-alpn-conscrypt-server/src/test/resources/keystore.p12 b/jetty-alpn/jetty-alpn-conscrypt-server/src/test/resources/keystore.p12 new file mode 100644 index 0000000000000000000000000000000000000000..e4b6d7fb090d82dafe0085c163ed498a2a0cbef2 GIT binary patch literal 2565 zcmY+EXE+;*8pjhMwo`kzF;jI)kf=2F9z9|ehpJJvX^lpmQWY9%6RKuZYpYSKV$X_E zyQsal+9lR??{n`t&;9T|@ALfr@B9DwgJJ1_6hIIROG^aP-ok0)elY^6ftgs^LP{)c z?iKz3!%{i^Uqoe2iKQ~R!Uk7!4^02xFNUk4Of2Oo3`_Y7CI+VaAHFK*rDQ{1a+m7I zt~GDr2n=wiY&IAJT#o_-Xf>e3Qg#xZPn%AL_I&*O8pOtFMmo2)jF^Kr$oDb}DQxdWaR~H#<(Xq6$x^X-#iVz76v6&`OZP$mj2%)HB0VUUizW%pAsTrMwo&n@Syu!Tgt16TmrO2NT`5B8^BvozJ z?apgz{Z$o3F9u~2rtw1B}2*dt`sPX35M%NmpJQ-xU-3CxUAq?mt%6HVbh7zGW6%A)1i9RUlLFen)N>}~ zeD`i}777xVNUte!q~#8-G#Vy)(@TEU>6yI&2_(|on=Gc@PWN#x8T$R4Q`CfJm~T9p zce7In{h(xV!i|U1Wn7NVG#baX!dH&%vst>9h_8|+r+=ha zllBQ(X#|vYu4H@-9#<^O)|9Pt$tQ;0{4*%LblI=?mISn7&uR?jbY6WD4mB`nPw?j` za($WzA-7mld^-5xt`xzVUqwmllvK{V9%L4WlaaNO`3o}z?%i@b3J#_6<0XYL+;4Lb zTFVW|%aP`SvdSe3jw;tP=)O3eCs754-2PK2Dw3!q+pYhoD9qDBSM0&ztpJ$gnVt7) z+Z_0(u$Lka+#+k=pdnhcNWtRbcd?%q**fkc&l7j8K|8W#;M?gszo^|Qb*X9c?6+(WJHkcPMf$s#^xN#;phYVSX^d59 zu4*g)Z2yONMc0^VeBOwsy026tUbgl{u}j{9s>O6|1#s1>J&kvyiJL|V6JMP9tDSq9 z`B5*bkZGbf>Ap~*5YnsQRV9~!p3C{Vu#TROqY02|uO7M-lb)-Jv~=oj6L9plmQsXq z|E)?|HYtYdbO3jNAHWsx7~lsJ_$OkQVxwd+adv+UkwV--N+Dr#(nx6}>`I;RzmKTF zS2h*7LIM;(z}4dUCjtJSU%~(Ot06u`sNW8mG(}Rk4T>O72};yL{^QqISkSDSQraQ+ zz;Z|7Vv!)`C6+qhW~-9=TsCKVCek$mC5Xq1cKFyL`>9a*`RyBC+;Foc=O`9{t z{5Xj+1e&QMgk`RuomhuiGgV9B((5hP1tzGf9Ok*V)ZqgHs)3RrSiP}U2?da5h#5Dh zT#PVvTAQUAd+hoXu>Xz*zp@aYr^|Q6``L{HIm{>Dj6!c~X^4eu7kP$gzUDl?{8>H8 zFWNoQeLbe2QB|I7rtl|k+4Pc$xu>k%-~tEj4&<{5{3}nD`nrF{>$OdY#$`w^abB9m z)H`ZRclbw^7pB%e_+09kuY5JY9)GiVJyz9lH&k z-9uh?w~hZKg5)ic@7-<^AFuAYNC?2=R`xVBC()niG)kgYKWL1;Eth#wgz@`!3Z|Rz z9-Tas@G6tE$gd~Sn7>O2Jw(yVRCsaoMhCIigWkk04^(%Ci`0m3Z)c<*ZKfnBvt|py zumC872*oN$=Qn0#W?ozf@>e^$PY^$ zAp_bR!9KI>phKB0!sn9uQEx`O(nk>nO|wvvxuj7OMPXcvR}%~Uv+|HAb1;4Ks0kcSV#c#^lq33^JM5@b`jUkAQ_tHqiX8GcIt%SNw@*b@KYAXWUA>~7hMVy0Aqh2CL3Rm?_Bv2(OhuAX3T+OCq% zj>nX1vSdkM-zAy3Eg<`h;>wS@U8`cO-@k7gAH;1)S zzwtG_nx_$C7WHGi%qltzqz$8H_Il$A4`+dL?1D6?usq+yIbCY53jLHTkByohrU(;& z(SoVOnLrdgQ~*l0uyd_Gc};m=TSCA%kzPNm;pmv1k}bM<;aol60fkdw6j4#b;8)PM KVH6-BF7sdSkGISK literal 0 HcmV?d00001 diff --git a/jetty-alpn/jetty-alpn-java-server/src/test/java/org/eclipse/jetty/alpn/java/server/JDK9ALPNTest.java b/jetty-alpn/jetty-alpn-java-server/src/test/java/org/eclipse/jetty/alpn/java/server/JDK9ALPNTest.java index 4542ad6819b..b524d17fec9 100644 --- a/jetty-alpn/jetty-alpn-java-server/src/test/java/org/eclipse/jetty/alpn/java/server/JDK9ALPNTest.java +++ b/jetty-alpn/jetty-alpn-java-server/src/test/java/org/eclipse/jetty/alpn/java/server/JDK9ALPNTest.java @@ -83,9 +83,8 @@ public class JDK9ALPNTest private SslContextFactory.Server newServerSslContextFactory() { SslContextFactory.Server sslContextFactory = new SslContextFactory.Server(); - sslContextFactory.setKeyStorePath("src/test/resources/keystore.jks"); - sslContextFactory.setKeyStorePassword("OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"); - sslContextFactory.setKeyManagerPassword("OBF:1u2u1wml1z7s1z7a1wnl1u2g"); + sslContextFactory.setKeyStorePath("src/test/resources/keystore.p12"); + sslContextFactory.setKeyStorePassword("storepwd"); // The mandatory HTTP/2 cipher. sslContextFactory.setIncludeCipherSuites("TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256"); return sslContextFactory; diff --git a/jetty-alpn/jetty-alpn-java-server/src/test/java/org/eclipse/jetty/alpn/java/server/JDK9HTTP2Server.java b/jetty-alpn/jetty-alpn-java-server/src/test/java/org/eclipse/jetty/alpn/java/server/JDK9HTTP2Server.java index 6df4f828f7c..36138a935a2 100644 --- a/jetty-alpn/jetty-alpn-java-server/src/test/java/org/eclipse/jetty/alpn/java/server/JDK9HTTP2Server.java +++ b/jetty-alpn/jetty-alpn-java-server/src/test/java/org/eclipse/jetty/alpn/java/server/JDK9HTTP2Server.java @@ -46,9 +46,8 @@ public class JDK9HTTP2Server httpsConfig.addCustomizer(new SecureRequestCustomizer()); SslContextFactory.Server sslContextFactory = new SslContextFactory.Server(); - sslContextFactory.setKeyStorePath("src/test/resources/keystore.jks"); - sslContextFactory.setKeyStorePassword("OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"); - sslContextFactory.setKeyManagerPassword("OBF:1u2u1wml1z7s1z7a1wnl1u2g"); + sslContextFactory.setKeyStorePath("src/test/resources/keystore.p12"); + sslContextFactory.setKeyStorePassword("storepwd"); sslContextFactory.setCipherComparator(HTTP2Cipher.COMPARATOR); HttpConnectionFactory http = new HttpConnectionFactory(httpsConfig); diff --git a/jetty-alpn/jetty-alpn-java-server/src/test/resources/keystore.jks b/jetty-alpn/jetty-alpn-java-server/src/test/resources/keystore.jks deleted file mode 100644 index d6592f95ee93575d659f28e1c2ebb81191484986..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3697 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 diff --git a/jetty-alpn/jetty-alpn-java-server/src/test/resources/keystore.p12 b/jetty-alpn/jetty-alpn-java-server/src/test/resources/keystore.p12 new file mode 100644 index 0000000000000000000000000000000000000000..a82f9773690c483271585dd93b3149846c527ac4 GIT binary patch literal 2565 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 - + diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/connectors/configuring-ssl.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/connectors/configuring-ssl.adoc index 47824171f6a..c98f63e231b 100644 --- a/jetty-documentation/src/main/asciidoc/distribution-guide/connectors/configuring-ssl.adoc +++ b/jetty-documentation/src/main/asciidoc/distribution-guide/connectors/configuring-ssl.adoc @@ -386,9 +386,9 @@ ____ [source%nowrap,plain,linenums] ---- $ cd $JETTY_BASE -$ keytool -list -keystore etc/keystore -storetype jks -storepass '' -v +$ keytool -v -list -keystore etc/keystore -Keystore type: JKS +Keystore type: PKCS12 Keystore provider: SUN Your keystore contains 3 entries diff --git a/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/proxy/DrupalHTTP2FastCGIProxyServer.java b/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/proxy/DrupalHTTP2FastCGIProxyServer.java index d5ff9bf41eb..0a81190dcd8 100644 --- a/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/proxy/DrupalHTTP2FastCGIProxyServer.java +++ b/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/proxy/DrupalHTTP2FastCGIProxyServer.java @@ -37,10 +37,8 @@ public class DrupalHTTP2FastCGIProxyServer public static void main(String[] args) throws Exception { SslContextFactory.Server sslContextFactory = new SslContextFactory.Server(); - sslContextFactory.setKeyStorePath("src/test/resources/keystore.jks"); + sslContextFactory.setKeyStorePath("src/test/resources/keystore.p12"); sslContextFactory.setKeyStorePassword("storepwd"); - sslContextFactory.setTrustStorePath("src/test/resources/truststore.jks"); - sslContextFactory.setTrustStorePassword("storepwd"); sslContextFactory.setCipherComparator(new HTTP2Cipher.CipherComparator()); Server server = new Server(); diff --git a/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/proxy/TryFilesFilterTest.java b/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/proxy/TryFilesFilterTest.java index 707d62477e1..dc785eb841e 100644 --- a/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/proxy/TryFilesFilterTest.java +++ b/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/proxy/TryFilesFilterTest.java @@ -55,7 +55,7 @@ public class TryFilesFilterTest server.addConnector(connector); SslContextFactory.Server serverSslContextFactory = new SslContextFactory.Server(); - serverSslContextFactory.setKeyStorePath("src/test/resources/keystore.jks"); + serverSslContextFactory.setKeyStorePath("src/test/resources/keystore.p12"); serverSslContextFactory.setKeyStorePassword("storepwd"); sslConnector = new ServerConnector(server, serverSslContextFactory); server.addConnector(sslConnector); @@ -71,10 +71,8 @@ public class TryFilesFilterTest ClientConnector clientConnector = new ClientConnector(); SslContextFactory.Client clientSslContextFactory = new SslContextFactory.Client(); clientSslContextFactory.setEndpointIdentificationAlgorithm(null); - clientSslContextFactory.setKeyStorePath("src/test/resources/keystore.jks"); + clientSslContextFactory.setKeyStorePath("src/test/resources/keystore.p12"); clientSslContextFactory.setKeyStorePassword("storepwd"); - clientSslContextFactory.setTrustStorePath("src/test/resources/truststore.jks"); - clientSslContextFactory.setTrustStorePassword("storepwd"); clientConnector.setSslContextFactory(clientSslContextFactory); client = new HttpClient(new HttpClientTransportOverHTTP(clientConnector)); server.addBean(client); diff --git a/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/proxy/WordPressHTTP2FastCGIProxyServer.java b/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/proxy/WordPressHTTP2FastCGIProxyServer.java index 9a2e2a2d5db..f8aa371c7bd 100644 --- a/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/proxy/WordPressHTTP2FastCGIProxyServer.java +++ b/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/proxy/WordPressHTTP2FastCGIProxyServer.java @@ -43,10 +43,8 @@ public class WordPressHTTP2FastCGIProxyServer int tlsPort = 8443; SslContextFactory.Server sslContextFactory = new SslContextFactory.Server(); - sslContextFactory.setKeyStorePath("src/test/resources/keystore.jks"); + sslContextFactory.setKeyStorePath("src/test/resources/keystore.p12"); sslContextFactory.setKeyStorePassword("storepwd"); - sslContextFactory.setTrustStorePath("src/test/resources/truststore.jks"); - sslContextFactory.setTrustStorePassword("storepwd"); sslContextFactory.setCipherComparator(new HTTP2Cipher.CipherComparator()); Server server = new Server(); diff --git a/jetty-fcgi/fcgi-server/src/test/resources/keystore.jks b/jetty-fcgi/fcgi-server/src/test/resources/keystore.jks deleted file mode 100644 index 428ba54776ede2fdcdeedd879edb927c2abd9953..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2206 zcmcgt`9Bkm8{cNkoMUp6gmShKn!AQX*(l6Nj(i=TnQPOKYtv{*Wg>ItE=Q!pRYH8a z$Sp#S#2lYw#aw;$y9u4T}83H*%lp zAKZay0sy=q1Qoo85aAQh;$ zD(c2EIN#D7WwYDLKUg!CotQPD@dp;5FR#bgaace(^x$6g5frD~(_b(MI^J&*A2DRp zf5Q2onfE(zvUb9|9C`66)YFRNM6~xrz4;iVbU=P|*YT2eWHFJJtr+M@zt2qPm)K~rRcqcs=LM12)PX0TT%QO zlf*xkqD3}7l)1J`5W(>=9nR0e6j-<79<11v3ZuXXcQpoCsqY~n`$FN+S}hcVm5Y>G zXnD{@DYs1@{S0z(lW+?86LWKtku$$-(khsh>0qRUXn=84`GRn?77M^_JY`durnN;KE zW#OJ`h<6xcB{I))ekGpc*Ylt}0cx4|OMBDPQvx4`r`}4Ze5_ipdObGMTi3bZHd5PC zcY0;?uBWu$PSvjJeb87nY7ghNv?%M@SoDl6IWt`bQCosfSh$#D6$ea~QhKM^ud2Ut z+9PYJuVpoELmN-A`F$BicO{BSYg@#tS%avVfb}DxL)|NanJ)#zB!2~?#Ot%H7--9N zU$bs0fS5G!m5M4&WK3#a|H|Tgw*?X-;H+Lu@kwA>qSR~7UC7b)7MJXTn6PG>n@8jP zW+}F^X$$c;U~4ryqRF; z>`j!tbLMK4ZGyY643|~?%Mu#fm!l%wAKjBDmd+VYmp3S#$scD$~bxbf|z#)hShN0*AhRaPDcmqrftGlHq4^54MM$Xfy(2> zH8QYVMzmn_oHbvJCB`IN~E&{1*h&0gEM{e zKvWvzp(!BqMX8`t#)~0nq}Wa zr6>FRPyp;AAB&)1$5@;r$23J{K&~>TWjZf7V$wFzmGM95CXhFG1cJNVAXks}C+&2- zbf9Qn*D8N}Afd2kpwDxns3%1uaFhAqDV8ksWiWY|quuLGZ0)SqrJ!Y8yX}@}IyC$C zQ3rCUsn}#>F#D8%D?q~ySy4j&he%Bs{{7V%rl!ui`@KQP?NTi+_iN{cwom&9RaMRR zB~z!hz|0HAgB9_Ijvpe-zr#jLbckJsc>vmo{+im?t8lA;N#fD4?{lb&J0V8Gocq%; f1ihv=QIDh{M_<9V+45Z2{KE4_qW}V3B0uV%GgrOJ diff --git a/jetty-fcgi/fcgi-server/src/test/resources/keystore.p12 b/jetty-fcgi/fcgi-server/src/test/resources/keystore.p12 new file mode 100644 index 0000000000000000000000000000000000000000..8ab40f72afd41321f506c8398f0d6c6ba6301d07 GIT binary patch literal 2565 zcmY+EX*d*$8pmgt89S3T`&5%eF${(%dkiYZlBGr(8nQ2A8HBOLAp0JM>>^u)vS#dC zWh;$vu8yqP_v_y0-gBPw;eFoc`TgJb|M7<)F$3v<^av7D6NE`3LN{WU4afk@BQceO zNKD0NxBx){%{Jn>!|<)tJy13o*=bzW-S35UVaJ@>b(m)-wlyz` z$5*kOegiYJY+HK;in=)fQBBmxQ+ieXDf-__cDVDf-Uvf>_(sNiDEj4)K>ocB7cQUFXxyW+I_)+xf9pHAP-z2d8Y!E zkJcv9h-p2Xlk$qeH$2}<1crwPOAmlX8L?>8(Lb_YVW#2X5_m{v5&JsiaOvvs0Q!%i2tl`lo)3VzA}gau+TxT1W;u((NYy z1g2GMaZGr%g=Yvm9xQ>HjEtGKBCm72OnqZ(;KVRhx%5=8oNwpUlENa%IXw7~OMbHT zbXosMlKP@s^n36kP_lY16l#?1Q#BgNP%_TGIr?N`)=AG_xOJ6%l3pPzgZ-s^Nk(); zwa31otSj0+JVV&})cwlHZLR4`QqqTG4F$6rRBdHfzGm0&W17BtqqF_hx<#tr~0T|r*B zA-RqpSR#a2pg!lN?z3o}Gzn=UtVBy&ExlWpg)iFAd zqvvc0C)U)?icNKbfC{ubI^!h=x0^ zcW)H=?nuq%B2>6&mLSxwH2Ki);)O2Hxtq+{c{(*;a>d;=D+pgBxkPqc(uEz$?Ntf% z8Gcz*l?gZ!E^AUffLixGN+&l0D5<)FXbdJ=JtS+x9?IboDvRY+W9CtER*ryJl*WB> zOue_SrS)X5AgOc?&+DybQDRZN=8>$dh>#r*2e_HpRPl4Tk|)$=+;+Mt8`0bAj~{OP z;KyI>F+X&@pPyX9Z2Rf1Xs5+b16uFMvy!-r5+jSO61LxZ5~kj(^lTPP`d^veS*q3X zDi~T$|MT*MdbFHKfrsM0K+-cCoTK=)5MnxC8(pqp38p~ZSIr>e=OYtSn7y;quDfXc zJ(Cli5NQOCqT~0O_wL(j20K5tJ3RO(TUzEq;ydT8{&}1wuswV8x8lhOmT@p`E$zYfer{bTLOP4z<>A^@*ltM6&wuxaz7r{spVn1cxmmocYYDp`eKzBUXyn$C=sP^-0l$xCwp!Z?EA4v-W;|& zc1U743|pVcBrV82at(zo9&ao!aOflRJs~*xqln~7KZ3^v0X|}0n&&C@cU_n9GwT&F zS*hlhqa18b&^{!^BubjIQcLJd>T_3=u*jTu)MLgNs zGsrG83m#%O8td9bP1l@@s4cFQY!dvV)xy&oQuv#u(U6WK9I^8Eyi3y9UFSQp=h%2i z2+)SlSx}hn4b&X2^wRCLJ2h0#F!P#)Tk`W-icB2HtP-W0p@y)T71GNVrK zJgPGd$i(9lr_}znR-mertzy5WSG5{`?zLE({K8AlOTA7@QPyTe|MGHpiI0n{Hs4FN zwa|{%A~Tw1&f`MonQ8SHyqCtU#2PWBdOWRE=nJFD@~~+ZOsxB8(6mipiuKufKqpeq zwe2fyXy+hF8rl|Bj72nCf4NN+fE0<~APgybmELSt8>n0Gubd(3Kc@QP9bLFxtK8#P zzj5n!Aw=U}W;mvvx}%cci5)8CPVK?>4qid)0(ldF%|EX0>DNEc)LDy)RV{N+aSwiX zc++3k%=!aST^Y)=kTBWO`xyBHyp~zq$kXhT`P)XKbD$ige?at`Mu?tVm=BILymb_S z(NC;wXKDVpJjAOhUjq$U%_q(3wm5FPX!r~r87q!*LK7xaS6@d|?q!cw`lv_hYY$y1 zT8RlM)d?$W;fRK3ZjLJm|DhaE)-IGUC8p7L7!(0akMi*58{_xd8lv2OQAdsd9^|dq z#flN;rt4CF`L+;bJ5&pcWL=BRfi`v8&*C{D?vf~FD*h*q5H;Gh`ll5d0KENHG{{|b zp?(IUR3f0-73KI{AY((ZP#|D0_T~UMWFTiY(yWOGhz%_=9z?3-bbuZ`=?~Vm=11H@ zTtF~Ez>@6rbOK-ih+7${wrwLakg;>9a=EVbTqfdI9vZ~`Boq-w`79HpJ9oN){!pZJ NuP;cDjvg41_iw$ztb_mn literal 0 HcmV?d00001 diff --git a/jetty-fcgi/fcgi-server/src/test/resources/truststore.jks b/jetty-fcgi/fcgi-server/src/test/resources/truststore.jks deleted file mode 100644 index 839cb8c35151c2b7c64afca24b6b72caad070a05..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 916 zcmezO_TO6u1_mY|W(3o$xs} zE~X|%Muz1J{3AIFGbaABoD&*5saD@gH|APIn|qhRGl}gsUzm=o9G*UXZaLfkb^*)o zjA*-gTf)`m_MQJYE&gJ}p^PHkrj!4^W|XX5a=N7A{;n#yaON&k_bHloe-^*hm?Z91 zlB>xeD=<(C>yn{9D54u}krkl}HQ(Uscha(++qf!T9y+xaEfnXd1O zi0)T?voO%;QH9LK;*_O3mBblqm)!31vU@hm;^%>mh5U@y3R%l0gzi`2yxH!+?kPOi zt!Tnsz1x9B3U2~8STZp)GB6^C5HPs_Lx_=~O<3xi>MmQ;D_g$D<_pdct`+TyzWTQ= zW5Finm(sGEe;ty^>vg$!cV)t>;H#Mev23$*WWBpyJ}Ir;RW+Htrt6{Pk&qz&-XG2@ z8@{&Lu%DX7m47Uny+-3w`=4V611q#Ub(U`xZCtSK^2LO^3(s|HW&N14dV4@A&(kX% z*S_eUPs-bSWRp>avt;CP@7K+G&3=b&1eO-s3f`;Cf91p#$)FW&xME3L8sEBQQDVCvfG>mdwqnk+GXd2ihXqpv z;usF(WoYYmu8DZZa4%1z=+hI+*gpkUykAy5tj#grb*gH!M6TqIcifYBGVe^&T#-2O K*=+x>r_BKeJV|!| diff --git a/jetty-http/src/test/resources/keystore b/jetty-http/src/test/resources/keystore deleted file mode 100644 index b727bd0fb777fddb3463c81cb56963a7541f7b45..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1426 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 diff --git a/jetty-http2/http2-http-client-transport/src/test/resources/keystore.p12 b/jetty-http2/http2-http-client-transport/src/test/resources/keystore.p12 new file mode 100644 index 0000000000000000000000000000000000000000..925bae6c6509531e3518ca8225ed266b125702e0 GIT binary patch literal 2565 zcmY+EXEYlM8^;p~n%H~qQDP-6YHQWrwMr3tQ&PJ%6Ggc;A$F)ysjAw+jcY4vw%RLP zwOw0VN~!C8&->nc?uX|*=luT9^Z)pRqoF_wAPA0z5UC)rME%4QIv_Q$91S6W(U6)e zTnR^0di^V+v<0Int*)^7)fiLJ{O^nQs;C?d{sBjWPvDYN(EsDBavm_NNYo*AQFwQ; z(9w@e%iSJhk*~f=0Rr@ygVEsO$GFn_q?31KoLd0z5%;tMk8!2vKJ6wOA5%R2wX|VA zlpiikeC~~-7`A7h#xVO=w$oJPh$Dv5PIFCayU{r(3*pp_TtTn#jePFXeH)t z3knUGQR~|FEghpbkWXU(NrZa45D?9a>z!)GJ?7{(KZ$O|}^TOd@6a=S}W zJcjl6uW{xw3OO~mdn2>+PU@VW)MK69#eGfOk1d`nCK=j{TDaK%lA+Nqs*UW*+^1-L z`(csQDi;ur&a@t+!9Hhu&HVWmmqm==D~=R~O#*bAXJ^UU>4i|sx!`1Q-ZSS7rkfkA zJFX;s+TLHAVj3vc%sF^Z2-$;8!foBnQE{V060f$EM+ccQoHN!uV2S&M2OT-OJ5A-` z1oeAvbJ8zv3<@YIucqa_5}0&X5L?cLS8_)bYgKquFo0`Sh@YBis8fAYFL7OX)RJzx z`-m=jO1NqRWS0BYY0T^#;7;=Wf{dnLX0R>M4Xxl{5ML}jcDB=UKO0P9vT;3aC~ETR z%}JU=b7&`;0-wc%+yu6ekfF7T5?M6*D*bgfCmVqilMa;M480x=DKhc;pP){Q7SGsU zC8su}bHK_B+n%KKN;^JHU8~d=V1lVWSo2HsqjO$i*X+v_?ym-j%e-?OO{wi3>F@XJ zEt>8VFMSX@-9kM7odXqha>JnyT!IrZ8lF^iWDV_cv|#O-ZssY-X?xeOVe!$9#;P8H z+YY!jx6X23t7YM#PS5aXE4(>EoJ4R(#H5E#W#LQBDc&!;glLV#$ccuE+SspcT_P(bs*9|My|%6lzW6FTg95{O9A1MH^sRL=)}U4?bKN`6}r zG4M{WH~L}g(^}uWV_GwBi>4&8*sfg~2|i-j&8~%Z$zrgl#y)>WCY94mSW~XE2$lMu z=B;UsEkJCSDfUK&%u9%aM4Zm)5U%S|i!u$VnjPd3k5rx-2W|r@Wnm3n8-CC)bt|(Y z+WnqMIAi>*W%s$%V@g2>mS~>$2}Z$1u$*tzJRNVcDAvtRQG!ssn423Kpdg1Q1U6BK&RSTZ87+Nw%iN2+bU~9RB27G_Wi@|0&_Ie;t(~bxsj21F#y>*RYVWW ziZ5tfh8^I`Z_1WHxKx!hdrUT)`-8XlBAMNOJ70gD=?kn-3p~#38?b}y5a+RQt1)^< z7aOt7*F>o=P|E?XJ(LIP-_>jK_uf2c9qfC|e_1&Qv8U?AAY)eyPzrmIbqpaDR|; z$KSF%g&wzdxiPfH#G-sg|E}Y5L~-I+!g{DAg?f_n%RG~zhBT}&c&X9I5Ah8Z%;4v_ zIVNfl-Emxs9DAUO5CPKW2e*{DTCWwOhEYMhzxIPxOrwqRiZ=u-&TXF^AM`~C4S$!Y zl#fT`7U*50>k4Ju8@TC(fAe+WY_pn5PwQ|LcagE^!Ty}l{yKXpp|1bzRFE4@SF@56 z?r+v7JJbV)s^wCct2yFiDTsSi4O5Bb!=i#Bkdpv-M^QFEjfa$m zbhW42V1;ajw`ZK|#k%uNlITa`T#iP8U*vLKG;X)Z?BjikvZXIRpLo{DG0mt(3f z$4p{}H-rTr+EqPpK7&e4tN@lGc} z@Tn}H+A&kPed8@z&7E{(?5D3Ne_#`Y&0>d3Kjp3en7t*%etKiTe?;K1#Uj6%KkYM- z$+0Jm6Awj^n5Bx9xK(e>jV(6nq!0=9MUxk!WBcES0#lT8-(B-vl`bOp&%rVTGU*qX zOW7jC_fZV5YjjZ1Lt@k34NYdM)A*ta&Xqd(I2^r#+92%${-!0swn)e%NAIR1PM>|)Cbw>_NK2kyAF%jHTvl8c5NfPe4rTM4r+nh zgtab3QT|?R`-O2I$NXyjwM+8H_v`7^S>0hPj2J}$IZb~x(R5V_&FLj|Be(`!2o9m5 zl%fYwa8m-ntnvXBI3E5uOk?|R3mNyPPG8+EG6J*OO&-VIuTY8*AgeS>&Q2qt6vH7D IAYfwoUm3%-9{>OV literal 0 HcmV?d00001 diff --git a/jetty-io/src/test/java/org/eclipse/jetty/io/SocketChannelEndPointTest.java b/jetty-io/src/test/java/org/eclipse/jetty/io/SocketChannelEndPointTest.java index b88ec2c957b..fc479ba2813 100644 --- a/jetty-io/src/test/java/org/eclipse/jetty/io/SocketChannelEndPointTest.java +++ b/jetty-io/src/test/java/org/eclipse/jetty/io/SocketChannelEndPointTest.java @@ -630,10 +630,9 @@ public class SocketChannelEndPointTest public SslScenario(NormalScenario normalScenario) throws Exception { _normalScenario = normalScenario; - File keystore = MavenTestingUtils.getTestResourceFile("keystore"); + File keystore = MavenTestingUtils.getTestResourceFile("keystore.p12"); _sslCtxFactory.setKeyStorePath(keystore.getAbsolutePath()); _sslCtxFactory.setKeyStorePassword("storepwd"); - _sslCtxFactory.setKeyManagerPassword("keypwd"); _sslCtxFactory.start(); } diff --git a/jetty-io/src/test/java/org/eclipse/jetty/io/SslConnectionTest.java b/jetty-io/src/test/java/org/eclipse/jetty/io/SslConnectionTest.java index cb667c42875..134cce4c517 100644 --- a/jetty-io/src/test/java/org/eclipse/jetty/io/SslConnectionTest.java +++ b/jetty-io/src/test/java/org/eclipse/jetty/io/SslConnectionTest.java @@ -141,10 +141,9 @@ public class SslConnectionTest @BeforeEach public void initSSL() throws Exception { - File keystore = MavenTestingUtils.getTestResourceFile("keystore"); + File keystore = MavenTestingUtils.getTestResourceFile("keystore.p12"); _sslCtxFactory.setKeyStorePath(keystore.getAbsolutePath()); _sslCtxFactory.setKeyStorePassword("storepwd"); - _sslCtxFactory.setKeyManagerPassword("keypwd"); _sslCtxFactory.setRenegotiationAllowed(true); _sslCtxFactory.setRenegotiationLimit(-1); startManager(); diff --git a/jetty-io/src/test/java/org/eclipse/jetty/io/SslEngineBehaviorTest.java b/jetty-io/src/test/java/org/eclipse/jetty/io/SslEngineBehaviorTest.java index 1253bb4f13b..24742f85de2 100644 --- a/jetty-io/src/test/java/org/eclipse/jetty/io/SslEngineBehaviorTest.java +++ b/jetty-io/src/test/java/org/eclipse/jetty/io/SslEngineBehaviorTest.java @@ -44,10 +44,9 @@ public class SslEngineBehaviorTest public static void startSsl() throws Exception { sslCtxFactory = new SslContextFactory.Server(); - File keystore = MavenTestingUtils.getTestResourceFile("keystore"); + File keystore = MavenTestingUtils.getTestResourceFile("keystore.p12"); sslCtxFactory.setKeyStorePath(keystore.getAbsolutePath()); sslCtxFactory.setKeyStorePassword("storepwd"); - sslCtxFactory.setKeyManagerPassword("keypwd"); sslCtxFactory.start(); } diff --git a/jetty-io/src/test/resources/keystore b/jetty-io/src/test/resources/keystore deleted file mode 100644 index b727bd0fb777fddb3463c81cb56963a7541f7b45..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1426 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 diff --git a/jetty-jmx/src/test/resources/keystore.p12 b/jetty-jmx/src/test/resources/keystore.p12 new file mode 100644 index 0000000000000000000000000000000000000000..3591f1399d611f4969f77a7a40e10a52bfcff102 GIT binary patch literal 2565 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 diff --git a/jetty-osgi/test-jetty-osgi/src/main/resources/truststore.jks b/jetty-osgi/test-jetty-osgi/src/main/resources/truststore.jks deleted file mode 100644 index 839cb8c35151c2b7c64afca24b6b72caad070a05..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 916 zcmezO_TO6u1_mY|W(3o$xs} zE~X|%Muz1J{3AIFGbaABoD&*5saD@gH|APIn|qhRGl}gsUzm=o9G*UXZaLfkb^*)o zjA*-gTf)`m_MQJYE&gJ}p^PHkrj!4^W|XX5a=N7A{;n#yaON&k_bHloe-^*hm?Z91 zlB>xeD=<(C>yn{9D54u}krkl}HQ(Uscha(++qf!T9y+xaEfnXd1O zi0)T?voO%;QH9LK;*_O3mBblqm)!31vU@hm;^%>mh5U@y3R%l0gzi`2yxH!+?kPOi zt!Tnsz1x9B3U2~8STZp)GB6^C5HPs_Lx_=~O<3xi>MmQ;D_g$D<_pdct`+TyzWTQ= zW5Finm(sGEe;ty^>vg$!cV)t>;H#Mev23$*WWBpyJ}Ir;RW+Htrt6{Pk&qz&-XG2@ z8@{&Lu%DX7m47Uny+-3w`=4V611q#Ub(U`xZCtSK^2LO^3(s|HW&N14dV4@A&(kX% z*S_eUPs-bSWRp>avt;CP@7K+G&3=b&1eO-s3f`;Cf91p#$)FW&xME3L8sEBQQDVCvfG>mdwqnk+GXd2ihXqpv z;usF(WoYYmu8DZZa4%1z=+hI+*gpkUykAy5tj#grb*gH!M6TqIcifYBGVe^&T#-2O K*=+x>r_BKeJV|!| diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-ssl.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-ssl.xml index ed177d89c37..178ae88fa36 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-ssl.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-ssl.xml @@ -31,9 +31,9 @@ - / + / - / + / diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/keystore b/jetty-osgi/test-jetty-osgi/src/test/config/etc/keystore deleted file mode 100644 index 428ba54776ede2fdcdeedd879edb927c2abd9953..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2206 zcmcgt`9Bkm8{cNkoMUp6gmShKn!AQX*(l6Nj(i=TnQPOKYtv{*Wg>ItE=Q!pRYH8a z$Sp#S#2lYw#aw;$y9u4T}83H*%lp zAKZay0sy=q1Qoo85aAQh;$ zD(c2EIN#D7WwYDLKUg!CotQPD@dp;5FR#bgaace(^x$6g5frD~(_b(MI^J&*A2DRp zf5Q2onfE(zvUb9|9C`66)YFRNM6~xrz4;iVbU=P|*YT2eWHFJJtr+M@zt2qPm)K~rRcqcs=LM12)PX0TT%QO zlf*xkqD3}7l)1J`5W(>=9nR0e6j-<79<11v3ZuXXcQpoCsqY~n`$FN+S}hcVm5Y>G zXnD{@DYs1@{S0z(lW+?86LWKtku$$-(khsh>0qRUXn=84`GRn?77M^_JY`durnN;KE zW#OJ`h<6xcB{I))ekGpc*Ylt}0cx4|OMBDPQvx4`r`}4Ze5_ipdObGMTi3bZHd5PC zcY0;?uBWu$PSvjJeb87nY7ghNv?%M@SoDl6IWt`bQCosfSh$#D6$ea~QhKM^ud2Ut z+9PYJuVpoELmN-A`F$BicO{BSYg@#tS%avVfb}DxL)|NanJ)#zB!2~?#Ot%H7--9N zU$bs0fS5G!m5M4&WK3#a|H|Tgw*?X-;H+Lu@kwA>qSR~7UC7b)7MJXTn6PG>n@8jP zW+}F^X$$c;U~4ryqRF; z>`j!tbLMK4ZGyY643|~?%Mu#fm!l%wAKjBDmd+VYmp3S#$scD$~bxbf|z#)hShN0*AhRaPDcmqrftGlHq4^54MM$Xfy(2> zH8QYVMzmn_oHbvJCB`IN~E&{1*h&0gEM{e zKvWvzp(!BqMX8`t#)~0nq}Wa zr6>FRPyp;AAB&)1$5@;r$23J{K&~>TWjZf7V$wFzmGM95CXhFG1cJNVAXks}C+&2- zbf9Qn*D8N}Afd2kpwDxns3%1uaFhAqDV8ksWiWY|quuLGZ0)SqrJ!Y8yX}@}IyC$C zQ3rCUsn}#>F#D8%D?q~ySy4j&he%Bs{{7V%rl!ui`@KQP?NTi+_iN{cwom&9RaMRR zB~z!hz|0HAgB9_Ijvpe-zr#jLbckJsc>vmo{+im?t8lA;N#fD4?{lb&J0V8Gocq%; f1ihv=QIDh{M_<9V+45Z2{KE4_qW}V3B0uV%GgrOJ diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/keystore.p12 b/jetty-osgi/test-jetty-osgi/src/test/config/etc/keystore.p12 new file mode 100644 index 0000000000000000000000000000000000000000..7196dcdadc0aad2d431390c4027d5a491c15a20c GIT binary patch literal 2565 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 literal 0 HcmV?d00001 diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2Conscrypt.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2Conscrypt.java index 0a189aa16c8..d48faf6dac6 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2Conscrypt.java +++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2Conscrypt.java @@ -135,13 +135,13 @@ public class TestJettyOSGiBootHTTP2Conscrypt assertNotNull(port); Path path = Paths.get("src", "test", "config"); - File keys = path.resolve("etc").resolve("keystore").toFile(); + File keys = path.resolve("etc").resolve("keystore.p12").toFile(); ClientConnector clientConnector = new ClientConnector(); SslContextFactory.Client sslContextFactory = new SslContextFactory.Client(); - sslContextFactory.setKeyManagerPassword("OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"); - sslContextFactory.setTrustStorePath(keys.getAbsolutePath()); sslContextFactory.setKeyStorePath(keys.getAbsolutePath()); + sslContextFactory.setKeyStorePassword("OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"); + sslContextFactory.setTrustStorePath(keys.getAbsolutePath()); sslContextFactory.setTrustStorePassword("OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"); sslContextFactory.setProvider("Conscrypt"); sslContextFactory.setEndpointIdentificationAlgorithm(null); diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2JDK9.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2JDK9.java index 7714c418894..a59c6f5cb59 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2JDK9.java +++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2JDK9.java @@ -129,13 +129,13 @@ public class TestJettyOSGiBootHTTP2JDK9 assertNotNull(port); Path path = Paths.get("src", "test", "config"); - File keys = path.resolve("etc").resolve("keystore").toFile(); + File keys = path.resolve("etc").resolve("keystore.p12").toFile(); ClientConnector clientConnector = new ClientConnector(); SslContextFactory.Client sslContextFactory = new SslContextFactory.Client(); - sslContextFactory.setKeyManagerPassword("OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"); - sslContextFactory.setTrustStorePath(keys.getAbsolutePath()); sslContextFactory.setKeyStorePath(keys.getAbsolutePath()); + sslContextFactory.setKeyStorePassword("OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"); + sslContextFactory.setTrustStorePath(keys.getAbsolutePath()); sslContextFactory.setTrustStorePassword("OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"); sslContextFactory.setEndpointIdentificationAlgorithm(null); clientConnector.setSslContextFactory(sslContextFactory); diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/ClientCertAuthenticator.java b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/ClientCertAuthenticator.java index bcef03113cd..330928ee58d 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/ClientCertAuthenticator.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/ClientCertAuthenticator.java @@ -58,7 +58,7 @@ public class ClientCertAuthenticator extends LoginAuthenticator /** * Truststore type */ - private String _trustStoreType = "JKS"; + private String _trustStoreType = "PKCS12"; /** * Truststore password */ @@ -251,7 +251,7 @@ public class ClientCertAuthenticator extends LoginAuthenticator } /** - * @return The type of the trust store (default "JKS") + * @return The type of the trust store (default "PKCS12") */ public String getTrustStoreType() { @@ -259,7 +259,7 @@ public class ClientCertAuthenticator extends LoginAuthenticator } /** - * @param trustStoreType The type of the trust store (default "JKS") + * @param trustStoreType The type of the trust store */ public void setTrustStoreType(String trustStoreType) { diff --git a/jetty-server/src/main/config/etc/jetty-ssl-context.xml b/jetty-server/src/main/config/etc/jetty-ssl-context.xml index d4a3d1e3d5d..44da09f579f 100644 --- a/jetty-server/src/main/config/etc/jetty-ssl-context.xml +++ b/jetty-server/src/main/config/etc/jetty-ssl-context.xml @@ -12,12 +12,12 @@ - / + / - / + / diff --git a/jetty-server/src/main/config/modules/ssl.mod b/jetty-server/src/main/config/modules/ssl.mod index 8f27222295d..bd64f9d7a7a 100644 --- a/jetty-server/src/main/config/modules/ssl.mod +++ b/jetty-server/src/main/config/modules/ssl.mod @@ -79,7 +79,7 @@ etc/jetty-ssl-context.xml # jetty.sslContext.keyStorePassword= ## Keystore type and provider -# jetty.sslContext.keyStoreType=JKS +# jetty.sslContext.keyStoreType=PKCS12 # jetty.sslContext.keyStoreProvider= ## KeyManager password @@ -89,7 +89,7 @@ etc/jetty-ssl-context.xml # jetty.sslContext.trustStorePassword= ## Truststore type and provider -# jetty.sslContext.trustStoreType=JKS +# jetty.sslContext.trustStoreType=PKCS12 # jetty.sslContext.trustStoreProvider= ## whether client certificate authentication is required diff --git a/jetty-server/src/main/config/modules/test-keystore.mod b/jetty-server/src/main/config/modules/test-keystore.mod index f375e9ca540..40cf74e70da 100644 --- a/jetty-server/src/main/config/modules/test-keystore.mod +++ b/jetty-server/src/main/config/modules/test-keystore.mod @@ -9,13 +9,10 @@ ssl ssl [files] -basehome:modules/test-keystore/keystore|etc/test-keystore +basehome:modules/test-keystore/keystore.p12|etc/test-keystore.p12 [ini] -jetty.sslContext.keyStorePath?=etc/test-keystore -jetty.sslContext.trustStorePath?=etc/test-keystore +jetty.sslContext.keyStorePath?=etc/test-keystore.p12 +jetty.sslContext.trustStorePath?=etc/test-keystore.p12 +jetty.sslContext.keyStoreType?=PKCS12 jetty.sslContext.keyStorePassword?=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 -jetty.sslContext.keyStoreType?=JKS -jetty.sslContext.keyManagerPassword?=OBF:1u2u1wml1z7s1z7a1wnl1u2g -jetty.sslContext.trustStorePassword?=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 -jetty.sslContext.trustStoreType?=JKS diff --git a/jetty-server/src/main/config/modules/test-keystore/keystore b/jetty-server/src/main/config/modules/test-keystore/keystore deleted file mode 100644 index d6592f95ee93575d659f28e1c2ebb81191484986..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3697 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 diff --git a/jetty-server/src/main/config/modules/test-keystore/keystore.p12 b/jetty-server/src/main/config/modules/test-keystore/keystore.p12 new file mode 100644 index 0000000000000000000000000000000000000000..ee7a51f5344c2a0beac71245e67a91a7c8a58458 GIT binary patch literal 2565 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 diff --git a/jetty-server/src/test/config/etc/keystore.pkf b/jetty-server/src/test/config/etc/keystore.pkf deleted file mode 100644 index 443818e87df..00000000000 --- a/jetty-server/src/test/config/etc/keystore.pkf +++ /dev/null @@ -1,20 +0,0 @@ -Bag Attributes - friendlyName: jetty - localKeyID: 54 69 6D 65 20 31 34 32 33 31 39 38 30 39 33 31 31 35 -Key Attributes: ------BEGIN PRIVATE KEY----- -MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAIPh4Q0t4xklXTzX -N2VAb47r5n7idAupp4CTNEhhT6lS70iA+A8i4+0lSEHWAogvd9jl3H7SvScr30QM -4ieC0JCGSOwGc8f+yqKrO56PPd5OuqW380BJ0r74jJczU9CcsuavHD7e6mRLUnmj -xM20NSxrcicMiPUHY1mJZtN9swtxAgMBAAECgYADS9P6Jll0uXBZIu/pgfDH27GJ -HlPULstW9VbrMDNzgfUlFMQebLrRpIrnyleJ29Xc//HA4beEkR4lb0T/w88+pEkt -7fhYeqRLPIfpDOgzloynnsoPcd8f/PypbimQrNLmBiG1178nVcy4Yoh5lYVIJwtU -3VriqDlvAfTLrrx8AQJBAMLWuh27Hb8xs3LRg4UD7hcv8tJejstm08Y+czRz7cO0 -RENa3aDjGFSegc+IUfdez7BP8uDw+PwE+jybmTvaliECQQCtR/anCY1WS28/bKvy -lmIwoI15eraBdVFkN0Hfxh+9PfR3rMD5uyvukT5GgTtY/XxADyafSTaipDJiZHJI -EitRAkBjeCBYYVjUbVlBuvi8Bb+dktsSzzdzXDGtueAy3SR7jyJyiIcxRf775Fg9 -TUkbUwoQ5yAF+sACWcAvBPj796JBAkAEZEeHEkHnxv+pztpIyrDwZJFRW9/WRh/q -90+PGVlilXhltBYr/idt43Z9mPblGX+VrAyhitx8oMa6IauX0gYRAkEAgnyVeXrD -jDLUZRA3P8Gu27k1k6GjbTYiUz3HKCz2/6+MZ2MK2qqwafgqocji029Q6dHdPD7a -4QnRlvraUnyQLA== ------END PRIVATE KEY----- diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ConnectionOpenCloseTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ConnectionOpenCloseTest.java index c9690206783..7936a985478 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ConnectionOpenCloseTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ConnectionOpenCloseTest.java @@ -170,10 +170,9 @@ public class ConnectionOpenCloseTest extends AbstractHttpTest public void testSSLOpenRequestClose() throws Exception { SslContextFactory.Server sslContextFactory = new SslContextFactory.Server(); - File keystore = MavenTestingUtils.getTestResourceFile("keystore"); + File keystore = MavenTestingUtils.getTestResourceFile("keystore.p12"); sslContextFactory.setKeyStoreResource(Resource.newResource(keystore)); sslContextFactory.setKeyStorePassword("storepwd"); - sslContextFactory.setKeyManagerPassword("keypwd"); server.addBean(sslContextFactory); server.removeConnector(connector); diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/OptionalSslConnectionTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/OptionalSslConnectionTest.java index c42aa482702..04cd2f680c9 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/OptionalSslConnectionTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/OptionalSslConnectionTest.java @@ -50,11 +50,10 @@ public class OptionalSslConnectionTest serverThreads.setName("server"); server = new Server(serverThreads); - String keystore = MavenTestingUtils.getTestResourceFile("keystore").getAbsolutePath(); + String keystore = MavenTestingUtils.getTestResourceFile("keystore.p12").getAbsolutePath(); SslContextFactory.Server sslContextFactory = new SslContextFactory.Server(); sslContextFactory.setKeyStorePath(keystore); sslContextFactory.setKeyStorePassword("storepwd"); - sslContextFactory.setKeyManagerPassword("keypwd"); HttpConfiguration httpConfig = new HttpConfiguration(); HttpConnectionFactory http = new HttpConnectionFactory(httpConfig); diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ThreadStarvationTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ThreadStarvationTest.java index 23a805fc71b..2e9d6a76c9f 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ThreadStarvationTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ThreadStarvationTest.java @@ -88,13 +88,10 @@ public class ThreadStarvationTest // HTTPS/SSL/TLS ConnectorProvider https = (server, acceptors, selectors) -> { - Path keystorePath = MavenTestingUtils.getTestResourcePath("keystore"); + Path keystorePath = MavenTestingUtils.getTestResourcePath("keystore.p12"); SslContextFactory.Server sslContextFactory = new SslContextFactory.Server(); sslContextFactory.setKeyStorePath(keystorePath.toString()); sslContextFactory.setKeyStorePassword("storepwd"); - sslContextFactory.setKeyManagerPassword("keypwd"); - sslContextFactory.setTrustStorePath(keystorePath.toString()); - sslContextFactory.setTrustStorePassword("storepwd"); ByteBufferPool pool = new LeakTrackingByteBufferPool(new MappedByteBufferPool.Tagged()); HttpConnectionFactory httpConnectionFactory = new HttpConnectionFactory(); diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/DebugHandlerTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/DebugHandlerTest.java index 71862e54e56..b773c7cdf93 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/DebugHandlerTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/DebugHandlerTest.java @@ -74,13 +74,10 @@ public class DebugHandlerTest httpConnector.setPort(0); server.addConnector(httpConnector); - File keystorePath = MavenTestingUtils.getTestResourceFile("keystore"); + File keystorePath = MavenTestingUtils.getTestResourceFile("keystore.p12"); SslContextFactory.Server sslContextFactory = new SslContextFactory.Server(); sslContextFactory.setKeyStorePath(keystorePath.getAbsolutePath()); sslContextFactory.setKeyStorePassword("storepwd"); - sslContextFactory.setKeyManagerPassword("keypwd"); - sslContextFactory.setTrustStorePath(keystorePath.getAbsolutePath()); - sslContextFactory.setTrustStorePassword("storepwd"); ByteBufferPool pool = new LeakTrackingByteBufferPool(new MappedByteBufferPool.Tagged()); ServerConnector sslConnector = new ServerConnector(server, null, null, pool, 1, 1, AbstractConnectionFactory.getFactories(sslContextFactory, new HttpConnectionFactory())); diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/SecuredRedirectHandlerTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/SecuredRedirectHandlerTest.java index 9f567b6dd1c..37726292fcd 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/SecuredRedirectHandlerTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/SecuredRedirectHandlerTest.java @@ -66,13 +66,10 @@ public class SecuredRedirectHandlerTest public static void startServer() throws Exception { // Setup SSL - File keystore = MavenTestingUtils.getTestResourceFile("keystore"); + File keystore = MavenTestingUtils.getTestResourceFile("keystore.p12"); SslContextFactory.Server sslContextFactory = new SslContextFactory.Server(); sslContextFactory.setKeyStorePath(keystore.getAbsolutePath()); sslContextFactory.setKeyStorePassword("storepwd"); - sslContextFactory.setKeyManagerPassword("keypwd"); - sslContextFactory.setTrustStorePath(keystore.getAbsolutePath()); - sslContextFactory.setTrustStorePassword("storepwd"); server = new Server(); diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLCloseTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLCloseTest.java index 4ff45418985..7a5fe663974 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLCloseTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLCloseTest.java @@ -44,11 +44,10 @@ public class SSLCloseTest @Test public void testClose() throws Exception { - File keystore = MavenTestingUtils.getTestResourceFile("keystore"); + File keystore = MavenTestingUtils.getTestResourceFile("keystore.p12"); SslContextFactory.Server sslContextFactory = new SslContextFactory.Server(); sslContextFactory.setKeyStoreResource(Resource.newResource(keystore)); sslContextFactory.setKeyStorePassword("storepwd"); - sslContextFactory.setKeyManagerPassword("keypwd"); Server server = new Server(); ServerConnector connector = new ServerConnector(server, sslContextFactory); diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLEngineTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLEngineTest.java index 788739974df..144bd484d9e 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLEngineTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLEngineTest.java @@ -110,11 +110,10 @@ public class SSLEngineTest @BeforeEach public void startServer() throws Exception { - String keystore = MavenTestingUtils.getTestResourceFile("keystore").getAbsolutePath(); + String keystore = MavenTestingUtils.getTestResourceFile("keystore.p12").getAbsolutePath(); SslContextFactory.Server sslContextFactory = new SslContextFactory.Server(); sslContextFactory.setKeyStorePath(keystore); sslContextFactory.setKeyStorePassword("storepwd"); - sslContextFactory.setKeyManagerPassword("keypwd"); server = new Server(); HttpConnectionFactory http = new HttpConnectionFactory(); diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLReadEOFAfterResponseTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLReadEOFAfterResponseTest.java index 2230e996e13..3b1fb3fb890 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLReadEOFAfterResponseTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLReadEOFAfterResponseTest.java @@ -52,11 +52,10 @@ public class SSLReadEOFAfterResponseTest @Test public void testReadEOFAfterResponse() throws Exception { - File keystore = MavenTestingUtils.getTestResourceFile("keystore"); + File keystore = MavenTestingUtils.getTestResourceFile("keystore.p12"); SslContextFactory.Server sslContextFactory = new SslContextFactory.Server(); sslContextFactory.setKeyStoreResource(Resource.newResource(keystore)); sslContextFactory.setKeyStorePassword("storepwd"); - sslContextFactory.setKeyManagerPassword("keypwd"); Server server = new Server(); ServerConnector connector = new ServerConnector(server, sslContextFactory); diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLSelectChannelConnectorLoadTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLSelectChannelConnectorLoadTest.java index 781614b5b7d..a1b33b46d61 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLSelectChannelConnectorLoadTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLSelectChannelConnectorLoadTest.java @@ -61,13 +61,10 @@ public class SSLSelectChannelConnectorLoadTest @BeforeAll public static void startServer() throws Exception { - String keystorePath = System.getProperty("basedir", ".") + "/src/test/resources/keystore"; + String keystorePath = System.getProperty("basedir", ".") + "/src/test/resources/keystore.p12"; SslContextFactory.Server sslContextFactory = new SslContextFactory.Server(); sslContextFactory.setKeyStorePath(keystorePath); sslContextFactory.setKeyStorePassword("storepwd"); - sslContextFactory.setKeyManagerPassword("keypwd"); - sslContextFactory.setTrustStorePath(keystorePath); - sslContextFactory.setTrustStorePassword("storepwd"); server = new Server(); connector = new ServerConnector(server, sslContextFactory); diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SelectChannelServerSslTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SelectChannelServerSslTest.java index 4be8ea0fad7..a48e15c7ce0 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SelectChannelServerSslTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SelectChannelServerSslTest.java @@ -81,13 +81,10 @@ public class SelectChannelServerSslTest extends HttpServerTestBase @BeforeEach public void init() throws Exception { - String keystorePath = MavenTestingUtils.getTestResourcePath("keystore").toString(); + String keystorePath = MavenTestingUtils.getTestResourcePath("keystore.p12").toString(); SslContextFactory.Server sslContextFactory = new SslContextFactory.Server(); sslContextFactory.setKeyStorePath(keystorePath); sslContextFactory.setKeyStorePassword("storepwd"); - sslContextFactory.setKeyManagerPassword("keypwd"); - sslContextFactory.setTrustStorePath(keystorePath); - sslContextFactory.setTrustStorePassword("storepwd"); ByteBufferPool pool = new LeakTrackingByteBufferPool(new MappedByteBufferPool.Tagged()); HttpConnectionFactory httpConnectionFactory = new HttpConnectionFactory(); diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SlowClientsTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SlowClientsTest.java index f5c1b23bb7b..73c8f9267d2 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SlowClientsTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SlowClientsTest.java @@ -59,11 +59,10 @@ public class SlowClientsTest @Test public void testSlowClientsWithSmallThreadPool() throws Exception { - File keystore = MavenTestingUtils.getTestResourceFile("keystore"); + File keystore = MavenTestingUtils.getTestResourceFile("keystore.p12"); SslContextFactory.Server sslContextFactory = new SslContextFactory.Server(); sslContextFactory.setKeyStorePath(keystore.getAbsolutePath()); sslContextFactory.setKeyStorePassword("storepwd"); - sslContextFactory.setKeyManagerPassword("keypwd"); int maxThreads = 6; int contentLength = 8 * 1024 * 1024; diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SniSslConnectionFactoryTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SniSslConnectionFactoryTest.java index ce25c685ad5..668494a0566 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SniSslConnectionFactoryTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SniSslConnectionFactoryTest.java @@ -131,8 +131,7 @@ public class SniSslConnectionFactoryTest if (!keystoreFile.exists()) throw new FileNotFoundException(keystoreFile.getAbsolutePath()); - sslContextFactory.setKeyStorePassword("OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"); - sslContextFactory.setKeyManagerPassword("OBF:1u2u1wml1z7s1z7a1wnl1u2g"); + sslContextFactory.setKeyStorePassword("storepwd"); ServerConnector https = _connector = new ServerConnector(_server, new SslConnectionFactory(sslContextFactory, HttpVersion.HTTP_1_1.asString()), diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslConnectionFactoryTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslConnectionFactoryTest.java index a1833e0f31a..d09352ae050 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslConnectionFactoryTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslConnectionFactoryTest.java @@ -70,7 +70,7 @@ public class SslConnectionFactoryTest @BeforeEach public void before() throws Exception { - String keystorePath = "src/test/resources/keystore"; + String keystorePath = "src/test/resources/keystore.p12"; File keystoreFile = new File(keystorePath); if (!keystoreFile.exists()) throw new FileNotFoundException(keystoreFile.getAbsolutePath()); @@ -86,8 +86,7 @@ public class SslConnectionFactoryTest SslContextFactory.Server sslContextFactory = new SslContextFactory.Server(); sslContextFactory.setKeyStorePath(keystoreFile.getAbsolutePath()); - sslContextFactory.setKeyStorePassword("OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"); - sslContextFactory.setKeyManagerPassword("OBF:1u2u1wml1z7s1z7a1wnl1u2g"); + sslContextFactory.setKeyStorePassword("storepwd"); ServerConnector https = _connector = new ServerConnector(_server, new SslConnectionFactory(sslContextFactory, HttpVersion.HTTP_1_1.asString()), @@ -129,7 +128,7 @@ public class SslConnectionFactoryTest @Test public void testSNIConnect() throws Exception { - String response = getResponse("localhost", "localhost", "jetty.eclipse.org"); + String response = getResponse("localhost", "localhost", "localhost"); assertThat(response, Matchers.containsString("host=localhost")); } diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslContextFactoryReloadTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslContextFactoryReloadTest.java index 8bed0868949..bc35bb8e3d6 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslContextFactoryReloadTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslContextFactoryReloadTest.java @@ -59,8 +59,8 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; public class SslContextFactoryReloadTest { - public static final String KEYSTORE_1 = "src/test/resources/reload_keystore_1.jks"; - public static final String KEYSTORE_2 = "src/test/resources/reload_keystore_2.jks"; + public static final String KEYSTORE_1 = "src/test/resources/reload_keystore_1.p12"; + public static final String KEYSTORE_2 = "src/test/resources/reload_keystore_2.p12"; private Server server; private SslContextFactory.Server sslContextFactory; @@ -73,8 +73,6 @@ public class SslContextFactoryReloadTest sslContextFactory = new SslContextFactory.Server(); sslContextFactory.setKeyStorePath(KEYSTORE_1); sslContextFactory.setKeyStorePassword("storepwd"); - sslContextFactory.setKeyStoreType("JKS"); - sslContextFactory.setKeyStoreProvider(null); HttpConfiguration httpsConfig = new HttpConfiguration(); httpsConfig.addCustomizer(new SecureRequestCustomizer()); diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslSelectChannelTimeoutTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslSelectChannelTimeoutTest.java index 459fb2f70a1..a8dcf333a1e 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslSelectChannelTimeoutTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslSelectChannelTimeoutTest.java @@ -43,13 +43,10 @@ public class SslSelectChannelTimeoutTest extends ConnectorTimeoutTest @BeforeEach public void init() throws Exception { - String keystorePath = System.getProperty("basedir", ".") + "/src/test/resources/keystore"; + String keystorePath = System.getProperty("basedir", ".") + "/src/test/resources/keystore.p12"; SslContextFactory.Server sslContextFactory = new SslContextFactory.Server(); sslContextFactory.setKeyStorePath(keystorePath); sslContextFactory.setKeyStorePassword("storepwd"); - sslContextFactory.setKeyManagerPassword("keypwd"); - sslContextFactory.setTrustStorePath(keystorePath); - sslContextFactory.setTrustStorePassword("storepwd"); ServerConnector connector = new ServerConnector(_server, 1, 1, sslContextFactory); connector.setIdleTimeout(MAX_IDLE_TIME); //250 msec max idle startServer(connector); diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslUploadTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslUploadTest.java index cf6f2e0d0e0..2e04b017216 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslUploadTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslUploadTest.java @@ -60,14 +60,11 @@ public class SslUploadTest @BeforeAll public static void startServer() throws Exception { - File keystore = MavenTestingUtils.getTestResourceFile("keystore"); + File keystore = MavenTestingUtils.getTestResourceFile("keystore.p12"); SslContextFactory.Server sslContextFactory = new SslContextFactory.Server(); sslContextFactory.setKeyStorePath(keystore.getAbsolutePath()); sslContextFactory.setKeyStorePassword("storepwd"); - sslContextFactory.setKeyManagerPassword("keypwd"); - sslContextFactory.setTrustStorePath(keystore.getAbsolutePath()); - sslContextFactory.setTrustStorePassword("storepwd"); server = new Server(); connector = new ServerConnector(server, sslContextFactory); diff --git a/jetty-server/src/test/resources/keystore b/jetty-server/src/test/resources/keystore deleted file mode 100644 index d6592f95ee93575d659f28e1c2ebb81191484986..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3697 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 diff --git a/jetty-server/src/test/resources/keystore.p12 b/jetty-server/src/test/resources/keystore.p12 new file mode 100644 index 0000000000000000000000000000000000000000..5c14fee0c85c1cfaa8de3e56d380988e4c3672a8 GIT binary patch literal 2565 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 QCJTR diff --git a/jetty-server/src/test/resources/keystore_sni_nowild.p12 b/jetty-server/src/test/resources/keystore_sni_nowild.p12 index 9fda6a03e2bb0d95ab35f783ad71e5cda6d3a8e4..cb79b435422231f0d72269f267f3e9107219cccc 100644 GIT binary patch literal 4637 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 literal 4134 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 eji@Gtj9~*-{hA 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 literal 0 HcmV?d00001 diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/SSLAsyncIOServletTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/SSLAsyncIOServletTest.java index bcc7b721f99..f22012df5aa 100644 --- a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/SSLAsyncIOServletTest.java +++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/SSLAsyncIOServletTest.java @@ -218,14 +218,11 @@ public class SSLAsyncIOServletTest public void start(HttpServlet servlet) throws Exception { - Path keystorePath = MavenTestingUtils.getTestResourcePath("keystore.jks"); - Path truststorePath = MavenTestingUtils.getTestResourcePath("truststore.jks"); + Path keystorePath = MavenTestingUtils.getTestResourcePath("keystore.p12"); sslContextFactory = new SslContextFactory.Server(); sslContextFactory.setKeyStorePath(keystorePath.toString()); sslContextFactory.setKeyStorePassword("storepwd"); - sslContextFactory.setTrustStorePath(truststorePath.toString()); - sslContextFactory.setTrustStorePassword("storepwd"); server = new Server(); diff --git a/jetty-servlet/src/test/resources/keystore.jks b/jetty-servlet/src/test/resources/keystore.jks deleted file mode 100644 index 428ba54776ede2fdcdeedd879edb927c2abd9953..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2206 zcmcgt`9Bkm8{cNkoMUp6gmShKn!AQX*(l6Nj(i=TnQPOKYtv{*Wg>ItE=Q!pRYH8a z$Sp#S#2lYw#aw;$y9u4T}83H*%lp zAKZay0sy=q1Qoo85aAQh;$ zD(c2EIN#D7WwYDLKUg!CotQPD@dp;5FR#bgaace(^x$6g5frD~(_b(MI^J&*A2DRp zf5Q2onfE(zvUb9|9C`66)YFRNM6~xrz4;iVbU=P|*YT2eWHFJJtr+M@zt2qPm)K~rRcqcs=LM12)PX0TT%QO zlf*xkqD3}7l)1J`5W(>=9nR0e6j-<79<11v3ZuXXcQpoCsqY~n`$FN+S}hcVm5Y>G zXnD{@DYs1@{S0z(lW+?86LWKtku$$-(khsh>0qRUXn=84`GRn?77M^_JY`durnN;KE zW#OJ`h<6xcB{I))ekGpc*Ylt}0cx4|OMBDPQvx4`r`}4Ze5_ipdObGMTi3bZHd5PC zcY0;?uBWu$PSvjJeb87nY7ghNv?%M@SoDl6IWt`bQCosfSh$#D6$ea~QhKM^ud2Ut z+9PYJuVpoELmN-A`F$BicO{BSYg@#tS%avVfb}DxL)|NanJ)#zB!2~?#Ot%H7--9N zU$bs0fS5G!m5M4&WK3#a|H|Tgw*?X-;H+Lu@kwA>qSR~7UC7b)7MJXTn6PG>n@8jP zW+}F^X$$c;U~4ryqRF; z>`j!tbLMK4ZGyY643|~?%Mu#fm!l%wAKjBDmd+VYmp3S#$scD$~bxbf|z#)hShN0*AhRaPDcmqrftGlHq4^54MM$Xfy(2> zH8QYVMzmn_oHbvJCB`IN~E&{1*h&0gEM{e zKvWvzp(!BqMX8`t#)~0nq}Wa zr6>FRPyp;AAB&)1$5@;r$23J{K&~>TWjZf7V$wFzmGM95CXhFG1cJNVAXks}C+&2- zbf9Qn*D8N}Afd2kpwDxns3%1uaFhAqDV8ksWiWY|quuLGZ0)SqrJ!Y8yX}@}IyC$C zQ3rCUsn}#>F#D8%D?q~ySy4j&he%Bs{{7V%rl!ui`@KQP?NTi+_iN{cwom&9RaMRR zB~z!hz|0HAgB9_Ijvpe-zr#jLbckJsc>vmo{+im?t8lA;N#fD4?{lb&J0V8Gocq%; f1ihv=QIDh{M_<9V+45Z2{KE4_qW}V3B0uV%GgrOJ diff --git a/jetty-servlet/src/test/resources/keystore.p12 b/jetty-servlet/src/test/resources/keystore.p12 new file mode 100644 index 0000000000000000000000000000000000000000..b10305f030244d10def2071e7dd4c552a56077b5 GIT binary patch literal 2565 zcmY+EdpHvcAIHr$%)QK=7P)M)%x!atklfQK!VKj;DLLdCn%tL5m~dP&3}La{O(d71 z+`@6Gh{|ZWORJ;feV_L|=Q)4;p5OC)zQ5o1&ku^o3*ZC*QA9{P7epn|BJrC5fE!Rs zgggQfA=E=mK@q{e|BAp)AR_qEA;un#4Hw`4zW5J|N{OH!C?e<^3c9V&Sd^JLvDy_pd;bo-Co=S#W6J)_RxxvpSdAh-I3_!z=0u+@;tHiEB5XFd zFV7Y>7b5M}mOj9*@)*IN^mq<_D%8YO)u!-)FDHvNs_vS|5y&EQvVShuT$j#~E?;G8 z#x9S#xdAavLmpLB6O-q6Cm-o5Y&%rKrrNG;b`juNi0rUVOuZnf*LWnKcO}wR+!O0; zG~{GDP%VM$mZqNyfEG&(uUlu;-l)x;Fb<9L!tPm*D9W!@y$zZbuJ(&r6|1#~_i-3M z#oYZYo&S#QP+eh>qC?_b$h(UvQx9=LXoZ!wClt&XzM#D?*840#?pxGGt}v0lkr8UDw4G5 z(V{qywuuQTcNsdaWecyIah~)a+a=e#@C5;zw`@TYm+aA?_{v4Y4*e&KviEG>de4I|woMVusyZw{h6*D3i>z$mH2`SUA$al%99;Z3QB%&e%d+C4Ax2`@kR%LJ6C!>|;(A{iE;46e-Bx_{y{i-x65- z!3nHPLaL7?Bm?w8Wl?W(HNI0LYTT?H&gW~N8_g!tsqSccNT!Gn0XI zH&Advx?u>sx56u~?Tbd!q+P$>?9hbRIYn~zaulR(@Tj=>tmUm@Pa3ar1ZmN$m0n)Gz&y0RyD><-wjpDor>TdEWn0bMbkO%y?CA2;z=| z{`eZ~x?7F(POR|AGpN3_Nu^jUw|~n@tyADms)uu~%XVTZPJ(PT8hBqGCk3(=mAp!+n0;{$S5| z9iaIwx2L(Y=-38-jCU;)NZ(O&BEy^hKhCUKHX_I0y(2bxUQ)Q_GZ26Ob5^&E zx*ioxeIRZH%I087lIU-PU|3sqdP|(p!{(;`d)wMCY>bfXxw6;15bErF(KzYVb#Q%1cpt^+?Z3|*tnOR>8mFWz{j@7b5;D7K|l z$hGMp#bmN&j=d{uS=^t7>>8)fOLQ=YEq^sG_o!(~5?tDz0#G%XORI(GdR}ikcqjH= z2HDrtTJZjrB;?w}mjXYmAcX&c9u4kkWUc;l&}MK#Smm0DT!L@S*k|pRqj^E8@*{Z& zqTAF$-LGD(5dq8A2@AlPq$<9lpY(60@ufK4v`Fp|T(nPZWnD1Th^%GihM#mBjC*~G z5$8b{b0zNl@`}ZLp3pgWXFJSh-kP#FrP77j?Q6u97VGjDY+Tg*-cQ0R>DR+H=1uN^ zeh6x%<%7{(^B9uYkjZ>? zE~X|%Muz1J{3AIFGbaABoD&*5saD@gH|APIn|qhRGl}gsUzm=o9G*UXZaLfkb^*)o zjA*-gTf)`m_MQJYE&gJ}p^PHkrj!4^W|XX5a=N7A{;n#yaON&k_bHloe-^*hm?Z91 zlB>xeD=<(C>yn{9D54u}krkl}HQ(Uscha(++qf!T9y+xaEfnXd1O zi0)T?voO%;QH9LK;*_O3mBblqm)!31vU@hm;^%>mh5U@y3R%l0gzi`2yxH!+?kPOi zt!Tnsz1x9B3U2~8STZp)GB6^C5HPs_Lx_=~O<3xi>MmQ;D_g$D<_pdct`+TyzWTQ= zW5Finm(sGEe;ty^>vg$!cV)t>;H#Mev23$*WWBpyJ}Ir;RW+Htrt6{Pk&qz&-XG2@ z8@{&Lu%DX7m47Uny+-3w`=4V611q#Ub(U`xZCtSK^2LO^3(s|HW&N14dV4@A&(kX% z*S_eUPs-bSWRp>avt;CP@7K+G&3=b&1eO-s3f`;Cf91p#$)FW&xME3L8sEBQQDVCvfG>mdwqnk+GXd2ihXqpv z;usF(WoYYmu8DZZa4%1z=+hI+*gpkUykAy5tj#grb*gH!M6TqIcifYBGVe^&T#-2O K*=+x>r_BKeJV|!| diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java b/jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java index bc247d39ef5..35c14f5177a 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java @@ -150,7 +150,7 @@ public abstract class SslContextFactory extends AbstractLifeCycle implements Dum private String[] _selectedCipherSuites; private Resource _keyStoreResource; private String _keyStoreProvider; - private String _keyStoreType = "JKS"; + private String _keyStoreType = "PKCS12"; private String _certAlias; private Resource _trustStoreResource; private String _trustStoreProvider; @@ -640,7 +640,7 @@ public abstract class SslContextFactory extends AbstractLifeCycle implements Dum } /** - * @return The type of the key store (default "JKS") + * @return The type of the key store (default "PKCS12") */ @ManagedAttribute("The keyStore type") public String getKeyStoreType() @@ -649,7 +649,7 @@ public abstract class SslContextFactory extends AbstractLifeCycle implements Dum } /** - * @param keyStoreType The type of the key store (default "JKS") + * @param keyStoreType The type of the key store */ public void setKeyStoreType(String keyStoreType) { @@ -1049,7 +1049,7 @@ public abstract class SslContextFactory extends AbstractLifeCycle implements Dum /** * When set to "HTTPS" hostname verification will be enabled. - * Deployments can be vulnerable to a man-in-the-middle attack if a EndpointIndentificationAlgorithm + * Deployments can be vulnerable to a man-in-the-middle attack if a EndpointIdentificationAlgorithm * is not set. * * @param endpointIdentificationAlgorithm Set the endpointIdentificationAlgorithm diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/ssl/SslContextFactoryTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/ssl/SslContextFactoryTest.java index b06a655c62d..680601b7b28 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/ssl/SslContextFactoryTest.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/ssl/SslContextFactoryTest.java @@ -72,7 +72,6 @@ public class SslContextFactoryTest public void testSLOTH() throws Exception { cf.setKeyStorePassword("storepwd"); - cf.setKeyManagerPassword("keypwd"); cf.start(); @@ -93,7 +92,6 @@ public class SslContextFactoryTest public void testDumpIncludeTlsRsa() throws Exception { cf.setKeyStorePassword("storepwd"); - cf.setKeyManagerPassword("keypwd"); cf.setIncludeCipherSuites("TLS_RSA_.*"); cf.setExcludeCipherSuites("BOGUS"); // just to not exclude anything @@ -125,117 +123,92 @@ public class SslContextFactoryTest public void testNoTsFileKs() throws Exception { cf.setKeyStorePassword("storepwd"); - cf.setKeyManagerPassword("keypwd"); cf.start(); - assertTrue(cf.getSslContext() != null); + assertNotNull(cf.getSslContext()); } @Test public void testNoTsSetKs() throws Exception { - KeyStore ks = KeyStore.getInstance("JKS"); - try (InputStream keystoreInputStream = this.getClass().getResourceAsStream("keystore")) + KeyStore ks = KeyStore.getInstance("PKCS12"); + try (InputStream keystoreInputStream = this.getClass().getResourceAsStream("keystore.p12")) { ks.load(keystoreInputStream, "storepwd".toCharArray()); } cf.setKeyStore(ks); - cf.setKeyManagerPassword("keypwd"); cf.start(); - assertTrue(cf.getSslContext() != null); + assertNotNull(cf.getSslContext()); } @Test public void testNoTsNoKs() throws Exception { cf.start(); - assertTrue(cf.getSslContext() != null); + assertNotNull(cf.getSslContext()); } @Test public void testTrustAll() throws Exception { cf.start(); - assertTrue(cf.getSslContext() != null); + assertNotNull(cf.getSslContext()); } @Test public void testNoTsResourceKs() throws Exception { - Resource keystoreResource = Resource.newSystemResource("keystore"); + Resource keystoreResource = Resource.newSystemResource("keystore.p12"); cf.setKeyStoreResource(keystoreResource); cf.setKeyStorePassword("storepwd"); - cf.setKeyManagerPassword("keypwd"); cf.setTrustStoreResource(keystoreResource); cf.setTrustStorePassword(null); cf.start(); - assertTrue(cf.getSslContext() != null); + assertNotNull(cf.getSslContext()); } @Test public void testResourceTsResourceKs() throws Exception { - Resource keystoreResource = Resource.newSystemResource("keystore"); - Resource truststoreResource = Resource.newSystemResource("keystore"); + Resource keystoreResource = Resource.newSystemResource("keystore.p12"); + Resource truststoreResource = Resource.newSystemResource("keystore.p12"); cf.setKeyStoreResource(keystoreResource); - cf.setTrustStoreResource(truststoreResource); cf.setKeyStorePassword("storepwd"); - cf.setKeyManagerPassword("keypwd"); + cf.setTrustStoreResource(truststoreResource); cf.setTrustStorePassword("storepwd"); cf.start(); - assertTrue(cf.getSslContext() != null); - } - - @Test - public void testResourceTsResourceKsWrongPW() throws Exception - { - Resource keystoreResource = Resource.newSystemResource("keystore"); - Resource truststoreResource = Resource.newSystemResource("keystore"); - - cf.setKeyStoreResource(keystoreResource); - cf.setTrustStoreResource(truststoreResource); - cf.setKeyStorePassword("storepwd"); - cf.setKeyManagerPassword("wrong_keypwd"); - cf.setTrustStorePassword("storepwd"); - - try (StacklessLogging ignore = new StacklessLogging(AbstractLifeCycle.class)) - { - java.security.UnrecoverableKeyException x = assertThrows( - java.security.UnrecoverableKeyException.class, () -> cf.start()); - assertThat(x.getMessage(), containsString("Cannot recover key")); - } + assertNotNull(cf.getSslContext()); } @Test public void testResourceTsWrongPWResourceKs() throws Exception { - Resource keystoreResource = Resource.newSystemResource("keystore"); - Resource truststoreResource = Resource.newSystemResource("keystore"); + Resource keystoreResource = Resource.newSystemResource("keystore.p12"); + Resource truststoreResource = Resource.newSystemResource("keystore.p12"); cf.setKeyStoreResource(keystoreResource); - cf.setTrustStoreResource(truststoreResource); cf.setKeyStorePassword("storepwd"); - cf.setKeyManagerPassword("keypwd"); + cf.setTrustStoreResource(truststoreResource); cf.setTrustStorePassword("wrong_storepwd"); try (StacklessLogging ignore = new StacklessLogging(AbstractLifeCycle.class)) { IOException x = assertThrows(IOException.class, () -> cf.start()); - assertThat(x.getMessage(), containsString("Keystore was tampered with, or password was incorrect")); + assertThat(x.getMessage(), containsString("password was incorrect")); } } @Test - public void testNoKeyConfig() throws Exception + public void testNoKeyConfig() { try (StacklessLogging ignore = new StacklessLogging(AbstractLifeCycle.class)) { @@ -289,11 +262,10 @@ public class SslContextFactoryTest @Test public void testSNICertificates() throws Exception { - Resource keystoreResource = Resource.newSystemResource("snikeystore"); + Resource keystoreResource = Resource.newSystemResource("snikeystore.p12"); cf.setKeyStoreResource(keystoreResource); cf.setKeyStorePassword("storepwd"); - cf.setKeyManagerPassword("keypwd"); cf.start(); @@ -331,8 +303,8 @@ public class SslContextFactoryTest public void testNonDefaultKeyStoreTypeUsedForTrustStore() throws Exception { cf = new SslContextFactory.Server(); - cf.setKeyStoreResource(Resource.newSystemResource("keystore.p12")); - cf.setKeyStoreType("pkcs12"); + cf.setKeyStoreResource(Resource.newSystemResource("keystore.jks")); + cf.setKeyStoreType("jks"); cf.setKeyStorePassword("storepwd"); cf.start(); cf.stop(); diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/ssl/X509Test.java b/jetty-util/src/test/java/org/eclipse/jetty/util/ssl/X509Test.java index 6c15b7a2f7b..a775049dce8 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/ssl/X509Test.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/ssl/X509Test.java @@ -134,8 +134,7 @@ public class X509Test SslContextFactory serverSsl = new SslContextFactory.Server(); Path keystorePath = MavenTestingUtils.getTestResourcePathFile("keystore_sni.p12"); serverSsl.setKeyStoreResource(new PathResource(keystorePath)); - serverSsl.setKeyStorePassword("OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"); - serverSsl.setKeyManagerPassword("OBF:1u2u1wml1z7s1z7a1wnl1u2g"); + serverSsl.setKeyStorePassword("storepwd"); serverSsl.start(); } @@ -145,8 +144,7 @@ public class X509Test SslContextFactory clientSsl = new SslContextFactory.Client(); Path keystorePath = MavenTestingUtils.getTestResourcePathFile("keystore_sni.p12"); clientSsl.setKeyStoreResource(new PathResource(keystorePath)); - clientSsl.setKeyStorePassword("OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"); - clientSsl.setKeyManagerPassword("OBF:1u2u1wml1z7s1z7a1wnl1u2g"); + clientSsl.setKeyStorePassword("storepwd"); clientSsl.start(); } @@ -154,10 +152,9 @@ public class X509Test public void testServerClassWithoutSni() throws Exception { SslContextFactory serverSsl = new SslContextFactory.Server(); - Resource keystoreResource = Resource.newSystemResource("keystore"); + Resource keystoreResource = Resource.newSystemResource("keystore.p12"); serverSsl.setKeyStoreResource(keystoreResource); serverSsl.setKeyStorePassword("storepwd"); - serverSsl.setKeyManagerPassword("keypwd"); serverSsl.start(); } @@ -165,10 +162,9 @@ public class X509Test public void testClientClassWithoutSni() throws Exception { SslContextFactory clientSsl = new SslContextFactory.Client(); - Resource keystoreResource = Resource.newSystemResource("keystore"); + Resource keystoreResource = Resource.newSystemResource("keystore.p12"); clientSsl.setKeyStoreResource(keystoreResource); clientSsl.setKeyStorePassword("storepwd"); - clientSsl.setKeyManagerPassword("keypwd"); clientSsl.start(); } } diff --git a/jetty-util/src/test/resources/keystore b/jetty-util/src/test/resources/keystore deleted file mode 100644 index b727bd0fb777fddb3463c81cb56963a7541f7b45..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1426 zcmezO_TO6u1_mY|W&~r_+{*0KN+9!5EW=$#pv*3VCZ=r$d~96WY>X_7T1LX-9cnmv_92vyZY^nksPD zdgGz_%YMiA%<+G`?zc{_^OTmKsam}GdFt7neK!{P|Bco8Yq|9PvTGT0HqQC!@x9l1 z+kfrLjk$U4PfrzX4>?lEY_X)NU`c_upzVKwLzZV_Z=OB7;%H;~#q=-kB7C15mGAK^ zvQDWpwV1Q=%|)J*vS+h8eD_X&KBLa;y!Ym4fd?y?u6<@yiQRcgW4YSWJ1qI-Q@4qE za4m1Vxao>O&#^E1)!s>&+m1~AFk#ErRgE9c$R|1RHZn>ST)F2PCX`h;GftH|P3C*s zWzB^ZGW^U2Io6G9jl> z6zzz+mrM40Funf&SL@T49sAWnZvUNcc-}kaM`;+(`I*O}e=OTwz2vdB%C^t0KV2dN z8|5bLIJC=m`3p1S>EdUM&gly9o_)k?62R=&u_P~(KYzPEv+V7u$GBF7Yt*targsEg zTQzgVqnKmgxtO%H)!0fto_uWX^v1c;QdM?#toT{0*tgvCKBx=r`VraapZ2`+cgggB z-Pvqw9={ifyv(DLz=%jkh_cpEkNBn#fQtx!K-V#22ApgPb-K(wNrdO3Et=(zk zH%r#4Uj9|=lZlRA5;d`xvpUaban7~tb)L?vqO(?31t6P_KXXUmI|NTdEW^*XD%W$kc6J6C`ZJL_TRc(ux#yKj=Ue_0-Rb!XA^BcIEU@^esCUfRc7B*q_(7f!t{PH}Q2nU7; zJ3>UpKnkRbOIX-9zos$!bwcyY3l3?6uy+&YLB9AjrXwMJ9=TVxnh^gTTRrgQDAx z_HixoIbPSC|G?I^w5omSz6+C2WR&Q742Af!tZ{F_B0c(^#Lh& zza|JWF*7nSB0CQl;mkmH*$SFDWnY}}>VU(o3#<5V+huGG`Dn2??1_qdd2)==i--F? zs#KSqOx?Wrm7jRA(!0Yuu5HVhrWZZce5Lb}5Bq8!uvR=V-JM%7`INM|?JE9h{&PR9 zPS5OYv=7|qeAeX{<0}8%Th2N96wN*x(D1*r!0!3JEkDAd&tKmoUZ_-IpH*z9SS@4J!$Eq6yf`Eb~_yNer!Hwns;D9Pr5C9MmI0?RZsjJI3`MNt5e8N|5Ids2r&PCc< z-fJXsr^l+Lj2hS8gC;=M%sWa4J>D~>t{J<--_$2nKHd`~xV3uH(S$^c>CyVCyz!VU z^=2FH!MxsHXX~P^59gj@3Q{l0g3W%jJA!?$M#m$2};{px0Fma z;R|Vnx*U#>#b;{KN7BYiH0LINrhhqBJjad6^CNaTj2-73pa3Bsobmp1?JMq+LSHIh zVSKOjBz^AUG)qU3Toh^e#SzMG|KR!BB{_NLn~EL9WJ(b2$N2&7yJAW&)u-B-oSnAy zZox4g1*eF_>xKqbb1PY@71|vep}HHL-)-&h7H7GRMcq2l9RTm#_QsoUCkkl?qe z8iO&d4*j_wDwEXMx{oF%pM#7DKH~OZ;D*ha6M4yds3eyq*uh~&XEq*TkjplwCekDQn+lvFI$XR%FMPUDXz07a7zT-49 zWE~hU0)}3n1;wscni!THZ}tXzFbFmml#}90`Y)8^lJJrFxi{(`K`jv?HRV2iLe*|lduNW#)~Fd~ zxK+!r$QbL1@+|&$Ve^wo!y$Xcwih$#QN6KDzCM8mPks}XYyU1&W;OlTIYo{wDDL8Ih?T|*HZDUT`tl6A|)Fi*I0&B*VVMIDE}8y&sC4E%d3B3w0eK?4W` zRtl0}MIZ@EE`~t?D3lAbR{Jsva_U|U$jiZ{nnp<5;spR61O)WM@PJ$#FlRW2Fx1%* zBM9>UBAh5rTi=UeUg1Gr7(Nj7>j;TL*j@JW_reIU_bi)pqmVAX7b60EeE+N9K_O22 zMnuG7gg}8`3K)tjIKbc&`5n@ zX*Qh_fZLDH3bv23NQ&#xL$zHBSoc1=NFK&Yu5^uSL|@DgpWU>wlEsh7eG5!xAja|K zP`J+;;}Oq%USIF&;tY|{d-$`*ek<*-WoEkK9BV?=8qS6)0yIvcA?m0MtKjrfB~NZ> z*hAGhwf1D_jlK-pa4+StSi@Tpl|x3nqNMxb6+L0kEA`t=vZ(rot)Fu}8;Q}o!<23{ zA7Ns-o!pSw_=(6pT9!&R6E`)_BbyXIdB@f{aI$8r;?q7(+c;w_L*s?Q#hfR$q{bFI zahE-$wNCtvff*cTpe-oPenV+KxF}qtaUGH8s-0a0Cbg0M7clVFUjJskx<&b=vG(QVK0^0 zAoK???ADDI3>Yb3QlDVgPJ{^e%9aTR>e^X!$@nv-dKJh~PK`a0E1I{8Z0xaha>#Zy z)c1KKrKY33i>ogP68UPocf}IjS}~S6$cJhw2|n`P;M>6R$vjpZ; literal 0 HcmV?d00001 diff --git a/jetty-util/src/test/resources/keystore.p12 b/jetty-util/src/test/resources/keystore.p12 index b51c835024b001ff73c04030e2b9ad05406849a0..6fe9c5aedbe79d2dbd920bd9e66e571886a247f8 100644 GIT binary patch delta 3660 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 MT|DI|{BL#m5B}Z7U;qFB delta 1238 zcmV;{1S$K-Cgl@&LNQUBu?Ctn$ks$BRpHJ6FIY=;n;$QfWKAL5?DxWC0{L|>Q zjoh%kncEq3NPZurwc`|`7qT6Mcj><&xBox3|(DCd?*ge+9xch>HrF(g!$ZAt=9 zoXUq`SfgZrdFrmcUa=SVl;Picd5e&U1Cek&v*vQ1wJU zXCIY+Ty^&C3W`}*^g!MM#q}?W6aB~cuefhQN~m>iS=$&zSv!!4GR?%rmN&IY*AEH+ z5%C~3?bceFzDksVF#-rS5njsvv#NW>HQh>uN-k|L9?WrZFAkl&-aoYs>yPD@Vs!3VIMR1BF2KTO9A^)cJ*GY_ziiBg-PLXUT? z;rTly3I~zlzUTtHZd4q4DlK`O++cwd7#@@@ymDPYnWsh6p6CgL8!qaTRq1k}a&>@7TdOhLv2!OXI zJ7#>}Y#bOs&@h4pK?VsbhDe4L_YDCD0ic2fG6aGJE--=xDlmctCZRzE0VR`F1tu~v zFd;Ar1_dh)0|FWa00b292*hQ)JWU&d0bQ@h_L18{2pxC?2wL6B;}f)u;{pN*0Oznb Az5oCK diff --git a/jetty-util/src/test/resources/keystore_sni.p12 b/jetty-util/src/test/resources/keystore_sni.p12 index fab22bd8eb807b6d8899e039c0d3e1a146391913..6cef99e930dfc79f822e164c714878afd0586268 100644 GIT binary patch literal 8255 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 QCJTR diff --git a/jetty-util/src/test/resources/snikeystore b/jetty-util/src/test/resources/snikeystore deleted file mode 100644 index 3c69266e0628bc171d4df08956ad2fa7b5d9d994..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6462 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 WZ`)y0ET|{;uTXn}uZ}+m;`%RlLL+wo diff --git a/jetty-util/src/test/resources/snikeystore.p12 b/jetty-util/src/test/resources/snikeystore.p12 new file mode 100644 index 0000000000000000000000000000000000000000..1a0959c6ed73e3804f7ea0763f99928940896444 GIT binary patch literal 7303 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 diff --git a/jetty-websocket/websocket-core/src/test/resources/keystore.p12 b/jetty-websocket/websocket-core/src/test/resources/keystore.p12 new file mode 100644 index 0000000000000000000000000000000000000000..2edd267623f7adb7048285b79a57d9d341f7bbd7 GIT binary patch literal 2565 zcmY+EXEYlM8^`_IHxLU+2YAb>$*Qnmo zaP7T!wMNkEeb4*ed+vwlJm>uW&-4HIgQMsufE1K)6m1KbRx(yE_K1;!ngWNSEeD}! zOD=H{97W~!uZYSDgrYLP#KxCn2&Vtv7sF){4h15^QJ^C@6ioMjd|A#5VgoqdPAN%b z-#oNWDha1GvMM;uhX5%7-NqmksPFtpf0W!l*GK&<5IB3x9H1uQw?!&kze>6l)h#@| zv^nU2jk2v=OWtA*5+7eWU75S`YBja~qsp^a(2LeO2RgKOgmm==SUiv2^nvUBxKlpl zoq!&QoH`K*VX}4EYDk|cm~VPk6h43-a&k?1xTpQgClkU3A#na~79-P5b+QA;MdV*Z?J)VomYF5M3@;P6hyxis$C3o@w zOWivv@w?Y+T{(}L_4|w#Mwqv^nV=bmhXCZIm>|M$v*g+KqlY zZ-3@53L9g7h=o)_EK@h*AXC{l-ZlCORb2U|!Uty_q;xqXdn2Z@9~B)KS`mY-?Q@go zFcuuw&o@iHti&<4j(xQ9L2Fft)*2$JMhh5VlDQXatleYPw7pbxKQ|SN$&}rzj>RWJ zo54$&Kue9X=yUS(isi`tGvvh%&r|SL0&+{b-(vc`Ak6?)k3F_|YM_3-pbV|JqiePM zQa{X;cz1&&wLSm*x&%?}!GdOC)pPGn9GZI(W6)KALN{V-`6NW|-bvdF;4*6~`7E|b z_vc_YHc4ydCTip-!>%k}zSGf}u&nk|4_i&13`P#e5@$(BH_}rzm&>2`W(PNG6ga*{ zcf^dCR_GGjR3R^YT*RWdqB6mao*s}>EdzukV4?SZJgLZ`W};1LK>BO)txNYDC*6Op zxPK6yBO|b`t1kc)PBQ^NM6sJ7Jo}y=D`s5w6j=wy2>QR}*(OmWO%D z1jbuwE(Z=*9UV0yoxTCjnq>3Q>?iw^t(I=msYC5X%qQtw8&>VMs<3T1K}zJspk}a<-Y4y)75y%mOay0FPRVI zp_(~kvf!B4J|pfccI1mKJ*O|h;XVtmJBDqKYXdVP@`I=F1KB8hKj7V1>OEV^MJcNS0e2TcxIM6 zy!D#}QOYwe&qIV+JTo&22+q&O3W{uY}(yoAF2rm7VS?NlxLVo)M=of!Kb{ve|QC_{W#_( z>;ns*nr^ZY+PP!%jDgksDe(~frf4Z(2KN1q#pJPE#eRJ_B~GfxcP9XeiAPGUhS6ih z_#;+CXK`i%I0Pnrh><0{RWi)B|&`2HsHh*3?nu5Wi;WczzK9&?g)4Q$EH zdC_TAvCM2lJs+K_vbjeVLO5$6+xFa8Z|csT9+pmZ?lyNCv!uN%bxi8%mf?C6crFH~ zNwoAU&HoBxs$EROmHWBe_9}njB|a??kA#sKKh1OsbSB}Q)vN793O&Y?Y8q|Gaso{G z%2W4K3=g(oiU}P`P@!_HZpwv30L!veC}%G;Fdpai_Qlbg;B0Ir|6_1;LiJbk@VKA8 zwW?~+G!-F$jPStxv3c7{4P-}0zf_sm|CTkc$Z(+k5P!OEoAg`>Ad5lkfUecDd>Vuw zr|=9Oib1m_6QCyzMY$38=^2YOS=zCy0u><#)Hh+m9^`|98DdtLCd;qm3qxv~*}bOX zC-%JBHTq7hrN<_Y$1S*pBBcJ-70y?mO7@!wY@|lj0r`(>2-3WuS3>x;0#UeQmis+j zMC&4hKmcS<3QyBjmq17nv9N;;M9=)FydUpC5DPLu%wgS`iTD;pb;bGWy`ZrRxH?=2 zP79`zVxk1{Pys+}#!9|G-NKNUk^!ffRE|DO5N3TH#1{7FGhgn{^0NwN5Q$>SM|>k< L)?gqdMJ(X_7T1LX-9cnmv_92vyZY^nksPD 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 MfA~{T0~1UC1(_7L%m4rY literal 0 HcmV?d00001 diff --git a/tests/jetty-jmh/src/main/resources/keystore b/tests/jetty-jmh/src/main/resources/keystore deleted file mode 100644 index b727bd0fb777fddb3463c81cb56963a7541f7b45..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1426 zcmezO_TO6u1_mY|W&~r_+{*0KN+9!5EW=$#pv*3VCZ=r$d~96WY>X_7T1LX-9cnmv_92vyZY^nksPD zdgGz_%YMiA%<+G`?zc{_^OTmKsam}GdFt7neK!{P|Bco8Yq|9PvTGT0HqQC!@x9l1 z+kfrLjk$U4PfrzX4>?lEY_X)NU`c_upzVKwLzZV_Z=OB7;%H;~#q=-kB7C15mGAK^ zvQDWpwV1Q=%|)J*vS+h8eD_X&KBLa;y!Ym4fd?y?u6<@yiQRcgW4YSWJ1qI-Q@4qE za4m1Vxao>O&#^E1)!s>&+m1~AFk#ErRgE9c$R|1RHZn>ST)F2PCX`h;GftH|P3C*s zWzB^ZGW^U2Io6G9jl> z6zzz+mrM40Funf&SL@T49sAWnZvUNcc-}kaM`;+(`I*O}e=OTwz2vdB%C^t0KV2dN z8|5bLIJC=m`3p1S>EdUM&gly9o_)k?62R=&u_P~(KYzPEv+V7u$GBF7Yt*targsEg zTQzgVqnKmgxtO%H)!0fto_uWX^v1c;QdM?#toT{0*tgvCKBx=r`VraapZ2`+cgggB z-Pvqw9={ifyv(DLz=%jkh_cpEkNBn#fQtx!K-V#22ApgPb-K(wNrdO3Et=(zk zH%r#4Uj9|=lZlRA5;d`xvpUaban7~tb)L?vqO(?31t6P_KXXUmI|NTdEW^*XD%W$kc6J6C`ZJL_TRc(ux#yKj=Ue_0-Rb!XA^BcIEU@^esCUfRc7B*q_(7f!t{PH}Q2nU7; zJ3>UpKnkRbOIX-9zos$!bwcyY3l3?6uy+&YLB9AjrXwMJ9=TVxnh^gTTRrgQDAx z_HixoIbPSC|G?I^w5omSz6+C2WR&Q742Af!tZ{F_B0c(^#Lh& zza|JWF*7nSB0CQl;mkmH*$SFDWnY}}>VU(o3#<5V+huGG`Dn2??1_qdd2)==i--F? zs#KSqOx?Wrm7jRA(!0Yuu5HVhrWZZce5Lb}5Bq8!uvR=V-JM%7`INM|?JE9h{&PR9 zPS5OYv=7|qeAeX{<0}8%Th2N96wN*x(D1*r!0!3JEkDAd&tKmoUZ_-IpH*z9SS assertThrows(ExecutionException.class, () -> { - scenario.client.newRequest(scenario.newURI()) + // Use IP address since the certificate contains a host name. + int serverPort = ((ServerConnector)scenario.connector).getLocalPort(); + scenario.client.newRequest("https://127.0.0.1:" + serverPort) .timeout(5, TimeUnit.SECONDS) .send(); }); diff --git a/tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/HttpClientTransportDynamicTest.java b/tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/HttpClientTransportDynamicTest.java index d7639fa8278..ad47c670e32 100644 --- a/tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/HttpClientTransportDynamicTest.java +++ b/tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/HttpClientTransportDynamicTest.java @@ -190,7 +190,7 @@ public class HttpClientTransportDynamicTest private void configureSslContextFactory(SslContextFactory sslContextFactory) { - sslContextFactory.setKeyStorePath("src/test/resources/keystore.jks"); + sslContextFactory.setKeyStorePath("src/test/resources/keystore.p12"); sslContextFactory.setKeyStorePassword("storepwd"); // The mandatory HTTP/2 cipher. sslContextFactory.setIncludeCipherSuites("TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256"); diff --git a/tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/ProxyWithDynamicTransportTest.java b/tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/ProxyWithDynamicTransportTest.java index c41abdd2425..de0a19f82b9 100644 --- a/tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/ProxyWithDynamicTransportTest.java +++ b/tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/ProxyWithDynamicTransportTest.java @@ -116,7 +116,7 @@ public class ProxyWithDynamicTransportTest private void startServer(Handler handler) throws Exception { SslContextFactory.Server sslContextFactory = new SslContextFactory.Server(); - sslContextFactory.setKeyStorePath("src/test/resources/keystore.jks"); + sslContextFactory.setKeyStorePath("src/test/resources/keystore.p12"); sslContextFactory.setKeyStorePassword("storepwd"); sslContextFactory.setUseCipherSuitesOrder(true); sslContextFactory.setCipherComparator(HTTP2Cipher.COMPARATOR); @@ -147,7 +147,7 @@ public class ProxyWithDynamicTransportTest private void startProxy(ConnectHandler connectHandler) throws Exception { SslContextFactory.Server sslContextFactory = new SslContextFactory.Server(); - sslContextFactory.setKeyStorePath("src/test/resources/keystore.jks"); + sslContextFactory.setKeyStorePath("src/test/resources/keystore.p12"); sslContextFactory.setKeyStorePassword("storepwd"); sslContextFactory.setUseCipherSuitesOrder(true); sslContextFactory.setCipherComparator(HTTP2Cipher.COMPARATOR); diff --git a/tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/TransportScenario.java b/tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/TransportScenario.java index 9f679e2c278..14b06650825 100644 --- a/tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/TransportScenario.java +++ b/tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/TransportScenario.java @@ -365,10 +365,8 @@ public class TransportScenario private void configureSslContextFactory(SslContextFactory sslContextFactory) { - sslContextFactory.setKeyStorePath("src/test/resources/keystore.jks"); + sslContextFactory.setKeyStorePath("src/test/resources/keystore.p12"); sslContextFactory.setKeyStorePassword("storepwd"); - sslContextFactory.setTrustStorePath("src/test/resources/truststore.jks"); - sslContextFactory.setTrustStorePassword("storepwd"); sslContextFactory.setUseCipherSuitesOrder(true); sslContextFactory.setCipherComparator(HTTP2Cipher.COMPARATOR); } diff --git a/tests/test-http-client-transport/src/test/resources/keystore.jks b/tests/test-http-client-transport/src/test/resources/keystore.jks deleted file mode 100644 index 428ba54776ede2fdcdeedd879edb927c2abd9953..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2206 zcmcgt`9Bkm8{cNkoMUp6gmShKn!AQX*(l6Nj(i=TnQPOKYtv{*Wg>ItE=Q!pRYH8a z$Sp#S#2lYw#aw;$y9u4T}83H*%lp zAKZay0sy=q1Qoo85aAQh;$ zD(c2EIN#D7WwYDLKUg!CotQPD@dp;5FR#bgaace(^x$6g5frD~(_b(MI^J&*A2DRp zf5Q2onfE(zvUb9|9C`66)YFRNM6~xrz4;iVbU=P|*YT2eWHFJJtr+M@zt2qPm)K~rRcqcs=LM12)PX0TT%QO zlf*xkqD3}7l)1J`5W(>=9nR0e6j-<79<11v3ZuXXcQpoCsqY~n`$FN+S}hcVm5Y>G zXnD{@DYs1@{S0z(lW+?86LWKtku$$-(khsh>0qRUXn=84`GRn?77M^_JY`durnN;KE zW#OJ`h<6xcB{I))ekGpc*Ylt}0cx4|OMBDPQvx4`r`}4Ze5_ipdObGMTi3bZHd5PC zcY0;?uBWu$PSvjJeb87nY7ghNv?%M@SoDl6IWt`bQCosfSh$#D6$ea~QhKM^ud2Ut z+9PYJuVpoELmN-A`F$BicO{BSYg@#tS%avVfb}DxL)|NanJ)#zB!2~?#Ot%H7--9N zU$bs0fS5G!m5M4&WK3#a|H|Tgw*?X-;H+Lu@kwA>qSR~7UC7b)7MJXTn6PG>n@8jP zW+}F^X$$c;U~4ryqRF; z>`j!tbLMK4ZGyY643|~?%Mu#fm!l%wAKjBDmd+VYmp3S#$scD$~bxbf|z#)hShN0*AhRaPDcmqrftGlHq4^54MM$Xfy(2> zH8QYVMzmn_oHbvJCB`IN~E&{1*h&0gEM{e zKvWvzp(!BqMX8`t#)~0nq}Wa zr6>FRPyp;AAB&)1$5@;r$23J{K&~>TWjZf7V$wFzmGM95CXhFG1cJNVAXks}C+&2- zbf9Qn*D8N}Afd2kpwDxns3%1uaFhAqDV8ksWiWY|quuLGZ0)SqrJ!Y8yX}@}IyC$C zQ3rCUsn}#>F#D8%D?q~ySy4j&he%Bs{{7V%rl!ui`@KQP?NTi+_iN{cwom&9RaMRR zB~z!hz|0HAgB9_Ijvpe-zr#jLbckJsc>vmo{+im?t8lA;N#fD4?{lb&J0V8Gocq%; f1ihv=QIDh{M_<9V+45Z2{KE4_qW}V3B0uV%GgrOJ diff --git a/tests/test-http-client-transport/src/test/resources/keystore.p12 b/tests/test-http-client-transport/src/test/resources/keystore.p12 new file mode 100644 index 0000000000000000000000000000000000000000..089e9704a7a83ab924343e74900eeee8b264e82a GIT binary patch literal 2565 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 K*=+x>r_BKeJV|!| diff --git a/tests/test-integration/src/test/java/org/eclipse/jetty/test/HttpInputIntegrationTest.java b/tests/test-integration/src/test/java/org/eclipse/jetty/test/HttpInputIntegrationTest.java index 02d19b49300..f55a84dd5c9 100644 --- a/tests/test-integration/src/test/java/org/eclipse/jetty/test/HttpInputIntegrationTest.java +++ b/tests/test-integration/src/test/java/org/eclipse/jetty/test/HttpInputIntegrationTest.java @@ -104,9 +104,8 @@ public class HttpInputIntegrationTest // SSL Context Factory for HTTPS and HTTP/2 String jettyDistro = System.getProperty("jetty.distro", "../../jetty-distribution/target/distribution"); __sslContextFactory = new SslContextFactory.Server(); - __sslContextFactory.setKeyStorePath(jettyDistro + "/../../../jetty-server/src/test/config/etc/keystore"); - __sslContextFactory.setKeyStorePassword("OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"); - __sslContextFactory.setKeyManagerPassword("OBF:1u2u1wml1z7s1z7a1wnl1u2g"); + __sslContextFactory.setKeyStorePath(jettyDistro + "/../../../jetty-server/src/test/resources/keystore.p12"); + __sslContextFactory.setKeyStorePassword("storepwd"); // HTTPS Configuration __sslConfig = new HttpConfiguration(__config); diff --git a/tests/test-integration/src/test/resources/keystore b/tests/test-integration/src/test/resources/keystore deleted file mode 100644 index b727bd0fb777fddb3463c81cb56963a7541f7b45..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1426 zcmezO_TO6u1_mY|W&~r_+{*0KN+9!5EW=$#pv*3VCZ=r$d~96WY>X_7T1LX-9cnmv_92vyZY^nksPD zdgGz_%YMiA%<+G`?zc{_^OTmKsam}GdFt7neK!{P|Bco8Yq|9PvTGT0HqQC!@x9l1 z+kfrLjk$U4PfrzX4>?lEY_X)NU`c_upzVKwLzZV_Z=OB7;%H;~#q=-kB7C15mGAK^ zvQDWpwV1Q=%|)J*vS+h8eD_X&KBLa;y!Ym4fd?y?u6<@yiQRcgW4YSWJ1qI-Q@4qE za4m1Vxao>O&#^E1)!s>&+m1~AFk#ErRgE9c$R|1RHZn>ST)F2PCX`h;GftH|P3C*s zWzB^ZGW^U2Io6G9jl> z6zzz+mrM40Funf&SL@T49sAWnZvUNcc-}kaM`;+(`I*O}e=OTwz2vdB%C^t0KV2dN z8|5bLIJC=m`3p1S>EdUM&gly9o_)k?62R=&u_P~(KYzPEv+V7u$GBF7Yt*targsEg zTQzgVqnKmgxtO%H)!0fto_uWX^v1c;QdM?#toT{0*tgvCKBx=r`VraapZ2`+cgggB z-Pvqw9={ifyv(DLz=%jkh_cpEkNBn#fQtx!K-V#22ApgPb-K(wNrdO3Et=(zk zH%r#4Uj9|=lZlRA5;d`xvpUaban7~tb)L?vqO(?31t6P_KXXUmI|NTdEW^*XD%W$kc6J6C`ZJL_TRc(ux#yKj=Ue_0-Rb!XA^BcIEU@^esCUfRc7B*q_(7f!t{PH}Q2nU7; zJ3>UpKnkRbOIX-9zos$!bwcyY3l3?6uy+&YLB9AjrXwMJ9=TVxnh^gTTRrgQDAx z_HixoIbPSC|G?I^w5omSz6+C2WR&Q742Af!tZ{F_B0c(^#Lh& zza|JWF*7nSB0CQl;mkmH*$SFDWnY}}>VU(o3#<5V+huGG`Dn2??1_qdd2)==i--F? zs#KSqOx?Wrm7jRA(!0Yuu5HVhrWZZce5Lb}5Bq8!uvR=V-JM%7`INM|?JE9h{&PR9 zPS5OYv=7|qeAeX{<0}8%Th2N96wN*x(D1*r!0!3JEkDAd&tKmoUZ_-IpH*z9SS - / + / - / + / diff --git a/tests/test-sessions/test-mongodb-sessions/src/test/resources/keystore b/tests/test-sessions/test-mongodb-sessions/src/test/resources/keystore deleted file mode 100644 index b727bd0fb777fddb3463c81cb56963a7541f7b45..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1426 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 diff --git a/tests/test-webapps/test-http2-webapp/src/test/resources/keystore.p12 b/tests/test-webapps/test-http2-webapp/src/test/resources/keystore.p12 new file mode 100644 index 0000000000000000000000000000000000000000..f76563f10ecac7ab729d44fb1045300df1fada7b GIT binary patch literal 2565 zcmY+FXH*ji633GedJA1Tp?4EH;!>q8MLH-_L?9|13@y|Ep%YXhov=XYRi()xOYcgP z8k#ieQZxu6$KAWzefweFy!ZRh%*Wrr&@@00kPL>Ven&wqi7~*C=z)~LLNs+17)@Pv zjf-Jua>PF(ayu}Z-0B*eU6(Nh?fK10n--n}N~b0i(OdMSPH(9G*~+fsQrXuie!UVI85)ZsxSS8|3`a z%CG4B;=(IP_Hn{xdXeMFU+ZMc*o!~4{?4~+)R?}N@uf8=OLB49eHPwU<3t5!AZde^kEK z+m1~2MS3@#N8*Ons@4{Asu%|_YlY%>vB?Nw<$G4_oJ%DS4giO$KkP?S%p(!{H)mRd z8`c9AzO7GkC+Pt1HWgrNMyP$v!r2X~6+EhoOgVX^j)yMgN$#8r`fB8dN>mQb)c5D{ zoh}QyR5>N9r?^#$lH*S*>5c$-?DVAa`N|#r$Wgz2P)Zu{!!hT_fEAFpTkW3?9gL`a zozRE9P6}9jdfQGDNtfuXqfVH8HaiwJ5&AFpX>S(2vr{;YKA*+$>Q$&{b4Q-`n<(j3 zpyPZo(lyQ2%C|3mR2%|A@EXl9hpjTuxD?aL2TIaAw<}{bvjU0uN`&3IEmV9hB5*F( z&ZR@Uw?I&@!Mq+(=HQpMD;B?)D89p1ONrUsS116lF0oOFmFbM(|U6-y^yHLM6#C528WhF*1vz z+KYw0#tUO`OOId!$V1viov$}u10S8-%JT`m!ArE`#{4PicZg7h?_MfxScYk{R+?YEo9PXu@|mE^b?@+i=`^IA!>(;N6A>F}b43ekeWPKxT6r zX(r$qA!OukEo>2HWp*;bMJ!d;{(>3e|9usqd!k-}7YjG-{vuku7W5>=s^0A*BN8{K z#PNea*rjs6+|Ak<0ZzL;u&A(UJ1?Wk$#BzdR;!O-;-cOm`6@OXO1bZ;9v<%-R(lhgL`>PjTV3bPy5-h8a>+soi5 zp?z7wTZvbb_?$~VxMh-j26OVf5}~v_@AODr*ZPgkby(UDgN0xhBkM=0o-LacxtP zYXk)W0oRS|?*#Y{zf%0iucjbldY)G3x~AZd?TVL4w1e*JrT_J76q;;hIDopfg81#N z5;XbKcMXvoNYRMVTj5Em`(x+a#kfM*x2E5e7(R7s4D>`oB6xxUA3U{l zoodiP#JGQ>QDT1Whj_ARCe{L}ZRw)6D&UKc2ZDiOnNwNjy?O2G;LeGlBHAn54e2;N zsY#)W*9P)&oKN#l8-*5r)x0y0mLQl9IpnG!2y3SxDZ*fWao|zcbE-*YpfnNsPWycx zI&5bK(S!DRGt#_uDAzyxxJ81b=~+;YeEPNe<*NTYaIEk$pzD&3K{0uzT@=9u`S`4_=Zg=Xmq3lJr zPj}iv9+y{e9;JkX)CIkWr+iX4nl85PyDR(JJYMDUQlMf7z0^{@Msj?MZ$k2NJ|@TK zi}!8mE-;LjtFF;ve2r0~4^({99x~ms{Dw8zm^xuuJ(Kc{5{#Z)hFW*mFQF7B7WgB# zchL1okGJzEXZ*Vdv{d3(HsM__TL_D{Q^vyYghyC9=Ux0D-hTwkBqB_kb9TCE6CW3t ze5jKp^&to>o~R*}Xque24}w3=#~<^8&{vanU+_^*bvVCv6T4cA%4V)tVGrh6AQw#I z9*94NN}su6$ZS7W);P&u#@!t0DcIH;Qq0 zs+EaRur04v_2K14!f>Q09wqWlWBW{>8PF=e*5Fk`Pd?mu-1H*dkzr@KX0czwh-cRv ziCVFi9-*`*1ke`s)z|IikL#s=gAvy`ENA@!WwVHx!Ep&$)=~bhp$Av~&rD#b54-my zOHwiZTj`mp%pOb~28B^m zkV`R;fw;&4VAew~Bz%Z{RjK#zWMC-yguq^T)C^|*A!cprVOLWco5_qA`fwf=&U3&7 JA_HOy{|&mv% org.eclipse.jetty - jetty-alpn-server + jetty-alpn-java-server ${project.version} test diff --git a/tests/test-webapps/test-proxy-webapp/src/test/java/org/eclipse/jetty/TestTransparentProxyServer.java b/tests/test-webapps/test-proxy-webapp/src/test/java/org/eclipse/jetty/TestTransparentProxyServer.java index c2426d19d6f..9196c3d6345 100644 --- a/tests/test-webapps/test-proxy-webapp/src/test/java/org/eclipse/jetty/TestTransparentProxyServer.java +++ b/tests/test-webapps/test-proxy-webapp/src/test/java/org/eclipse/jetty/TestTransparentProxyServer.java @@ -80,10 +80,9 @@ public class TestTransparentProxyServer // SSL configurations SslContextFactory.Server sslContextFactory = new SslContextFactory.Server(); - sslContextFactory.setKeyStorePath(jettyRoot + "/jetty-server/src/main/config/etc/keystore"); + sslContextFactory.setKeyStorePath(jettyRoot + "/jetty-server/src/main/config/modules/test-keystore/keystore.p12"); sslContextFactory.setKeyStorePassword("OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"); - sslContextFactory.setKeyManagerPassword("OBF:1u2u1wml1z7s1z7a1wnl1u2g"); - sslContextFactory.setTrustStorePath(jettyRoot + "/jetty-server/src/main/config/etc/keystore"); + sslContextFactory.setTrustStorePath(jettyRoot + "/jetty-server/src/main/config/modules/test-keystore/keystore.p12"); sslContextFactory.setTrustStorePassword("OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"); sslContextFactory.setExcludeCipherSuites( "SSL_RSA_WITH_DES_CBC_SHA", From 4b9fec0cf3588b055eb6b12e237383828453c304 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Thu, 30 Jan 2020 17:53:41 +0100 Subject: [PATCH 2/3] Updates after review. Signed-off-by: Simone Bordet --- .../src/main/config/modules/test-keystore.mod | 2 +- .../{keystore.p12 => test-keystore.p12} | Bin .../jetty/test/HttpInputIntegrationTest.java | 3 +-- .../src/test/resources/keystore.p12 | Bin 0 -> 2565 bytes 4 files changed, 2 insertions(+), 3 deletions(-) rename jetty-server/src/main/config/modules/test-keystore/{keystore.p12 => test-keystore.p12} (100%) create mode 100644 tests/test-integration/src/test/resources/keystore.p12 diff --git a/jetty-server/src/main/config/modules/test-keystore.mod b/jetty-server/src/main/config/modules/test-keystore.mod index 40cf74e70da..42dd6a0a90c 100644 --- a/jetty-server/src/main/config/modules/test-keystore.mod +++ b/jetty-server/src/main/config/modules/test-keystore.mod @@ -9,7 +9,7 @@ ssl ssl [files] -basehome:modules/test-keystore/keystore.p12|etc/test-keystore.p12 +basehome:modules/test-keystore/test-keystore.p12|etc/test-keystore.p12 [ini] jetty.sslContext.keyStorePath?=etc/test-keystore.p12 diff --git a/jetty-server/src/main/config/modules/test-keystore/keystore.p12 b/jetty-server/src/main/config/modules/test-keystore/test-keystore.p12 similarity index 100% rename from jetty-server/src/main/config/modules/test-keystore/keystore.p12 rename to jetty-server/src/main/config/modules/test-keystore/test-keystore.p12 diff --git a/tests/test-integration/src/test/java/org/eclipse/jetty/test/HttpInputIntegrationTest.java b/tests/test-integration/src/test/java/org/eclipse/jetty/test/HttpInputIntegrationTest.java index f55a84dd5c9..2474e1ad945 100644 --- a/tests/test-integration/src/test/java/org/eclipse/jetty/test/HttpInputIntegrationTest.java +++ b/tests/test-integration/src/test/java/org/eclipse/jetty/test/HttpInputIntegrationTest.java @@ -102,9 +102,8 @@ public class HttpInputIntegrationTest __server.addConnector(http); // SSL Context Factory for HTTPS and HTTP/2 - String jettyDistro = System.getProperty("jetty.distro", "../../jetty-distribution/target/distribution"); __sslContextFactory = new SslContextFactory.Server(); - __sslContextFactory.setKeyStorePath(jettyDistro + "/../../../jetty-server/src/test/resources/keystore.p12"); + __sslContextFactory.setKeyStorePath("src/test/resources/keystore.p12"); __sslContextFactory.setKeyStorePassword("storepwd"); // HTTPS Configuration diff --git a/tests/test-integration/src/test/resources/keystore.p12 b/tests/test-integration/src/test/resources/keystore.p12 new file mode 100644 index 0000000000000000000000000000000000000000..5c14fee0c85c1cfaa8de3e56d380988e4c3672a8 GIT binary patch literal 2565 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 Date: Thu, 30 Jan 2020 18:47:37 +0100 Subject: [PATCH 3/3] Using only non-obfuscated passwords in tests. Signed-off-by: Simone Bordet --- .../alpn/conscrypt/server/ConscryptHTTP2ServerTest.java | 2 +- .../jetty/osgi/test/TestJettyOSGiBootHTTP2Conscrypt.java | 4 +--- .../eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2JDK9.java | 4 +--- .../java/org/eclipse/jetty/TestTransparentProxyServer.java | 6 ++---- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/jetty-alpn/jetty-alpn-conscrypt-server/src/test/java/org/eclipse/jetty/alpn/conscrypt/server/ConscryptHTTP2ServerTest.java b/jetty-alpn/jetty-alpn-conscrypt-server/src/test/java/org/eclipse/jetty/alpn/conscrypt/server/ConscryptHTTP2ServerTest.java index 92c09d3b7e7..bce64c886a9 100644 --- a/jetty-alpn/jetty-alpn-conscrypt-server/src/test/java/org/eclipse/jetty/alpn/conscrypt/server/ConscryptHTTP2ServerTest.java +++ b/jetty-alpn/jetty-alpn-conscrypt-server/src/test/java/org/eclipse/jetty/alpn/conscrypt/server/ConscryptHTTP2ServerTest.java @@ -81,7 +81,7 @@ public class ConscryptHTTP2ServerTest Path path = Paths.get("src", "test", "resources"); File keys = path.resolve("keystore.p12").toFile(); sslContextFactory.setKeyStorePath(keys.getAbsolutePath()); - sslContextFactory.setKeyStorePassword("OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"); + sslContextFactory.setKeyStorePassword("storepwd"); sslContextFactory.setProvider("Conscrypt"); if (JavaVersion.VERSION.getPlatform() < 9) { diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2Conscrypt.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2Conscrypt.java index d48faf6dac6..20aceef34c2 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2Conscrypt.java +++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2Conscrypt.java @@ -140,9 +140,7 @@ public class TestJettyOSGiBootHTTP2Conscrypt ClientConnector clientConnector = new ClientConnector(); SslContextFactory.Client sslContextFactory = new SslContextFactory.Client(); sslContextFactory.setKeyStorePath(keys.getAbsolutePath()); - sslContextFactory.setKeyStorePassword("OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"); - sslContextFactory.setTrustStorePath(keys.getAbsolutePath()); - sslContextFactory.setTrustStorePassword("OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"); + sslContextFactory.setKeyStorePassword("storepwd"); sslContextFactory.setProvider("Conscrypt"); sslContextFactory.setEndpointIdentificationAlgorithm(null); if (JavaVersion.VERSION.getPlatform() < 9) diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2JDK9.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2JDK9.java index a59c6f5cb59..37592a392be 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2JDK9.java +++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2JDK9.java @@ -134,9 +134,7 @@ public class TestJettyOSGiBootHTTP2JDK9 ClientConnector clientConnector = new ClientConnector(); SslContextFactory.Client sslContextFactory = new SslContextFactory.Client(); sslContextFactory.setKeyStorePath(keys.getAbsolutePath()); - sslContextFactory.setKeyStorePassword("OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"); - sslContextFactory.setTrustStorePath(keys.getAbsolutePath()); - sslContextFactory.setTrustStorePassword("OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"); + sslContextFactory.setKeyStorePassword("storepwd"); sslContextFactory.setEndpointIdentificationAlgorithm(null); clientConnector.setSslContextFactory(sslContextFactory); http2Client = new HTTP2Client(clientConnector); diff --git a/tests/test-webapps/test-proxy-webapp/src/test/java/org/eclipse/jetty/TestTransparentProxyServer.java b/tests/test-webapps/test-proxy-webapp/src/test/java/org/eclipse/jetty/TestTransparentProxyServer.java index 9196c3d6345..844b756c225 100644 --- a/tests/test-webapps/test-proxy-webapp/src/test/java/org/eclipse/jetty/TestTransparentProxyServer.java +++ b/tests/test-webapps/test-proxy-webapp/src/test/java/org/eclipse/jetty/TestTransparentProxyServer.java @@ -80,10 +80,8 @@ public class TestTransparentProxyServer // SSL configurations SslContextFactory.Server sslContextFactory = new SslContextFactory.Server(); - sslContextFactory.setKeyStorePath(jettyRoot + "/jetty-server/src/main/config/modules/test-keystore/keystore.p12"); - sslContextFactory.setKeyStorePassword("OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"); - sslContextFactory.setTrustStorePath(jettyRoot + "/jetty-server/src/main/config/modules/test-keystore/keystore.p12"); - sslContextFactory.setTrustStorePassword("OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"); + sslContextFactory.setKeyStorePath(jettyRoot + "/jetty-server/src/main/config/modules/test-keystore/test-keystore.p12"); + sslContextFactory.setKeyStorePassword("storepwd"); sslContextFactory.setExcludeCipherSuites( "SSL_RSA_WITH_DES_CBC_SHA", "SSL_DHE_RSA_WITH_DES_CBC_SHA",