[geode] branch develop updated: GEODE-5819: update the keystore used in ssl test to make it jdk11 compatible. (#2664)

[jinmeiliao]

This is an automated email from the ASF dual-hosted git repository.

jinmeiliao pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new 646ff59  GEODE-5819: update the keystore used in ssl test to make it 
jdk11 compatible. (#2664)
646ff59 is described below

commit 646ff599b691e940b05bcbd8ce86ffb267ead7f3
Author: jinmeiliao <jil...@pivotal.io>
AuthorDate: Thu Oct 18 14:17:13 2018 -0700

    GEODE-5819: update the keystore used in ssl test to make it jdk11 
compatible. (#2664)
---
 .../tcpserver/TCPClientSSLIntegrationTest.java         |  11 +++++------
 .../v1/acceptance/CacheConnectionJUnitTest.java        |   6 ++++++
 .../protocol/protobuf/v1/acceptance/default.keystore   | Bin 1115 -> 534 bytes
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git 
a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/tcpserver/TCPClientSSLIntegrationTest.java
 
b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/tcpserver/TCPClientSSLIntegrationTest.java
index f327db2..858a469 100644
--- 
a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/tcpserver/TCPClientSSLIntegrationTest.java
+++ 
b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/tcpserver/TCPClientSSLIntegrationTest.java
@@ -148,9 +148,8 @@ public class TCPClientSSLIntegrationTest {
 
     assertThatExceptionOfType(LocatorCancelException.class)
         .isThrownBy(() -> client.requestToServer(localhost, port, 
Boolean.valueOf(false), 5 * 1000))
-        .withCause(
-            new 
SSLHandshakeException("java.security.cert.CertificateException: No name 
matching "
-                + localhost.getHostName() + " found"));
+        .withCauseInstanceOf(SSLHandshakeException.class)
+        .withStackTraceContaining("No name matching " + 
localhost.getHostName() + " found");
   }
 
   @Test
@@ -166,9 +165,9 @@ public class TCPClientSSLIntegrationTest {
 
     assertThatExceptionOfType(LocatorCancelException.class)
         .isThrownBy(() -> client.requestToServer(localhost, port, 
Boolean.valueOf(false), 5 * 1000))
-        .withCause(new SSLHandshakeException(
-            "java.security.cert.CertificateException: No subject alternative 
DNS name matching "
-                + localhost.getHostName() + " found."));
+        .withCauseInstanceOf(SSLHandshakeException.class)
+        .withStackTraceContaining("No subject alternative DNS name matching "
+            + localhost.getHostName() + " found.");
   }
 
   private static class FakeTcpServer extends TcpServer {
diff --git 
a/geode-protobuf/src/integrationTest/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheConnectionJUnitTest.java
 
b/geode-protobuf/src/integrationTest/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheConnectionJUnitTest.java
index 1f135fb..e3f1712 100644
--- 
a/geode-protobuf/src/integrationTest/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheConnectionJUnitTest.java
+++ 
b/geode-protobuf/src/integrationTest/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheConnectionJUnitTest.java
@@ -82,6 +82,12 @@ public class CacheConnectionJUnitTest {
   private final String TEST_VALUE = "testValue";
   private final String TEST_REGION = "testRegion";
 
+  /*
+   * This file was generated with the following command:
+   * keytool -genkey -dname "CN=localhost" -alias self -validity 3650 -keyalg 
EC \
+   * -keystore default.keystore -keypass password -storepass password \
+   * -ext san=ip:127.0.0.1 -storetype jks
+   */
   private final String DEFAULT_STORE = "default.keystore";
   private final String SSL_PROTOCOLS = "any";
   private final String SSL_CIPHERS = "any";
diff --git 
a/geode-protobuf/src/integrationTest/resources/org/apache/geode/internal/protocol/protobuf/v1/acceptance/default.keystore
 
b/geode-protobuf/src/integrationTest/resources/org/apache/geode/internal/protocol/protobuf/v1/acceptance/default.keystore
index 8dce373..6f2db5a 100644
Binary files 
a/geode-protobuf/src/integrationTest/resources/org/apache/geode/internal/protocol/protobuf/v1/acceptance/default.keystore
 and 
b/geode-protobuf/src/integrationTest/resources/org/apache/geode/internal/protocol/protobuf/v1/acceptance/default.keystore
 differ