@@ -78,7 +78,6 @@ public void cleanup() throws Exception {
78
78
/**
79
79
* Tests reloading a keystore that is used in the KeyManager of SSLContext
80
80
*/
81
- @ AwaitsFix (bugUrl = "https://github.com/elastic/elasticsearch/issues/32124" )
82
81
public void testReloadingKeyStore () throws Exception {
83
82
assumeFalse ("Can't run in a FIPS JVM" , inFipsJvm ());
84
83
final Path tempDir = createTempDir ();
@@ -192,7 +191,6 @@ public void testPEMKeyConfigReloading() throws Exception {
192
191
* Tests the reloading of SSLContext when the trust store is modified. The same store is used as a TrustStore (for the
193
192
* reloadable SSLContext used in the HTTPClient) and as a KeyStore for the MockWebServer
194
193
*/
195
- @ AwaitsFix (bugUrl = "https://github.com/elastic/elasticsearch/issues/32124" )
196
194
public void testReloadingTrustStore () throws Exception {
197
195
assumeFalse ("Can't run in a FIPS JVM" , inFipsJvm ());
198
196
Path tempDir = createTempDir ();
@@ -479,7 +477,9 @@ private static MockWebServer getSslServer(Path keyStorePath, String keyStorePass
479
477
try (InputStream is = Files .newInputStream (keyStorePath )) {
480
478
keyStore .load (is , keyStorePass .toCharArray ());
481
479
}
482
- final SSLContext sslContext = new SSLContextBuilder ().loadKeyMaterial (keyStore , keyStorePass .toCharArray ())
480
+ // TODO Revisit TLS1.2 pinning when TLS1.3 is fully supported
481
+ // https://github.com/elastic/elasticsearch/issues/32276
482
+ final SSLContext sslContext = new SSLContextBuilder ().useProtocol ("TLSv1.2" ).loadKeyMaterial (keyStore , keyStorePass .toCharArray ())
483
483
.build ();
484
484
MockWebServer server = new MockWebServer (sslContext , false );
485
485
server .enqueue (new MockResponse ().setResponseCode (200 ).setBody ("body" ));
@@ -493,7 +493,9 @@ private static MockWebServer getSslServer(Path keyPath, Path certPath, String pa
493
493
keyStore .load (null , password .toCharArray ());
494
494
keyStore .setKeyEntry ("testnode_ec" , PemUtils .readPrivateKey (keyPath , password ::toCharArray ), password .toCharArray (),
495
495
CertParsingUtils .readCertificates (Collections .singletonList (certPath )));
496
- final SSLContext sslContext = new SSLContextBuilder ().loadKeyMaterial (keyStore , password .toCharArray ())
496
+ // TODO Revisit TLS1.2 pinning when TLS1.3 is fully supported
497
+ // https://github.com/elastic/elasticsearch/issues/32276
498
+ final SSLContext sslContext = new SSLContextBuilder ().useProtocol ("TLSv1.2" ).loadKeyMaterial (keyStore , password .toCharArray ())
497
499
.build ();
498
500
MockWebServer server = new MockWebServer (sslContext , false );
499
501
server .enqueue (new MockResponse ().setResponseCode (200 ).setBody ("body" ));
0 commit comments