GG-23137 Cache SSLContext in SslContextFactory.

gridgain · Nov 8, 2019 · 701b9ee · 701b9ee
1 parent a2b8a1b
commit 701b9ee
Show file tree

Hide file tree

Showing 59 changed files with 721 additions and 341 deletions.
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSSLTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSSLTest.java
@@ -50,7 +50,7 @@ public class JdbcThinConnectionSSLTest extends JdbcThinAbstractSelfTest {
 
     /** Trust key store path. */
     private static final String TRUST_KEY_STORE_PATH = U.getIgniteHome() +
-        "/modules/clients/src/test/keystore/trust.jks";
+        "/modules/clients/src/test/keystore/trust-one.jks";
 
     /** SSL context factory. */
     private static Factory<SSLContext> sslCtxFactory;

diff --git a/modules/clients/src/test/keystore/README.txt b/modules/clients/src/test/keystore/README.txt
@@ -0,0 +1,11 @@
+This directory contains certification authorities, trust stores and keys, that are used in tests.
+
+In order to generate CAs, run the generate-ca.sh script.
+It will create all needed CAs from scratch and all needed trust-stores.
+In order for it to work, the ca directory should be removed.
+
+To generate keys, run the generate-keys.sh script.
+In order to create new keys, you can comment out calls to createStore, add new ones and run the script.
+
+If keys are expired and need to be generated again, the easiest way is to generate CAs from scratch and replace all
+keys with the new ones.
diff --git a/modules/clients/src/test/keystore/ca/node01.jks b/modules/clients/src/test/keystore/ca/node01.jks
diff --git a/modules/clients/src/test/keystore/ca/node02.jks b/modules/clients/src/test/keystore/ca/node02.jks
diff --git a/modules/clients/src/test/keystore/ca/node02old.jks b/modules/clients/src/test/keystore/ca/node02old.jks
diff --git a/modules/clients/src/test/keystore/ca/node03.jks b/modules/clients/src/test/keystore/ca/node03.jks
diff --git a/modules/clients/src/test/keystore/ca/oneca-index.txt b/modules/clients/src/test/keystore/ca/oneca-index.txt
@@ -0,0 +1,3 @@
+V	391107193744Z		01	unknown	/CN=client
+V	391107193746Z		02	unknown	/CN=server
+V	391107193750Z		03	unknown	/CN=node01
diff --git a/modules/clients/src/test/keystore/ca/oneca-serial b/modules/clients/src/test/keystore/ca/oneca-serial
@@ -0,0 +1 @@
+04
diff --git a/modules/clients/src/test/keystore/ca/oneca.cnf b/modules/clients/src/test/keystore/ca/oneca.cnf
@@ -2,38 +2,32 @@
 #
 # Copyright 2019 GridGain Systems, Inc. and Contributors.
 #
-# Licensed under the GridGain Community Edition License (the "License");
+# Licensed under the GridGain Community Edition License (the License);
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     https://www.gridgain.com/products/software/community-edition/gridgain-community-edition-license
 #
 # Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
+# distributed under the License is distributed on an AS IS BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-#       http://www.apache.org/licenses/LICENSE-2.0
-
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
 
 [ ca ]
 default_ca = oneca
 
 [ oneca ]
-certificate = ./oneca.pem
-database = ./oneindex.txt
-private_key = ./oneca.key
-new_certs_dir = ./
+dir=ca
+certificate = $dir/oneca.pem
+database = $dir/oneca-index.txt
+private_key = $dir/oneca.key
+new_certs_dir = $dir/certs
 default_md = sha1
-serial = ./oneserial
-default_days = 365
 policy = policy_match
+serial = $dir/oneca-serial
+default_days = 365
 
 [policy_match]
 commonName = supplied
diff --git a/modules/clients/src/test/keystore/ca/oneca.key b/modules/clients/src/test/keystore/ca/oneca.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDw4NjQ0YkcVbBo
-jvaXpcIB6fay0saNihfQ85anbxI63fvnOnUZrXnfwruUP5Az57WHi2+qzHLujytE
-QqCqo/PlSQ5jJ7s2HJVPgDVCM6qlc9/wXaYHTfGmurbf3DCGY8+qDBNcs2M5Kztj
-Pb0RIn++idVUBiiVlgrj+Tqy6AatNT6r70EBLQnVmR6aU+z/iuDNzj4M/DA35C61
-Fug4zYQIJEENSRNtNtp5VDfMaopAwZTg0ENCz5nhSAv6d0NHDsZWtK60P9nuOFsJ
-16Hmlv/RyHaVSf+OvxZjZDcWhEorlHA5mhF/RU/8iczstE2JMk6vOQ0LwKO+05gL
-2/9oJKYrAgMBAAECggEBAOf8xRQoGdMuO94Xgir/O2A4gp4rHYsHqnRVhYzwDjCf
-xpIl3M3EI5J7q8jVhv5WdKB8jCmFClPzkwoE2VQ+3xC+UZrxkv5EfRC6O5DszbbX
-aJ/IsbRrPwcC4EmteRaVXlU5mBQ5uKBAoMutlD/CaCGMAecQn1mhzg9N41iW2odI
-2AxK8ATSogCyNdVe82bedVXauBW8Kbsr5TCOxpUTrnLFhCl2aDvqFzmJFop+13E7
-V25Xz6DzrsCrWhw8Ghjh5YAYTq8RatAx53/DBYuOFlMLuSxbBcISEXjzSmNtIgsY
-BgVMPltzbIVgkzvdNDtr0JMXPdHgX9aJ1lR2Obod+zECgYEA/XxcqmWq/mY+DbXf
-5ZPXf26bms1Mx9FAK5t4hF8GGOO63HMH5n84tUKhWTJCSFo8rjsGc/b+amj1oY6J
-BJtTLUP8sJSdYQzC2SybOrFT5XskHv4NgIdVX9zNbJS+Z5BYoLfwTyziSMjay6B7
-5kE8QbBzK6MyhyBYoItMQDZMwicCgYEA80R5ArTGCMsTK0YNFlS2Y5XKORRunwEM
-1Mm741P9ejhf/NUiwez8TrcRB+i7BjjC68idhP0zUKEsKEedAP4uWpic2wbBYOuH
-7BsNxXLQ3XJeLJ066fhqOdPA3pz3NP82EBp65g41RxpzlW74LpfnE4/kxk1pi4UP
-LpJpzqeFsl0CgYEA1ICWOq9Cm0ThTqMjERZQuV7jifIEJRtR3XzXmrkCpoj7VOYG
-QIB07Nfv5ZPRp1AmwLVw4nS0skZNbWPNkBQatb7iLrJYAU0uZ9wSQjD4sU/7ZxP6
-A77wno2/lQBZYv7Knem1xtpM1VG0wrJGTDByMGuZEYMdz9QZGHXOtaIP1U8CgYAy
-ZJTMwrXjTG4EINbFMXc22eiyOlFQDt+hlMifJt7zWopHzb8NfRInHDUi9ksH1upJ
-/Zzj16+xnDGRhoQ3mG/xxHt5w8R7V08o0dHgfRBXT0HC7C8wGI2ovPzPIKT1DYkd
-fN7ImVjgCdK3ue0fecgcfUpe6dpbVIz4kMvqSzme4QKBgQDjUk7m8szM4C8BIYQH
-1yo5kSPYQUZuc2UFYozd5ZNj791iAptrSSd2Mmck8MkT3oDAbH+SWg4Qw7UA/kNe
-264vVvNIzss7bw8UFcHT6JN9gdk08EsrW+IT3vopt3QlB/wYCHCqr47VviVneqWn
-og1hf+rw1WNr3atLP/NLnWWN7g==
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCgjpT9MM9b7BZa
+zSvEftEj5FtzJVHVtpK1yZa82bug0eCeWNr4JIPxg0rPWGVQVF2gnSidSVEfokuw
++LxRQGXKAPkJYHsVsk4t/lv5tynWTPHz293VlkaXyqHV2hS+3Wlu6TEOIepp0sZK
+KpzDfJfYfeNnq8Cib+s83XzbdNKbamkKSjHmMzeE1Qpwi9UYVw+0lzxDqxpTIZiX
+uFFFKwOR3D5I4euWT4zNWVGD001EJD3vFuzYeOPE8VK42qmj7VNr+1NV0iVI5oEj
+UbRS0eCkjonEkVCWhavVZIC85m0b74UPY99VcG+1kviTOnZ07xUCwLu5Qe+On56I
+q2GsKG9DAgMBAAECggEAXloL4hJ5+OnvZSLnEoz3+GCtASiwQ6gL5Tp3E7ncUjCk
+EEnlPCexRg9CukCXITLC5q0UfgHk43Mrie9SM2llp+UUdFc3XdOvr8WnZUMnGeGT
+2hud7HNoPrF8k0CaKmPRHrV493Yk3FVZ46HRB+xDC51HMtgy1wJwOg9q3Uh0r5FV
+ewSAxNn9HN/LCQU9+e0WO7+FxBcx7Z/RuQYGM+CS5Q+0pfSTQ7orugBsYGV8dhNU
+WQsYPMIRgz6mW43syPe+7cUoMYOvZDQsiaiZpzXEYbJEfYDajg0JeU0G6eVQWGIi
+8ISrOqQuigs0oeR9mzLVB1aImcgrpn+ZohI4FYl28QKBgQDS62zZKLMOU4+qOPt2
+pNsaz/dJaNpuMzG5YUaaD85n0kLA/CS4+0JlcDS98UYmQppOnwkwa4lr3ddB90Qz
+RLb3MFWie/Q8apm6HTGJbMU7wAE0rPp3OxJ5tMFoQAdoo9J3Trq9fkA+dxawoHH1
+ro5sKXhPc9rLVcRvvCN0EAu0WQKBgQDC34mq6oKB8Fsh5tOLbJ+8pyrSvsIJCglV
+ra6CMswl+jkaCLzYCyHKPk5TDNo2lUWqjXTpGgmOdExu54p0mQ1LjwINd6Sy2RrR
+yxkzB4BhLPYaU5w/AWJoi4u6ymovsoS2k/zyfb33oB6vb798ee7VQBOgGLPfcKZ7
+0jcZK3/8+wKBgHiFHcVYhDgDd2wE82tv9+LyQpMn3uhpSFhtRTJzJbYdZxdu/GzW
+5bGg1AJVA4iJNjMGnPGWAQgp0v5WlBnXgdTtQYF+4qhDIWQ/mja0eF8T75xx2wyW
+LJBuwLUZISKhuXmC+yGcKomG8ugqRfPksm0LpTuBL9xQPda64mdHY+jBAoGBAJP/
+y4FX+2gOEFhuAym3hJV1bCuEHr9YtQAyGP/e7nbFVAq2qh12TuJXcYrXjv63XaKL
+Lkg+sxVStB3ikZ++AX/qC4gI3rfJ9PlyQyAjSVgEGqCh8V9UgNWfba6ePgkdjndP
+a2MLJnRjUgqxVv+FZ2Lj+EO1nx5KYtZVL+1YwSpzAoGBAMdF3xClFY5Hk39+aHpY
+1ttkiQIU9t8cZYzKWC0f7BvFvoy0T88spaQK2UrCjkcVBFUekZ/3EOMm+soR0Cpo
+yJ569KA2LQ/EaUkWPGbbDzlrWcAHbBc58GjO5V0tXxhbCGhOzipa6PxhBRztSdpM
+C1UPVDjQO5+mohRUjFBPAj6+
 -----END PRIVATE KEY-----
diff --git a/modules/clients/src/test/keystore/ca/oneca.pem b/modules/clients/src/test/keystore/ca/oneca.pem
@@ -0,0 +1,21 @@
+-----BEGIN TRUSTED CERTIFICATE-----
+MIIDfjCCAmYCCQD0mP2SbCTi+TANBgkqhkiG9w0BAQUFADCBgDEmMCQGCSqGSIb3
+DQEJARYXb25lY2FAaWduaXRlLmFwYWNoZS5vcmcxDjAMBgNVBAMMBW9uZWNhMQww
+CgYDVQQLDANEZXYxDzANBgNVBAoMBklnbml0ZTEMMAoGA1UEBwwDU1BiMQwwCgYD
+VQQIDANTUGIxCzAJBgNVBAYTAlJVMB4XDTE5MTEwNzE2MzczNloXDTM5MTEwNzE2
+MzczNlowgYAxJjAkBgkqhkiG9w0BCQEWF29uZWNhQGlnbml0ZS5hcGFjaGUub3Jn
+MQ4wDAYDVQQDDAVvbmVjYTEMMAoGA1UECwwDRGV2MQ8wDQYDVQQKDAZJZ25pdGUx
+DDAKBgNVBAcMA1NQYjEMMAoGA1UECAwDU1BiMQswCQYDVQQGEwJSVTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKCOlP0wz1vsFlrNK8R+0SPkW3MlUdW2
+krXJlrzZu6DR4J5Y2vgkg/GDSs9YZVBUXaCdKJ1JUR+iS7D4vFFAZcoA+QlgexWy
+Ti3+W/m3KdZM8fPb3dWWRpfKodXaFL7daW7pMQ4h6mnSxkoqnMN8l9h942erwKJv
+6zzdfNt00ptqaQpKMeYzN4TVCnCL1RhXD7SXPEOrGlMhmJe4UUUrA5HcPkjh65ZP
+jM1ZUYPTTUQkPe8W7Nh448TxUrjaqaPtU2v7U1XSJUjmgSNRtFLR4KSOicSRUJaF
+q9VkgLzmbRvvhQ9j31Vwb7WS+JM6dnTvFQLAu7lB746fnoirYawob0MCAwEAATAN
+BgkqhkiG9w0BAQUFAAOCAQEAJzTrPMjfIb6/8lzvLcfesPjr+CqMAm86P+cE9lyo
+iV7MVcoDTQgT7hu8A9TBO/6x+iFDjgaw74EKu9fPOIPbqJlh3kJmdISGozMjGAeO
+gsruUteGIdW6GdG4a3fIgu/M2KQjN769cMb2GiYGwzLN+CyKGGBFZeBaPNyVP8pR
+KhqiOAWT0Va3fP62r6BrhiEqFxPOaG/NEjnaskJz0AuWEW+O8eNW2GiHWjXNRulH
+tMoIHz91RtVfbQBaznQ7BadT7qoDozhGRx0biHDwprW4cC+vHwvWKrON83TSv91K
+zohgcpfRHx3RVk8zbRKVg8ssMjzVXL9PqpS4YvT1+G8N/w==
+-----END TRUSTED CERTIFICATE-----
diff --git a/modules/clients/src/test/keystore/ca/oneindex.txt b/modules/clients/src/test/keystore/ca/oneindex.txt
diff --git a/modules/clients/src/test/keystore/ca/oneindex.txt.attr b/modules/clients/src/test/keystore/ca/oneindex.txt.attr
diff --git a/modules/clients/src/test/keystore/ca/oneserial b/modules/clients/src/test/keystore/ca/oneserial
diff --git a/modules/clients/src/test/keystore/ca/threeca-index.txt b/modules/clients/src/test/keystore/ca/threeca-index.txt
@@ -0,0 +1,2 @@
+V	391107193748Z		01	unknown	/CN=connectorClient
+V	391107193749Z		02	unknown	/CN=connectorServer
diff --git a/...es/clients/src/test/keystore/ca/twoserial → ...ients/src/test/keystore/ca/threeca-serial b/...es/clients/src/test/keystore/ca/twoserial → ...ients/src/test/keystore/ca/threeca-serial
diff --git a/modules/clients/src/test/keystore/ca/threeca.cnf b/modules/clients/src/test/keystore/ca/threeca.cnf
@@ -0,0 +1,33 @@
+
+#
+# Copyright 2019 GridGain Systems, Inc. and Contributors.
+#
+# Licensed under the GridGain Community Edition License (the License);
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.gridgain.com/products/software/community-edition/gridgain-community-edition-license
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an AS IS BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+[ ca ]
+default_ca = threeca
+
+[ threeca ]
+dir=ca
+certificate = $dir/threeca.pem
+database = $dir/threeca-index.txt
+private_key = $dir/threeca.key
+new_certs_dir = $dir/certs
+default_md = sha1
+policy = policy_match
+serial = $dir/threeca-serial
+default_days = 365
+
+[policy_match]
+commonName = supplied
diff --git a/modules/clients/src/test/keystore/ca/threeca.key b/modules/clients/src/test/keystore/ca/threeca.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDKKXeRCE49Lctj
+0ZLGdd/umBYUMiURTIIDdw4vWGBoEvMt2NO9fnBXl3829nHW/87WeZbBnv2BUzOE
+pHmdTKqbQZM3+u65ZDgvKL7EAuLjBzT5Hlsh51cCJ/N63FpjWtwqbUjFEb/WHcqY
+N/nWVd0wfPge45SqEAkQsJm6Ckk/4t+wG4i/2SVfpfcixOYQX11JY0GCP68qAzAH
+qsfrRgxF0yk6l3GqaZrDy/ChS5t1MzaxNZYG1GWXjBK8ckDmO/yrmXsmjTg9z+sL
+m2uXPJyMFB90zKm2xtLKJXp6k/4J9itt8XZvopZWMX5qrS5g1kOlgmd2PmhK3Q/h
+nclcQNP/AgMBAAECggEAUPLdv6M1wOWPZX7LaNBWRHF9lcSmdxDNlpmbgnW+1K2R
+1i/WSTBRx6EP/XAdEVwI9HRnW0xQcfJg1KIPWF8UiWpuiqHd6ToqDSghitclBoci
+PQZcs2ywuFpK8k09nD8Lnal41ABRcmkncGApmBt1oC7KI4Q5SQd2ucodJBNuVTfK
+6hldCkcUic0qEs1zJDVbtCBQXsIPFb/cXG27u7BZ+oYcHdec9WYnJ+FlKfZeMxJr
+929dck9qmAWS8ZpuviPN3UchoPCjf13b7LDB5WdcoyAo7EYm52LV8X+1EkP3UpPa
+hR1FdGGhkE1mAjYoS/0gZqQF27FkdlIjmMyChjLUAQKBgQDmhKAGIZEIGyyoBt3p
+KBgICf8xLonFjsueMJXBzI8Eqfjmu9Wv9DcVAfQNyVDI/u8JtfvfZzmMWhYPwCta
+IpARyB56urrCD+izf3NzLvB+DigwGFvhsMx8Cna1I1ebiC+nyZIQQlMQQubP7LD8
+yF26FF+/rxRuNm5zl5sDr+We/wKBgQDggmZjdpOD55sVUY+3kdJi/PnrsedzpX1v
+u401Um/gnixpwEvEgumRCLhnt8WsYe4alYrKkQqd2t8qOsGe0qGErlLW+tBArk83
+Sdoi62+g0ZNlGp7VqnSodNLSMtaZ+HeVLDpNwMMREf6gNs72hAd9EBZg1v6VY0na
+Zuy2T7nLAQKBgQCBWfSN3DIM8Wq6krfdSKFLiYiIaYvnrrw1dR/j0syCGnrPxqEf
+DhQGlsUDI29QijVKJrNCZiMVzctJZVUuS+y5/aiUx8laciDq8F6xSKqsoXcNne2Z
+FGN6S0jXVhCn9uB+744lz4Hawx/PlwqtniVx8FLWNgFp4uNRu8XBaOeZswKBgHdy
+aW85wzpGmyg4gLI2Dy1DUuSnfnD090vfCT35YjSrcw3AlY8z53iWnyXvjGguojPa
+pEEp8fASZvFc2W7aubyR0tk2EF6ZXuQXkstJX9a8KiN8ik07p12I6jGTgsHghB8F
+rO95Q09tt38eKfbWP/W1/XIAcOqiLMTaRc6plDwBAoGBANK5dW87pYQYtSW8ZFHS
+G4xK9EcyVqZ/MoaX4fplN7TZy/CApvJ6qfUst9wMeE4Sja6CI+mGcnWE8bZcTF2z
+gS6769E+nCMbD33ScRrT+yJ1isAPRc0MBQG+498mZn1R2EfuSuICllf/UiqgmgFh
+kUNhYgBYx/2yViWzmj1V+0zh
+-----END PRIVATE KEY-----
diff --git a/modules/clients/src/test/keystore/ca/threeca.pem b/modules/clients/src/test/keystore/ca/threeca.pem
@@ -0,0 +1,21 @@
+-----BEGIN TRUSTED CERTIFICATE-----
+MIIDhjCCAm4CCQC0QnJWqwJwjDANBgkqhkiG9w0BAQUFADCBhDEoMCYGCSqGSIb3
+DQEJARYZdGhyZWVjYUBpZ25pdGUuYXBhY2hlLm9yZzEQMA4GA1UEAwwHdGhyZWVj
+YTEMMAoGA1UECwwDRGV2MQ8wDQYDVQQKDAZJZ25pdGUxDDAKBgNVBAcMA1NQYjEM
+MAoGA1UECAwDU1BiMQswCQYDVQQGEwJSVTAeFw0xOTExMDcxNjM3MzZaFw0zOTEx
+MDcxNjM3MzZaMIGEMSgwJgYJKoZIhvcNAQkBFhl0aHJlZWNhQGlnbml0ZS5hcGFj
+aGUub3JnMRAwDgYDVQQDDAd0aHJlZWNhMQwwCgYDVQQLDANEZXYxDzANBgNVBAoM
+Bklnbml0ZTEMMAoGA1UEBwwDU1BiMQwwCgYDVQQIDANTUGIxCzAJBgNVBAYTAlJV
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyil3kQhOPS3LY9GSxnXf
+7pgWFDIlEUyCA3cOL1hgaBLzLdjTvX5wV5d/NvZx1v/O1nmWwZ79gVMzhKR5nUyq
+m0GTN/ruuWQ4Lyi+xALi4wc0+R5bIedXAifzetxaY1rcKm1IxRG/1h3KmDf51lXd
+MHz4HuOUqhAJELCZugpJP+LfsBuIv9klX6X3IsTmEF9dSWNBgj+vKgMwB6rH60YM
+RdMpOpdxqmmaw8vwoUubdTM2sTWWBtRll4wSvHJA5jv8q5l7Jo04Pc/rC5trlzyc
+jBQfdMyptsbSyiV6epP+CfYrbfF2b6KWVjF+aq0uYNZDpYJndj5oSt0P4Z3JXEDT
+/wIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAwm1lXDHwNhDGJ8EyLyLzMgLzTkHrv
++6+C4+PF1MrSp++ofTvv79UJDOem5ThlbPkbxlA3QKHUp7Gi4VbiNL+foCmaYe9P
+WED+OZ6DN1LyuFs+GQSyCxS80DKGFo6xZsCD04a6QSMR0HfLqCh4jOlhuasPSM6p
+f04RoaxLUL8AER95MQDsZgPjUSjVsUGNdaOvKHdW+4YLreE+qhHt+4Pk837osyo1
+KxL72N2N2/aBqhUW/EeDta9HVeIqrAJiuZ+KePMFFaczMub74VsL8ZpV5WEvEMzk
+elSnMM7tShTVHGEKDi5c9as63OhjEK2uTCX9aN9LV1xrP5xcGtebiP3H
+-----END TRUSTED CERTIFICATE-----
diff --git a/modules/clients/src/test/keystore/ca/trust-both.jks b/modules/clients/src/test/keystore/ca/trust-both.jks
diff --git a/modules/clients/src/test/keystore/ca/trust-one.jks b/modules/clients/src/test/keystore/ca/trust-one.jks
diff --git a/modules/clients/src/test/keystore/ca/trust-two.jks b/modules/clients/src/test/keystore/ca/trust-two.jks
diff --git a/modules/clients/src/test/keystore/ca/twoca-index.txt b/modules/clients/src/test/keystore/ca/twoca-index.txt
@@ -0,0 +1,5 @@
+V	391107193746Z		01	unknown	/CN=thinClient
+V	391107193747Z		02	unknown	/CN=thinServer
+V	391107193751Z		03	unknown	/CN=node02
+V	391107193753Z		04	unknown	/CN=node03
+V	191106193754Z		05	unknown	/CN=node02old
diff --git a/modules/clients/src/test/keystore/ca/twoca-serial b/modules/clients/src/test/keystore/ca/twoca-serial
@@ -0,0 +1 @@
+06
diff --git a/modules/clients/src/test/keystore/ca/twoca.cnf b/modules/clients/src/test/keystore/ca/twoca.cnf
@@ -2,38 +2,32 @@
 #
 # Copyright 2019 GridGain Systems, Inc. and Contributors.
 #
-# Licensed under the GridGain Community Edition License (the "License");
+# Licensed under the GridGain Community Edition License (the License);
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     https://www.gridgain.com/products/software/community-edition/gridgain-community-edition-license
 #
 # Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
+# distributed under the License is distributed on an AS IS BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-#       http://www.apache.org/licenses/LICENSE-2.0
-
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
 
 [ ca ]
 default_ca = twoca
- 
+
 [ twoca ]
-certificate = ./twoca.pem
-database = ./twoindex.txt
-private_key = ./twoca.key
-new_certs_dir = ./
+dir=ca
+certificate = $dir/twoca.pem
+database = $dir/twoca-index.txt
+private_key = $dir/twoca.key
+new_certs_dir = $dir/certs
 default_md = sha1
 policy = policy_match
-serial = ./twoserial
+serial = $dir/twoca-serial
 default_days = 365
- 
+
 [policy_match]
 commonName = supplied
diff --git a/modules/clients/src/test/keystore/ca/twoca.key b/modules/clients/src/test/keystore/ca/twoca.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCvv6fLWOIk9Hhn
-JMsfoySItogO+hhV4kREDEGi8SfAblHEKCiY4GxvtgtxS3EWyoYFynI8HK7GQNma
-tAQ49QtUP5FA36VRx3/9eh85je4AqXVgF/4qX0PdygMuSFOIxWYshj9CIwVHmiS2
-+IiVthe6OsAUSMnfIFzIxlEygpi6/I2N2WchkOlWiWo1G9E4RQOjKrwCGM/mWy6Y
-KIB2u3dSaNpfNZy2+sxBRXrtDUQzDxbVv9lCQ3DkZwVr2HnfMxZ9oFP5x8HoPyJi
-uS4qLUWypnbvIuBLnlR4LX/VSONCg6PzkafQdSvoYX5XPYDF32PUiSZS+U7URHzN
-nqC7nn97AgMBAAECggEAdEvHlfjoFHotXltrijDjkQ/wMrDt/47ti3XszQz1OBII
-S1wjmR4Qw09cfQjl+aXkT9qqAvsb8BajqAptLN+CMqqpzJrxg48XM71nAifYEVoR
-UJgv2QwXFaGCv1Ke7EdrmBTxsSsJaFso5mbJwv+u7c3IouOTqfF5VGZe/qSKulgh
-/swDJTFCo+JwISTJlVppR6xUVTtLpl4JFyWWExfGpOFmCfy818lhpJLV9HZzh142
-zssJCBevpaKng4DsHVmhvhi1f8zNV674C0cJ8yCBCVFAVw5WufaWRSh8PnHT9AR8
-+dqrGh+0EtmjJR9qy88LLEayWZKxE4oQLSUcDSe6OQKBgQDUK8/gZPzsepq0AOTD
-qL21nkMmA00J5u4USgB5S27PrYQB1p4uf1wfwVfmXC21Pyrwl+/mx9ukkQB907jG
-5vQTF81YEV1Z9eT5gCjE0XeCK40kYNdvfhlTPeuJteqEnrFDWZQ3WGD+6/TQoEfj
-BibgaAroKvlGF8mLWfAC9qqcrQKBgQDUDbkdUtthgZdDVoAzMS9kWB37pj1io3+8
-dOZ9i8farzTW3FcX9T504YPvazoNllKVaiO/q1sODI+7gtixYVKriZsqqE/h7ndS
-mc7OVfxqxoy5bW2XZUHNbefG/JTJvy4Zj8ANnes7Cb5fJtNtB3xa3JaGRFo91te6
-2M/6v2MpxwKBgG1Hf5MpEKhQYbwStcEc+VFBCX7btmNCQR/MGcBfnNx0l4hG3UQ/
-rthgQgDRO22d8mTnLNYl3Dg/wwwL76DqtY3b9ZTFpNo/70aevuDYroAqJFE3W97+
-CNc6DkXon7jc75or2k5DQ/oo1/hYhY4lzgJJNEzuTWPPvqv6j8dG+wslAoGAY+tn
-e8LMLuDihs9er0CQ5UaEMkz+Bdmm2gV3ilbwQEJosom23EoqOOb+xTUQcNCRb2hJ
-GgrDaBZRL/kS5FpImx3HKM2QfpRgU2K4SQ/JVgLi0okWp80Fuaf9HA1uirX0IgVT
-aNctvW707l8cJvbtCN+CahgRMaxnkNqS/cNrFYcCgYBBzR2qDcTn48gs7LvrlzMO
-RwamzD0LEibRUvw17rcmf4x2tFqx8hnyh4ahpPxlcB5SRSKhs2RKFf4AONGHMFAW
-IU/pxQJdk32NX1Xg5TjiNS+khW2Yp7voytvYyP7JMbSlp1NZbgNVYA4voikFNZ/O
-63NWew8dD+Gx5ZEWXg2Nvw==
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDWh4dVuZN+SuC1
+LJYHn1kk8bcC4s/00R6ZebxZItzbo0eSaBB9xBIk0Hf7xEWoBJAUJ+FMsEZz4/ZK
+tV1UlBxKksvGlaiJ55Gf1YEBCf6IJ6EAzbGlammvFZALygsY0vvVIFqQbqVDg82N
+TfVByP4GMblwos4ogzPKxGoOFTRVEfROdQQUXGPIBoqOPpBlLO4d3i8+istIIQvU
+JJK+4P90W+nSXmfrh/lfI8BaIAt0mcIS3PBawZQole+O1/7jH79Kn7L43CK8KhkJ
+rYfL0wuMqua8t3dYtxVcM8e7NgVUxa2drNEjEESB1MoApxq3QWoP+MyepslDoaSJ
+3FQZQKtHAgMBAAECggEAFXhk7AhxoX8e9CLtNQAWrOLgHRLUGz1eoZ+UYRtjHTw/
+KoDtvZiE9FhE2dav3fvu64V+P+2Yb3rOKHX0TEWyeygr6skJoBuj8GouygrVBY1p
+yKnNcK+wugwfaX6kE6zx9UeSqMfaFGK5jL3ToOzbt4T8eTBiD53p7g4wSw6GOUku
+rw79vSmLPZqY1G1x8uR6RsdScDyj71Fir1r4Iz3mtKOHKmE52VL5hoaMXNPFVe43
+3ttBAKbLUEqJH9Dmw3pUPKRcW8Nf4C6EIRsLL+XYjMGxv6T0TQwpk6C2s4VEdVHm
+dnqY2cQum1nlrDgYGCc8ZNvc0Ln4IOpvFEx4T1rYiQKBgQD8i+Kv1jfg5t77R1Hy
+9hMsSn5kWj+xWxkw+TUJZRF4wHEuGBnGgKWAx/sQyBMCg80GuH91HTLgJgjeAUGM
+gjp7e2PQbiDoPNrvnYooQAxPVETTJdykeSF5FTOGQSuezTMPEavZJcC+iCR9quX8
+8SpCqqBLFERpJ/qMgBDJEQMOMwKBgQDZdo2dQzSddBIxcniuIDQikmeDF9lwL0Cu
+1s/dGgiXMQoBFo8/ZA+sjzGgzWkt3/68y1BpaEO6LGW/sVamCjSf7BfSJPNeRDO2
+Gj7qzvw6db6x2BYI7inmwWOJPo9Ct0D58O8Ud6ti3cMmHqcSIhJy6nfcL1+6HdED
+PtrbtvkynQKBgQCiI71aXxJpFlC6y0NV1Z7hpMIY88hIudAmnRjr+zOIbyU7DsYd
+p6KaV8pdL9bkmnIbioBqVGDBgCnZPr0y1LlvZfzjaJFACTIW/PIifVxp4hR966UJ
+A6v17SKzY0v6HIxXdGT8eTySFx42gG5AQyV6v8lB6rUxPjWh1ubv8Dgh+QKBgBz1
+K4BwjZYV+cI54xYU1bxw0HXlfB/zOuLNWhqwN8qiThm8/lBLq8anvs0R7VqdhFdx
+n4CZ0ML+3IG9RLORklZlYvqpzvqTjGtIbW5pJ69FNKKMCssfo9bFk9KX0Q3qRy3B
+RqTsFpdwvmbaGBdTEC/bRyC78jxfchDDkvNFF0QFAoGBAMWFUlLNWdrUrQHi48qc
+tlgcDf6kkZpuLFXf0s7LMJvhjrN+eLSarpHeFR6+WVVHDgAbPFf1rQzLDBp8Mq3U
+bzDSMvOLkiB7ELy7cq8CvrvIpVhFC4EcJ3xZCtJXONWK95ZRr+/oRCuoRhwIRVT5
+as0UwWnNTd7YAQKzvIuygA+c
 -----END PRIVATE KEY-----
diff --git a/modules/clients/src/test/keystore/ca/twoca.pem b/modules/clients/src/test/keystore/ca/twoca.pem
@@ -0,0 +1,21 @@
+-----BEGIN TRUSTED CERTIFICATE-----
+MIIDfjCCAmYCCQD/llUaqH4aMDANBgkqhkiG9w0BAQUFADCBgDEmMCQGCSqGSIb3
+DQEJARYXdHdvY2FAaWduaXRlLmFwYWNoZS5vcmcxDjAMBgNVBAMMBXR3b2NhMQww
+CgYDVQQLDANEZXYxDzANBgNVBAoMBklnbml0ZTEMMAoGA1UEBwwDU1BiMQwwCgYD
+VQQIDANTUGIxCzAJBgNVBAYTAlJVMB4XDTE5MTEwNzE2MzczNloXDTM5MTEwNzE2
+MzczNlowgYAxJjAkBgkqhkiG9w0BCQEWF3R3b2NhQGlnbml0ZS5hcGFjaGUub3Jn
+MQ4wDAYDVQQDDAV0d29jYTEMMAoGA1UECwwDRGV2MQ8wDQYDVQQKDAZJZ25pdGUx
+DDAKBgNVBAcMA1NQYjEMMAoGA1UECAwDU1BiMQswCQYDVQQGEwJSVTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBANaHh1W5k35K4LUslgefWSTxtwLiz/TR
+Hpl5vFki3NujR5JoEH3EEiTQd/vERagEkBQn4UywRnPj9kq1XVSUHEqSy8aVqInn
+kZ/VgQEJ/ognoQDNsaVqaa8VkAvKCxjS+9UgWpBupUODzY1N9UHI/gYxuXCiziiD
+M8rEag4VNFUR9E51BBRcY8gGio4+kGUs7h3eLz6Ky0ghC9Qkkr7g/3Rb6dJeZ+uH
++V8jwFogC3SZwhLc8FrBlCiV747X/uMfv0qfsvjcIrwqGQmth8vTC4yq5ry3d1i3
+FVwzx7s2BVTFrZ2s0SMQRIHUygCnGrdBag/4zJ6myUOhpIncVBlAq0cCAwEAATAN
+BgkqhkiG9w0BAQUFAAOCAQEAN+ICtYXDTLe4hVk4o5jYY9yLGUUGosVexL2VzRPB
+OE7qTG6jAT/REvLfyJW6Chypr0eGNtuY+Oysc2kbAzdzssHq0UL+K1+wC6PURcJ8
+0evos3r0CRye7ZLv2ZNRakti6GqplhooCkvqBKoAzwndbMyFPV+KwPHq0yf4lenc
+40/PjnmdLy6sePd5AEzl9pZhes0b3+odnhNJwqjSto7g/pD69k+1d3eDLfRKxOw5
+/qis3IwGTmi2fQ7pKM0SfaeJnZmgNRjKc5BdhSr2MX3DUlYjuUTgEDMBKPUinqvK
+3ZqNTrTsg8n1/L1nGduKE9Cb+on3bxbrIq2gPxAWXBy7sg==
+-----END TRUSTED CERTIFICATE-----
diff --git a/modules/clients/src/test/keystore/ca/twoindex.txt b/modules/clients/src/test/keystore/ca/twoindex.txt
diff --git a/modules/clients/src/test/keystore/ca/twoindex.txt.attr b/modules/clients/src/test/keystore/ca/twoindex.txt.attr
diff --git a/modules/clients/src/test/keystore/client.jks b/modules/clients/src/test/keystore/client.jks