This is an automated email from the ASF dual-hosted git repository.
bbender pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git
The following commit(s) were added to refs/heads/develop by this push:
new ef435e1 GEODE-7508: remove duplicate SSL keys (#609)
ef435e1 is described below
commit ef435e18a842cdc7312ea522664b776bc654183d
Author: Blake Bender <bben...@pivotal.io>
AuthorDate: Wed Jun 3 15:40:07 2020 +0000
GEODE-7508: remove duplicate SSL keys (#609)
- Remove duplicate SSL keys, create new "master" dir for keys
- all tests now retrieve keys from source tree, rather than copying at
config time
- individual keys needed in examples are now installed explicitly, rather
than keeping copies in the example dirs in the source tree
- also fix formatting in SslTwoWayTest.cpp
---
CMakeLists.txt | 6 +
clicache/integration-test2/CMakeLists.txt | 8 --
.../ClientSslKeys/client_keystore.password.pem | 48 --------
.../ClientSslKeys/client_keystore_chained.pem | 128 ---------------------
.../ClientSslKeys/client_truststore.pem | 16 ---
.../client_truststore_chained_root.pem | 33 ------
clicache/integration-test2/Config.cs.in | 4 +-
.../ServerSslKeys/server_keystore.jks | Bin 2102 -> 0 bytes
.../ServerSslKeys/server_keystore_chained.jks | Bin 5719 -> 0 bytes
.../ServerSslKeys/server_truststore.jks | Bin 1596 -> 0 bytes
.../server_truststore_chained_root.jks | Bin 1567 -> 0 bytes
.../keystore/client_keystore.password.pem | 48 --------
.../integration-test/keystore/client_keystore.pem | 45 --------
.../keystore/client_keystore_chained.pem | 128 ---------------------
.../keystore/client_keystore_corrupt.pem | 45 --------
.../keystore/client_keystore_untrusted.pem | 30 -----
.../keystore/client_truststore.pem | 16 ---
.../keystore/client_truststore_chained_root.pem | 33 ------
.../integration-test/keystore/server_keystore.jks | Bin 2102 -> 0 bytes
.../keystore/server_keystore_chained.jks | Bin 5719 -> 0 bytes
.../keystore/server_truststore.jks | Bin 1596 -> 0 bytes
.../keystore/server_truststore_chained_root.jks | Bin 1567 -> 0 bytes
.../keystore/untrusted_server_keystore.jks | Bin 10764 -> 0 bytes
.../keystore/untrusted_server_truststore.jks | Bin 1448 -> 0 bytes
cppcache/integration/framework/TestConfig.cpp.in | 2 +
cppcache/integration/framework/TestConfig.h | 2 +-
cppcache/integration/test/SslOneWayTest.cpp | 35 +++---
cppcache/integration/test/SslTwoWayTest.cpp | 78 ++++++-------
.../utilities/ClientSslKeys/client_keystore.pem | 128 ---------------------
.../utilities/ClientSslKeys/client_truststore.pem | 33 ------
.../utilities/ServerSslKeys/server_keystore.p12 | Bin 6037 -> 0 bytes
.../utilities/ServerSslKeys/server_truststore.jks | Bin 1567 -> 0 bytes
.../client_keys}/client_keystore.password.pem | 0
.../client_keys}/client_keystore.pem | 0
.../client_keys}/client_keystore_chained.pem | 0
.../client_keys}/client_keystore_corrupt.pem | 0
.../client_keys}/client_keystore_untrusted.pem | 0
.../client_keys}/client_truststore.pem | 0
.../client_truststore_chained_root.pem | 0
.../client_keys}/client_truststore_corrupt.pem | 0
.../client_keys}/client_truststore_untrusting.pem | 0
.../keystore => ssl_keys/client_keys}/gemfire.pem | 0
.../server_keys}/server_keystore.jks | Bin
.../server_keys}/server_keystore_chained.jks | Bin
.../server_keys}/server_keystore_chained.p12 | Bin
.../server_keys}/server_truststore.jks | Bin
.../server_truststore_chained_root.jks | Bin
.../server_keys}/untrusted_server_keystore.jks | Bin
.../server_keys}/untrusted_server_truststore.jks | Bin
49 files changed, 67 insertions(+), 799 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 26a012d..106c5b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -386,6 +386,12 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/templates/
DESTINATION templates
PATTERN "templates/security/CMakeLists.txt.forInstall" EXCLUDE)
install(FILES
${CMAKE_CURRENT_SOURCE_DIR}/templates/security/CMakeLists.txt.forInstall RENAME
CMakeLists.txt DESTINATION templates/security)
+install(FILES
${CMAKE_CURRENT_SOURCE_DIR}/ssl_keys/server_keys/server_keystore_chained.p12
RENAME server_keystore.p12 DESTINATION examples/utilities/ServerSslKeys)
+install(FILES
${CMAKE_CURRENT_SOURCE_DIR}/ssl_keys/server_keys/server_truststore_chained_root.jks
RENAME server_truststore.jks DESTINATION examples/utilities/ServerSslKeys)
+
+install(FILES
${CMAKE_CURRENT_SOURCE_DIR}/ssl_keys/client_keys/client_keystore_chained.pem
RENAME client_keystore.pem DESTINATION examples/utilities/ClientSslKeys)
+install(FILES
${CMAKE_CURRENT_SOURCE_DIR}/ssl_keys/client_keys/client_truststore_chained_root.pem
RENAME client_truststore.pem DESTINATION examples/utilities/ClientSslKeys)
+
if (USE_RAT)
add_custom_target( rat-check
COMMAND ${CMAKE_COMMAND}
diff --git a/clicache/integration-test2/CMakeLists.txt
b/clicache/integration-test2/CMakeLists.txt
index 1c7519c..a6c31d4 100644
--- a/clicache/integration-test2/CMakeLists.txt
+++ b/clicache/integration-test2/CMakeLists.txt
@@ -48,10 +48,6 @@ add_library( ${PROJECT_NAME} SHARED
packages.config
AutoSerializationTests.cs
SerializationTests.cs
- ClientSslKeys/client_keystore.password.pem
- ClientSslKeys/client_truststore.pem
- ServerSslKeys/server_keystore.jks
- ServerSslKeys/server_truststore.jks
)
set_source_files_properties(
@@ -59,10 +55,6 @@ set_source_files_properties(
server.xml
xunit.runner.json
geode.properties
- ClientSslKeys/client_keystore.password.pem
- ClientSslKeys/client_truststore.pem
- ServerSslKeys/server_keystore.jks
- ServerSslKeys/server_truststore.jks
PROPERTIES
VS_COPY_TO_OUT_DIR Always
VS_TOOL_OVERRIDE None
diff --git
a/clicache/integration-test2/ClientSslKeys/client_keystore.password.pem
b/clicache/integration-test2/ClientSslKeys/client_keystore.password.pem
deleted file mode 100644
index e92e35c..0000000
--- a/clicache/integration-test2/ClientSslKeys/client_keystore.password.pem
+++ /dev/null
@@ -1,48 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,8C6F1D87BBC9DAD8
-
-Cckb6pFRtWdt8M1FXlNstAMSCX93T1irvlsqxWdIK4kXy3vqYDgurUGzlPKPBC2p
-jDjo8xazebSrtqi+qyYEBnO3Z6HNCPyGe0iUea8WVnN0ckvAe93Lro9WMdpD2+i8
-YGW9b7oo/OKz2qdUT1GLXYD8IBRXGXmEPCcOF4czQoA1eAXYuo6/Ksf+J0qsd9I5
-BJUeBWI+m58zB8dTulBtO96og03//MqTCJ6INwXDZ1XPbOfQM3qPhDP3G+AJRJKZ
-1spxjnyuu0dU5jGs054wicN0XL0QrwZvYnfbzj336N/URd1laJpjqz3+C2B+HfqG
-GAldq4OdRpgU7HVoL33zlecEhSU7V2NKWArfAi3/hQZ8IAYYCNCX1DTJ3GGmuD0g
-ax7muWVlOeuEVhu60hslJjBger1r2+32fg1lgn1xtotgHJlXTEbolnMqO5LCKbnQ
-I9o5gm7Ykm1EmrM82IBGn6ByX9TPO6WH8oacgoOSfxf8CWssR6CGf5WRsLLy8uRF
-p7ddPYCyccYOmXkr1TQ94OSA7Qz7vIEwTUJyaST3PzGRtjky1EoHAk/vgC48aTyD
-ivW4zbTDfKb9amT418h0WAwDpkmrBS7MV7iVWgcE0gtGtVXXbkHPHH6+ODXetjm+
-NR9K+uWmizUY4YXmD/AZVO7tx82NABV63bu7929M3hCw591atZj3bbJ3yoDDFBsV
-81Ea0pREWkjgEfgSrifADZNnAvzVafZDV1jYpXGl0zRB6GtFTcYAaaiSSCqp714l
-8Q1BZSXGQF4ZActkZYrPzbRHCJmjpVa/8jgG9dmDy9oal1Zys4r3JII64Xb2GZDX
-EMCUyierMnxkZ779y60UK6OjdbUMeGF9hZ/IINdRiUbszL1ugrb/f0xAMAGJ5gAw
-hd2xL3UtuLEW14wy+tZFF3WiNjxKOtkeR3mzdXd9buOLqoFWqZyfqXCbXDP7mGEG
-Mn8wGRlJrz/vwT8o2q8k60D+l0UVvbEmVz06B48RYrE3CYZHPnVjbwIcpW92kxm7
-38hjOXfaY5TMq0Q0g/La1npveCVNT+LCqyJ2J2Zrbl4CctW38RzaH4pYPumEwTIl
-JOlE9wHxWiXb4uS35IF6mceyaORTg8OG7l37sYaTEGQlCrGRPmbtTgwgvMpD1EVl
-mNVpquAKiJ9vhxElFnND7fOUpackV4uZu4myddywPT/dwJgZV68lm6D3dK0HSvnL
-eOYw3mM5cjS83gL72YLJ8S1qh4iIgOVgMDUkN9eRH2QaqSHwntRwMcNj9RTstouJ
-g4ZS6WRV/bJH2lM0qirfxRGCct9GhmLnqmH6X7fZ60TjMK5wcmAIniqzZGGQ5TLR
-4FQeYwm+TlA+QCikoYo7BgYOVGcEaHkatL7mnlJzbovxVIAOfUb7UwnuU+bOcclr
-2rkB8zcfwkPfxnkgTl3ZUQZjVrxLiYCw748yrEf/1voJZk/2JpiLlLhOT4aHNno/
-ZQgXY6WmPTdQtJ39Tf9cFlMeQn4QNsTBqmtFBvVMVkdZoyEWPZO8XD9M++1ag9vV
-cEEWSNx4UUDZsZ22hnZ9tHaRfIsW5ga8BSuXesvbQ6P9teGbGo2RkQ==
------END RSA PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIIC6zCCAdOgAwIBAgIEUCOixTANBgkqhkiG9w0BAQUFADAeMQswCQYDVQQGEwJV
-UzEPMA0GA1UEAwwGY2xpZW50MB4XDTEyMDgwOTExNDUwOVoXDTM3MDgwMzExNDUw
-OVowHjELMAkGA1UEBhMCVVMxDzANBgNVBAMMBmNsaWVudDCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAKdvOZ5/BA/mtn0ZmBqzTlBbZJNrAnjIfH7YU7Kd
-ADqQSkQi641TIF7J4rzuf0bRDnTPiqoTqeh2k0eHZ1pVvGjXiA8nZnRYyv4LAaSS
-sn0MP+0FuzlR3h2y2z6+v82s8vtWaZMeRwTkmK56ldSslX6PjPmO5dkyQuf4twlS
-/neWvm6o7FKV62VnDelYLuVUTSf4ZPIwf1B4wPRVG5q3lEi9U6qCLVB54j3AAE6f
-pts8fYKDAgNgs1leb3nHvUCN8piuMxfmo8EVgyDKuy3TQ1ffWMUxi2veKAfa6tA0
-7HSiL7cReuzHhbZOe65z7hDOep6QyTtkK0QFeeyd7ddAJC8CAwEAAaMxMC8wHQYD
-VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMA4GA1UdDwEB/wQEAwIEsDANBgkq
-hkiG9w0BAQUFAAOCAQEAL1tEBvoFA8NlzIIXyALWRRLdFWV0b/FPu4lAv1RUF7Sk
-ZRw4nbBUOrMGrZFjnZ3TNRChwQY8P5GlDvyj5oLJ6VZFMAaidWvFrR5oDLm8Khkq
-2vLQXnnchje9hm6jDxaO58XsfU5zicfYRuXi2vYmOgltyCixBWQvEwbI+Uf7F6Lw
-Da7bpNwTgiYs3snB83trYe17hlUaiF7MNC6lCVdy1/F7FbN/ToQQIDpxHVx7jm6n
-SrOtPnOMLoXB9Gcfrtidu1k/ZFyySskK/HnYc1bfGJ9+B1GzbVahuzr/Jdfp62sE
-XxEVh9pXSb0gkB/CUpTEx7ve9jU8tEYNUqMDUj87Qg==
------END CERTIFICATE-----
diff --git
a/clicache/integration-test2/ClientSslKeys/client_keystore_chained.pem
b/clicache/integration-test2/ClientSslKeys/client_keystore_chained.pem
deleted file mode 100644
index 1fb6b21..0000000
--- a/clicache/integration-test2/ClientSslKeys/client_keystore_chained.pem
+++ /dev/null
@@ -1,128 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: AES-256-CBC,D0A85AB3E34995D142EEDF8DA2B84AEC
-
-T9esPURq+vuXXP2nMRdIEpmFu7ks+xqX458HwwhMS8UyQl4BMZ8AEzCVg0cxGwzN
-fka5a8AsR71ZPYbwNfYfCTMR+u2AeJ71U2wjRSGaKXool7Cp9IuJAcaVdbzEOiYf
-87IBpSvcxrY0Z3c9RhTAm6Ni3eWWBd3wbwH2hYfBt1WMUHtDoDO8zkVwRy20IXXv
-zccimsEZMD6KalWAaNXuuWcUBp/l7NdQ40cOoTaZ/ZnovjNOb/322GgMswtjGrVX
-5+T7bYynWIsF8nzu0AljOpwvazytxCZPE8hvfjVUv6WSDhwWbaZlUlTGy6bi/YXr
-LVXR3KCZiq36AOlgeJoz1dPAh9MB60xu6FHUvzCsO/toaAmQ5sTrQb2zo8AFpsz9
-o25S3e24tzabxej//c1fujFrVm7ThzgEShZMj9TewS7NGUsEAK+VDVvkENbJn4vW
-Ls0k6m+Nvdn2kaCGvmY5/m2CQlM5RcLvvTdWlw07nF9sm7oOv3zJ5YESKKoREjuC
-MVg8YWjVi/hHcRr2S6nE10EVWDlLFV+VncsPa8eWFDGYWJ36MfdqT4xlMiA26owx
-rlA3YIwX7cOkvjpIGyj2t6LvT69ZsEmaJ94FpcTiqmIHYwWJfVbH9og80zUe8QB5
-vNLTCIGLA1hinH5fSD/mWgA0Dzo5JGKzhXwYAhoNFppQcULw8hxcMtU5kPaWDJiP
-IRsrfmc+FCr9DKyYuE2WY2yYvDvZY19FlAPBNG7wcsivZamk+gB/tBV2b6xmpccB
-HJr8vLqr5qUPGrmWB7klWUxKxIYLRpW8Ie/K8gG0Uf++JlzcwHNIlsAEFgVpkFhN
-ok/K5SkGxJv5fdzNi3srnoeyhLs18sC6eX8y8mjHSsIF4g3l5yj58wDb4gmICQU6
-L9ehFVn426Kqfaj77oX5aGL7geNrH3lxOr3KtmJigpKM9e8vLGuK2MjBctOrvbhj
-g9fDLrfEnQW9/7hmM4ftONUc0sVjPcES/0vb7HcHVGhrowiPnNvw4R8XN8qv5+Wy
-0E/slwlKkXmkA3CWqjOUjzIdzvRUiGMWpiu8b2HjPRmj1wDvM8/q0JWMEz2rwp2F
-IvgSgYK4IeKCO5WmW+aqWAaVUQKPp7qarsqM5ffrI5DH5DbvqPW5LjHdyIFzbzgo
-kRQghUkS9gs9S/enivaPMLOFZ/SZckrYMMpLBmJL+oXHgjssOQT0pTlmqhAajQur
-sUyVITAyKGYQoyagkig/YJoSE8kDkSUYAudDdDvWa3TS1fv3C+hBNKBZX63F2nGR
-MlRb6thKV1OgZYcyyvJe6vtWpfJ0sk9TGIkW/y30au6Vt9F7WJxaUcBuM0v5VPpH
-ujIJIKJ1Vic1VIH6Xo3B3Km+Tl3OC+ZtvEJ/FnRv9JKe0K3zMYbyaeLNM2yOwmxc
-xGQM3Rj3ilJTweSBjjcLKgX7XGQZ6IErrTmSedj4Ze62JPnSPuWfESW+U/ep9lID
-0O7/nmpKqz0fAUNgplV6Jd+o0bTB2jkUBd4OuFqBF5kK64HBj8vfze8WW7kNvCqy
-OtDEnZZpoMwV1c9VEBjFn2C8uYw8WYDx5w0uzdHheFxIq2BpnNJcJDeoYotmk3hX
------END RSA PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIIFfjCCA2agAwIBAgICEAEwDQYJKoZIhvcNAQELBQAwWjELMAkGA1UEBhMCVVMx
-DzANBgNVBAgMBk9yZWdvbjEMMAoGA1UECgwDQVNGMSwwKgYDVQQDDCNBcGFjaGUg
-R2VvZGUgSW50ZXJtZWRpYXRlIEF1dGhvcml0eTAeFw0xOTA0MjQyMjM2MDRaFw0y
-NjA0MjIyMjM2MDRaMGoxCzAJBgNVBAYTAlVTMQ8wDQYDVQQIDAZPcmVnb24xEjAQ
-BgNVBAcMCUJlYXZlcnRvbjEMMAoGA1UECgwDQVNGMSgwJgYDVQQDDB9BcGFjaGUg
-R2VvZGUgQ2xpZW50IENlcnRpZmljYXRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEA5vvJdF7i0FXJtGqOgZBsJKrJzFYjmGPmfRaMgAH6FbIjgDMvSIfP
-qwDeUp0JYu2ubVE9AvE7LQoxSgpJKLMYjl5uEO7PsmZVDL2PyeW0KEewsFXzn8Fo
-4qTTtHBknMpQDtd4qXKV2V+QFgvOZg3tc2n3IeFW9kuDw5JjJ/d0Rsn2l+3EOzAE
-AoFei6svwBl0RRSO+Q1gheC6boj6XB/so6o9uMRrSYVRqbEMdkU4tUjHYOcLTMJx
-pxfMgp/Codm6slq5oV1eedks/PzVXOcr4L8MYZRW9oy2y+ZeVJehUW4aAgwa2eft
-fM9oGpkFVxZfyhYKhiTfWn9RBEuf3/SUHwIDAQABo4IBPDCCATgwCQYDVR0TBAIw
-ADARBglghkgBhvhCAQEEBAMCB4AwOQYJYIZIAYb4QgENBCwWKk9wZW5TU0wgR2Vu
-ZXJhdGVkIEdlb2RlIENsaWVudCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUZTMvHVkr
-Aw/w4L2rHRqnD7Z4escwgZgGA1UdIwSBkDCBjYAU36rGKVHxY48sqdC5EIgkToRz
-dvqhcaRvMG0xCzAJBgNVBAYTAlVTMQ8wDQYDVQQIDAZPcmVnb24xEjAQBgNVBAcM
-CUJlYXZlcnRvbjEMMAoGA1UECgwDQVNGMSswKQYDVQQDDCJBcGFjaGUgR2VvZGUg
-Q2VydGlmaWNhdGUgQXV0aG9yaXR5ggIQADAOBgNVHQ8BAf8EBAMCBaAwEwYDVR0l
-BAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQADggIBACdelXfgn8V7+Ni3NSlX
-qOYMF3uKXzluU/sTBBLiIwE7ggq9+ckXoOcSzWGiEwrgbl2bTsg0JqD88VdWcMB9
-a+jX0At11upYKRLffYg8RKDu0FFlaR5So4f1JjFBK8Rr5cMepYmoZy3qgCrPBgT4
-MWzFN+EJRomwUyU5JF2UUhIOT2qJHCI8lMvkJeAJiq5GYZurYt25y3l+po2dYogb
-vXWPcWOWiSN5+gkU5aE5vCh3kyDQ/WEg8FddLCaxizFXROTktix29Tq3rCXiGZGk
-cLHHsmLKxFb5iyzvHEcDSMK/0uInCwCBikEoOp8Ybsw27pM0F092MNnt3VXre3Pg
-ywqrOGly4vqOlc38VyPefGBTLFDD8p7ahSrMmeFyIVXJevIkIWjIHD2RXmY8/3DK
-pKH7KLKDS/1BRErMlRBheKj574GmlgXjsWKb/wW72l/rAMPX1YwaL8fJthLgSdQ9
-CCXOaBaTCwwjW8cM86TFdbc9yREHNkEF2Ss+YqzRTAoG7ztmle6TfkQoC2zQ9+EX
-oQkBM9740a8oqpYWI8oi311EJvJE7Yq3W78fp0cq6rYgvfBIFai/VtKU/l8xrj5N
-BeknimgQ4ePiFr7nbK7iScQ/bUnN5vN1U1Vu4uLEGDtvSRLG/bAvv0U8A49xUetA
-uetZI1uf4Cwk8MXPzdjGcDBs
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIFqTCCA5GgAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwbTELMAkGA1UEBhMCVVMx
-DzANBgNVBAgMBk9yZWdvbjESMBAGA1UEBwwJQmVhdmVydG9uMQwwCgYDVQQKDANB
-U0YxKzApBgNVBAMMIkFwYWNoZSBHZW9kZSBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkw
-HhcNMTkwNDI0MjIyMzI0WhcNMjkwNDIxMjIyMzI0WjBaMQswCQYDVQQGEwJVUzEP
-MA0GA1UECAwGT3JlZ29uMQwwCgYDVQQKDANBU0YxLDAqBgNVBAMMI0FwYWNoZSBH
-ZW9kZSBJbnRlcm1lZGlhdGUgQXV0aG9yaXR5MIICIjANBgkqhkiG9w0BAQEFAAOC
-Ag8AMIICCgKCAgEArWK9T8jA7CLliww5NOxOp0Lh+Wwr+JKtEz6JMUYUsey761ra
-dlq3C/BgedaU4B7SqTDX86Gvl3sRjpMD5GwkNhzjPSLhm5CJ3MMMYu2zC/SAyVbZ
-cDv8YUm/y6unnESaFh7E4vCvDzcZp8yHdD73Vl44yrWfFkJ7duwtF1cq3v2Z4wiZ
-UGAi+pcFCCav0kXiVD1BD3wGyFeyb/F9g5mP0Pmxs5/hyrvs59Ax5OjpAcNFMemF
-C4UMePWV7Shoex77m8KnpWxR8eNGk0crEOX1BYy76oWGwGUEqHgSWp+4R0hkxZFt
-oY684Z7e3L/aQ39/AwGaBamV9QIGRNoIQIdwYq+dWY/gI5OqfgIOiQypuWiyxfer
-LtI/DvpLjVDRIiZEBDJQcywzrhkZB+Wuo1LzHxo6GTb3IEfO9nVoDvedacFIDqce
-TTPr/nnB/YvqZLEpI2vfTBENr7PZ9uaaZONZwZWgGj28qVoGt4YgraoTIbgBbX+z
-WrOF9QE8ivxXAhTvYhE5qNbzNTWSfgINJWBiQrVh2NqTDudzBNoUYWG2uotb0C34
-7j4jJTTTtXdczjBo+/T4q+ZrOTOqpBdUWa9o5VcFIrcDV9ewCyiudevqWWJIKzZn
-+dmpW0SgKGDwiJxDs7XRDZW9qCJNhsInQdhI0eeWAIzsYobHltxEUS0qoFkCAwEA
-AaNmMGQwHQYDVR0OBBYEFN+qxilR8WOPLKnQuRCIJE6Ec3b6MB8GA1UdIwQYMBaA
-FFa2vPHAtcP9IVe5HgnLN9C5TVDIMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYDVR0P
-AQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4ICAQDNHBibIKdLjgdn6LD7ZVcPCwZt
-z/0OGUZOysI0dioBKwxXqgYwWP4Wpwk22ZABQ11nJir+apCatzaAJrCM3SN117dd
-EywOjO1LlShyOrUnYZDhn1GNE0dT6dvSvdtm3GmGly1PjqFUwis5gErrKTg5cp7z
-RIESL9sWJ57xoDLf2QBcqOjI422dODuay0/Hg8nqiFcFNHuIl1sZtAXbMCWoVn4U
-b5zN7x6k2Z/NL8aapCxZpscPab+ytrqrrgcIJ1D2Y3LmFCFIdSwdEou8dGhRl9lZ
-7+kB9XnXLuoxy/amKV0yjvWUkcg0EIHa8HcgO6/FIqaZxxt6ws4LpR8SHtbYWUK0
-JNbS6Po3TFizMhvXVaAJl5h5WAjYBqBSYZ3RB1EbKRiWOHLSsiAIYkh2t96k8L0t
-HYnsuzXeHdLgQOQUddbgH3udvr94xM81TDA79NHksC+WtWMeSP7DeshjOcyg6g9a
-0D513tIjuzArOjhoY0MpwaUKmZM+byfmNb1sMW2tFVodXuvR3zGSA4qanDYSGguP
-NNEB/HE5y7203rkJ5RJZmBCkBrgXXYG/WG1uHjQ6GlC8hsNO4SCR4F93NkB+6SmN
-7hutsVd+/QpmMQWr/yM+XcGXZ9+aRqAXJIoBbq2uoa06OKnABL04hnTNYiEi6M8r
-sCMLsQ38TzdplfODpg==
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIFwDCCA6igAwIBAgIJAIQE3AlDT4/2MA0GCSqGSIb3DQEBCwUAMG0xCzAJBgNV
-BAYTAlVTMQ8wDQYDVQQIDAZPcmVnb24xEjAQBgNVBAcMCUJlYXZlcnRvbjEMMAoG
-A1UECgwDQVNGMSswKQYDVQQDDCJBcGFjaGUgR2VvZGUgQ2VydGlmaWNhdGUgQXV0
-aG9yaXR5MB4XDTE5MDQyNDIyMTg1M1oXDTM5MDQxOTIyMTg1M1owbTELMAkGA1UE
-BhMCVVMxDzANBgNVBAgMBk9yZWdvbjESMBAGA1UEBwwJQmVhdmVydG9uMQwwCgYD
-VQQKDANBU0YxKzApBgNVBAMMIkFwYWNoZSBHZW9kZSBDZXJ0aWZpY2F0ZSBBdXRo
-b3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDQZ1pjDg2ci/X/
-j7Oiy3PpH6hqCLCPehi2yZyGPQcPzV0oTxhf52FGjQ1u6r1Vu05Mi9DiQDf6HtRQ
-0p/9e1c7lZWj9CQSAC0a+N/pBfyCZXzd8x/HOShtgmMIGnzbLtZr3uyOQ03yPEru
-noP4bUQOmVL7sViV2qFYYI8Sj0I0/VRAb1UtefRyzoavJiNahIYQjur4FSicXRBC
-KUazzUG22tmBcjUjGZLnBpz7pKOsvGcEAWt/8IMdsgpxZzIhwauXOzkPfdR6yyvv
-WWj8bSK7fNiq3uxBAuFLNcbTNDo6wp20UdL5KrWuvi/bzQrDqTmLjTm7fCH8hEd3
-V6e0VFGGUJoH1kRh3PadQTioYmr6n+mUvC1H96F8Eta/HJ9dbE07megAdZ/tALgb
-HvrQ9slZ847XAn8E/j/OJLcLoELrdoMCwIIUKSkaVC4WQo2iJE6JeivmsyREjYC/
-7k8Xlhvk46vakunDQC+MCPbwjU3T43lf1EVsM/bWo0hRYwCL+Ll2DIX8GPaRr9Lw
-llRhX5sVDrZFON8hmfOYHbfBMMz1WVeJOQ7CtkTu9rxfdkp25VBZSb8Q25ULD+ZF
-U5hygFMzWyaFC5gVUSo6vqZNLldlBm8QTsv567hru+ESnoOuTd4QoouPZ+3sTLJn
-yKPqCXXmcj9rCNfemk/ZdEsBhqyWUwIDAQABo2MwYTAdBgNVHQ4EFgQUVra88cC1
-w/0hV7keCcs30LlNUMgwHwYDVR0jBBgwFoAUVra88cC1w/0hV7keCcs30LlNUMgw
-DwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQELBQAD
-ggIBAMDismUiqc9z0xGtCwD7wMwppDcuCmQvL32XIMFjhcLLZMlvXLSgQuAEdDXh
-XKXq0pEBYjIYKmbopIvf9MujiC2dN5OmSXlZy/7frHjutLfaC9zW+QTiFU326QKV
-vVzaHPcyxodO/UrmymwbdITGU1IOpfolw3vBX17qOxNzT/2mGbFIrCs+BEWPwyKa
-3oZwNz33vGmj6yGavDamRdL+Y+HzYhoKuCEYG5YC4CNjQHe/4y5I2nrE4ks7wY7W
-AlNSs2aJuTbok59bph8lkM6HILceXGqKXQ7/oIbm6cYs+4eXiUFZfV3AN8rEKxM+
-MouUdkubKe3Nzqkg+dDuhUMol2mQbsKkJjOZtuDQ3+SWh8enUqe3RPRTQXUQlrqY
-YSjg4+l72vYaIgbTlA9VnZn/te4aPWheMhZo+57lg2cwF/B0sYXHNcaFg9QrTVAy
-dTZpfQEnL+qWYhpbqBS9m91dFK9RwIeS8NRrq2wlj2/4lOMY8m5Jlh1vaKO9Y9y2
-HhKnfzJ5hPdyck5LDTU3K1Qb7OQTBJjKCRdaT2idAKIT62OiUuoWwfMoajC+rNeS
-YDZUPULQJxzuzqsbFZ8Sy4uTAkd31bdoglouN7RFaeSnyLhb8xhSGhngcpIozHPf
-wuE+sjekQiToAPUHr83aAyCD6yYKBwucdkBZyb0jCD7SsQ53
------END CERTIFICATE-----
diff --git a/clicache/integration-test2/ClientSslKeys/client_truststore.pem
b/clicache/integration-test2/ClientSslKeys/client_truststore.pem
deleted file mode 100644
index def668f..0000000
--- a/clicache/integration-test2/ClientSslKeys/client_truststore.pem
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC6zCCAdOgAwIBAgIEUCOimzANBgkqhkiG9w0BAQUFADAeMQswCQYDVQQGEwJVUzEPMA0GA1UE
-AwwGc2VydmVyMB4XDTEyMDgwOTExNDQyN1oXDTM3MDgwMzExNDQyN1owHjELMAkGA1UEBhMCVVMx
-DzANBgNVBAMMBnNlcnZlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMKe/Phwhj/V
-KcFrQuEcnlsWgDGYedyAYwUXItmolvyTeqPRI89H+NktE0zxsn3FjINN/ioz/LLSk6n4y68RGwg+
-8/7EBnYJ/zWYnmPdFeDjzQP6B81YR2YHZH7h+FweQpSpWvo4tZEeiMskQHVMO6t8tE/rwNqcoNfa
-BEFUxPWm/S2q22rueS71ft1MtcGRAUr31fGuKslmoBeT8PqBavo0eVeFu4x/b0TbVg5+arJ/JcOc
-0qFtSBacnY4hMs4uvTKe4yWd0g3wEEMpy5NpImew1be9nDuCnmP2jorvH4RMfNmq4bNWTJJr6sbt
-cCooOE7wEB20Gx69jIATxoXkzHkCAwEAAaMxMC8wHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-BwMCMA4GA1UdDwEB/wQEAwIEsDANBgkqhkiG9w0BAQUFAAOCAQEAYEt4ia2UcU21clHqzsyg1X1R
-nyImw/AKg8D62U1XCdJtqE9JN1H56cijZGKKJqItEtk/ZvsKSUvvBx9tnrrtR/Tz4UZudhG6L/2R
-CeU2A2FXk4t0o1PhWY7aOyNfJ9Y7PRRhYuZ5gXCVGy3c+Aiemb1JUF+pwOs92OvALpv+cG6UfxU7
-gZ/VucKvHROFLMru6Kx0luS3SxdAcYa1XhX0OlbYtbZ+8kzfUbKUvNHFfamsHJzfVzuFENQmDNU0
-wtDX7OgyAhUH/UB1TSk0JFa/upODpZNwyy5OVfF4aFQJ7TH//x8vaiy1zo/V7HBhxU8yzk+GlOTD
-x/VMmE7x5hJakA==
------END CERTIFICATE-----
diff --git
a/clicache/integration-test2/ClientSslKeys/client_truststore_chained_root.pem
b/clicache/integration-test2/ClientSslKeys/client_truststore_chained_root.pem
deleted file mode 100644
index 0aaf749..0000000
---
a/clicache/integration-test2/ClientSslKeys/client_truststore_chained_root.pem
+++ /dev/null
@@ -1,33 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFwDCCA6igAwIBAgIJAIQE3AlDT4/2MA0GCSqGSIb3DQEBCwUAMG0xCzAJBgNV
-BAYTAlVTMQ8wDQYDVQQIDAZPcmVnb24xEjAQBgNVBAcMCUJlYXZlcnRvbjEMMAoG
-A1UECgwDQVNGMSswKQYDVQQDDCJBcGFjaGUgR2VvZGUgQ2VydGlmaWNhdGUgQXV0
-aG9yaXR5MB4XDTE5MDQyNDIyMTg1M1oXDTM5MDQxOTIyMTg1M1owbTELMAkGA1UE
-BhMCVVMxDzANBgNVBAgMBk9yZWdvbjESMBAGA1UEBwwJQmVhdmVydG9uMQwwCgYD
-VQQKDANBU0YxKzApBgNVBAMMIkFwYWNoZSBHZW9kZSBDZXJ0aWZpY2F0ZSBBdXRo
-b3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDQZ1pjDg2ci/X/
-j7Oiy3PpH6hqCLCPehi2yZyGPQcPzV0oTxhf52FGjQ1u6r1Vu05Mi9DiQDf6HtRQ
-0p/9e1c7lZWj9CQSAC0a+N/pBfyCZXzd8x/HOShtgmMIGnzbLtZr3uyOQ03yPEru
-noP4bUQOmVL7sViV2qFYYI8Sj0I0/VRAb1UtefRyzoavJiNahIYQjur4FSicXRBC
-KUazzUG22tmBcjUjGZLnBpz7pKOsvGcEAWt/8IMdsgpxZzIhwauXOzkPfdR6yyvv
-WWj8bSK7fNiq3uxBAuFLNcbTNDo6wp20UdL5KrWuvi/bzQrDqTmLjTm7fCH8hEd3
-V6e0VFGGUJoH1kRh3PadQTioYmr6n+mUvC1H96F8Eta/HJ9dbE07megAdZ/tALgb
-HvrQ9slZ847XAn8E/j/OJLcLoELrdoMCwIIUKSkaVC4WQo2iJE6JeivmsyREjYC/
-7k8Xlhvk46vakunDQC+MCPbwjU3T43lf1EVsM/bWo0hRYwCL+Ll2DIX8GPaRr9Lw
-llRhX5sVDrZFON8hmfOYHbfBMMz1WVeJOQ7CtkTu9rxfdkp25VBZSb8Q25ULD+ZF
-U5hygFMzWyaFC5gVUSo6vqZNLldlBm8QTsv567hru+ESnoOuTd4QoouPZ+3sTLJn
-yKPqCXXmcj9rCNfemk/ZdEsBhqyWUwIDAQABo2MwYTAdBgNVHQ4EFgQUVra88cC1
-w/0hV7keCcs30LlNUMgwHwYDVR0jBBgwFoAUVra88cC1w/0hV7keCcs30LlNUMgw
-DwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQELBQAD
-ggIBAMDismUiqc9z0xGtCwD7wMwppDcuCmQvL32XIMFjhcLLZMlvXLSgQuAEdDXh
-XKXq0pEBYjIYKmbopIvf9MujiC2dN5OmSXlZy/7frHjutLfaC9zW+QTiFU326QKV
-vVzaHPcyxodO/UrmymwbdITGU1IOpfolw3vBX17qOxNzT/2mGbFIrCs+BEWPwyKa
-3oZwNz33vGmj6yGavDamRdL+Y+HzYhoKuCEYG5YC4CNjQHe/4y5I2nrE4ks7wY7W
-AlNSs2aJuTbok59bph8lkM6HILceXGqKXQ7/oIbm6cYs+4eXiUFZfV3AN8rEKxM+
-MouUdkubKe3Nzqkg+dDuhUMol2mQbsKkJjOZtuDQ3+SWh8enUqe3RPRTQXUQlrqY
-YSjg4+l72vYaIgbTlA9VnZn/te4aPWheMhZo+57lg2cwF/B0sYXHNcaFg9QrTVAy
-dTZpfQEnL+qWYhpbqBS9m91dFK9RwIeS8NRrq2wlj2/4lOMY8m5Jlh1vaKO9Y9y2
-HhKnfzJ5hPdyck5LDTU3K1Qb7OQTBJjKCRdaT2idAKIT62OiUuoWwfMoajC+rNeS
-YDZUPULQJxzuzqsbFZ8Sy4uTAkd31bdoglouN7RFaeSnyLhb8xhSGhngcpIozHPf
-wuE+sjekQiToAPUHr83aAyCD6yYKBwucdkBZyb0jCD7SsQ53
------END CERTIFICATE-----
diff --git a/clicache/integration-test2/Config.cs.in
b/clicache/integration-test2/Config.cs.in
index 193147f..9ec3f65 100644
--- a/clicache/integration-test2/Config.cs.in
+++ b/clicache/integration-test2/Config.cs.in
@@ -31,11 +31,11 @@ public class Config
public static string SslServerKeyPath
{
- get { return
@"@CMAKE_CURRENT_SOURCE_DIR@/../../cppcache/integration/test/ServerSslKeys"; }
+ get { return @"@CMAKE_CURRENT_SOURCE_DIR@/../../ssl_keys/server_keys"; }
}
public static string SslClientKeyPath
{
- get { return
@"@CMAKE_CURRENT_SOURCE_DIR@/../../cppcache/integration/test/ClientSslKeys"; }
+ get { return @"@CMAKE_CURRENT_SOURCE_DIR@/../../ssl_keys/client_keys"; }
}
}
diff --git a/clicache/integration-test2/ServerSslKeys/server_keystore.jks
b/clicache/integration-test2/ServerSslKeys/server_keystore.jks
deleted file mode 100644
index f67f87b..0000000
Binary files a/clicache/integration-test2/ServerSslKeys/server_keystore.jks and
/dev/null differ
diff --git
a/clicache/integration-test2/ServerSslKeys/server_keystore_chained.jks
b/clicache/integration-test2/ServerSslKeys/server_keystore_chained.jks
deleted file mode 100644
index 9c80ac1..0000000
Binary files
a/clicache/integration-test2/ServerSslKeys/server_keystore_chained.jks and
/dev/null differ
diff --git a/clicache/integration-test2/ServerSslKeys/server_truststore.jks
b/clicache/integration-test2/ServerSslKeys/server_truststore.jks
deleted file mode 100644
index eca7330..0000000
Binary files a/clicache/integration-test2/ServerSslKeys/server_truststore.jks
and /dev/null differ
diff --git
a/clicache/integration-test2/ServerSslKeys/server_truststore_chained_root.jks
b/clicache/integration-test2/ServerSslKeys/server_truststore_chained_root.jks
deleted file mode 100644
index dde526b..0000000
Binary files
a/clicache/integration-test2/ServerSslKeys/server_truststore_chained_root.jks
and /dev/null differ
diff --git a/cppcache/integration-test/keystore/client_keystore.password.pem
b/cppcache/integration-test/keystore/client_keystore.password.pem
deleted file mode 100755
index e92e35c..0000000
--- a/cppcache/integration-test/keystore/client_keystore.password.pem
+++ /dev/null
@@ -1,48 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,8C6F1D87BBC9DAD8
-
-Cckb6pFRtWdt8M1FXlNstAMSCX93T1irvlsqxWdIK4kXy3vqYDgurUGzlPKPBC2p
-jDjo8xazebSrtqi+qyYEBnO3Z6HNCPyGe0iUea8WVnN0ckvAe93Lro9WMdpD2+i8
-YGW9b7oo/OKz2qdUT1GLXYD8IBRXGXmEPCcOF4czQoA1eAXYuo6/Ksf+J0qsd9I5
-BJUeBWI+m58zB8dTulBtO96og03//MqTCJ6INwXDZ1XPbOfQM3qPhDP3G+AJRJKZ
-1spxjnyuu0dU5jGs054wicN0XL0QrwZvYnfbzj336N/URd1laJpjqz3+C2B+HfqG
-GAldq4OdRpgU7HVoL33zlecEhSU7V2NKWArfAi3/hQZ8IAYYCNCX1DTJ3GGmuD0g
-ax7muWVlOeuEVhu60hslJjBger1r2+32fg1lgn1xtotgHJlXTEbolnMqO5LCKbnQ
-I9o5gm7Ykm1EmrM82IBGn6ByX9TPO6WH8oacgoOSfxf8CWssR6CGf5WRsLLy8uRF
-p7ddPYCyccYOmXkr1TQ94OSA7Qz7vIEwTUJyaST3PzGRtjky1EoHAk/vgC48aTyD
-ivW4zbTDfKb9amT418h0WAwDpkmrBS7MV7iVWgcE0gtGtVXXbkHPHH6+ODXetjm+
-NR9K+uWmizUY4YXmD/AZVO7tx82NABV63bu7929M3hCw591atZj3bbJ3yoDDFBsV
-81Ea0pREWkjgEfgSrifADZNnAvzVafZDV1jYpXGl0zRB6GtFTcYAaaiSSCqp714l
-8Q1BZSXGQF4ZActkZYrPzbRHCJmjpVa/8jgG9dmDy9oal1Zys4r3JII64Xb2GZDX
-EMCUyierMnxkZ779y60UK6OjdbUMeGF9hZ/IINdRiUbszL1ugrb/f0xAMAGJ5gAw
-hd2xL3UtuLEW14wy+tZFF3WiNjxKOtkeR3mzdXd9buOLqoFWqZyfqXCbXDP7mGEG
-Mn8wGRlJrz/vwT8o2q8k60D+l0UVvbEmVz06B48RYrE3CYZHPnVjbwIcpW92kxm7
-38hjOXfaY5TMq0Q0g/La1npveCVNT+LCqyJ2J2Zrbl4CctW38RzaH4pYPumEwTIl
-JOlE9wHxWiXb4uS35IF6mceyaORTg8OG7l37sYaTEGQlCrGRPmbtTgwgvMpD1EVl
-mNVpquAKiJ9vhxElFnND7fOUpackV4uZu4myddywPT/dwJgZV68lm6D3dK0HSvnL
-eOYw3mM5cjS83gL72YLJ8S1qh4iIgOVgMDUkN9eRH2QaqSHwntRwMcNj9RTstouJ
-g4ZS6WRV/bJH2lM0qirfxRGCct9GhmLnqmH6X7fZ60TjMK5wcmAIniqzZGGQ5TLR
-4FQeYwm+TlA+QCikoYo7BgYOVGcEaHkatL7mnlJzbovxVIAOfUb7UwnuU+bOcclr
-2rkB8zcfwkPfxnkgTl3ZUQZjVrxLiYCw748yrEf/1voJZk/2JpiLlLhOT4aHNno/
-ZQgXY6WmPTdQtJ39Tf9cFlMeQn4QNsTBqmtFBvVMVkdZoyEWPZO8XD9M++1ag9vV
-cEEWSNx4UUDZsZ22hnZ9tHaRfIsW5ga8BSuXesvbQ6P9teGbGo2RkQ==
------END RSA PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIIC6zCCAdOgAwIBAgIEUCOixTANBgkqhkiG9w0BAQUFADAeMQswCQYDVQQGEwJV
-UzEPMA0GA1UEAwwGY2xpZW50MB4XDTEyMDgwOTExNDUwOVoXDTM3MDgwMzExNDUw
-OVowHjELMAkGA1UEBhMCVVMxDzANBgNVBAMMBmNsaWVudDCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAKdvOZ5/BA/mtn0ZmBqzTlBbZJNrAnjIfH7YU7Kd
-ADqQSkQi641TIF7J4rzuf0bRDnTPiqoTqeh2k0eHZ1pVvGjXiA8nZnRYyv4LAaSS
-sn0MP+0FuzlR3h2y2z6+v82s8vtWaZMeRwTkmK56ldSslX6PjPmO5dkyQuf4twlS
-/neWvm6o7FKV62VnDelYLuVUTSf4ZPIwf1B4wPRVG5q3lEi9U6qCLVB54j3AAE6f
-pts8fYKDAgNgs1leb3nHvUCN8piuMxfmo8EVgyDKuy3TQ1ffWMUxi2veKAfa6tA0
-7HSiL7cReuzHhbZOe65z7hDOep6QyTtkK0QFeeyd7ddAJC8CAwEAAaMxMC8wHQYD
-VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMA4GA1UdDwEB/wQEAwIEsDANBgkq
-hkiG9w0BAQUFAAOCAQEAL1tEBvoFA8NlzIIXyALWRRLdFWV0b/FPu4lAv1RUF7Sk
-ZRw4nbBUOrMGrZFjnZ3TNRChwQY8P5GlDvyj5oLJ6VZFMAaidWvFrR5oDLm8Khkq
-2vLQXnnchje9hm6jDxaO58XsfU5zicfYRuXi2vYmOgltyCixBWQvEwbI+Uf7F6Lw
-Da7bpNwTgiYs3snB83trYe17hlUaiF7MNC6lCVdy1/F7FbN/ToQQIDpxHVx7jm6n
-SrOtPnOMLoXB9Gcfrtidu1k/ZFyySskK/HnYc1bfGJ9+B1GzbVahuzr/Jdfp62sE
-XxEVh9pXSb0gkB/CUpTEx7ve9jU8tEYNUqMDUj87Qg==
------END CERTIFICATE-----
diff --git a/cppcache/integration-test/keystore/client_keystore.pem
b/cppcache/integration-test/keystore/client_keystore.pem
deleted file mode 100755
index 84431ae..0000000
--- a/cppcache/integration-test/keystore/client_keystore.pem
+++ /dev/null
@@ -1,45 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAp285nn8ED+a2fRmYGrNOUFtkk2sCeMh8fthTsp0AOpBKRCLr
-jVMgXsnivO5/RtEOdM+KqhOp6HaTR4dnWlW8aNeIDydmdFjK/gsBpJKyfQw/7QW7
-OVHeHbLbPr6/zazy+1Zpkx5HBOSYrnqV1KyVfo+M+Y7l2TJC5/i3CVL+d5a+bqjs
-UpXrZWcN6Vgu5VRNJ/hk8jB/UHjA9FUbmreUSL1TqoItUHniPcAATp+m2zx9goMC
-A2CzWV5vece9QI3ymK4zF+ajwRWDIMq7LdNDV99YxTGLa94oB9rq0DTsdKIvtxF6
-7MeFtk57rnPuEM56npDJO2QrRAV57J3t10AkLwIDAQABAoIBAD4sfyjr4YZGFd2+
-c0z26E3Oojpbsj9Hs3MmwW3B/yPAENPcY7vG8m5AaYHezkRtvQCDUOp3AtDftzEI
-hsh0rdIAtvVpnBH4JujPDX0fPEhTFCnfxvYyAFjm4aMbEf4+CrxqCionRBf9CvU/
-cAPZUmn8xEynU5Kjp1Scdttvhi7BoE/iP0KDhzyMjw9cLMOgant7qyWhhLexBf79
-QvqLPT0KpURLa/dQ/kgYs0owM/a2iPP0P9Kpvr8Q7UGdZOYyRi6J68/NbG661cAC
-jVV2hBU7n+CUw7UAO2ni+ahfcORgPxnvrJBSiT479agZN9//bYDXMDawpIQ6QV3j
-egeUg4ECgYEA61AImg4B5Jl1ikzCGLZsnPCZPyk7pNAvQ3x3/e/WuAr4vN3M5Cyx
-2mtYjrKH31Z8TeMEKdoS9ldnWHA5MisXfX/5T7XN6aNUCCtLBQ2WvidQBeGW1PT5
-SAzeUhmtFuYC4Jx1teJc2ni4SevS/PEuJUjsmAZTik01USB2Y23aTK0CgYEAtieF
-EGiROyPuBpmbWFTN9O4Xi8RyePPbGlVTatb+kcLRhlD+KUzhjgm0aP7as8DlN8KI
-kQ/JxKhCXQcWo0hiooggf3kO1hihSTF/kjEG5a0c0aqqqDlAQ1hqd0SoOHvCcwPm
-Q0YCDC3hDTG5rwyHyUwqqTwf/tR9oOKoNvtWk8sCgYBgaqGrpdOmvC5KJZteDtlA
-EOFp3NZAeMD08PolhXFAZdZ3ZJZAZAPX0CYwCfzcSQ6Tx1H8aAte/n8s4Ia/BKMS
-XC5mN8MQWUjkNAEAKAo9DdSfJEjuJxZBLGynzTd763EAYXtltEOBjPdN6p+/3n6e
-7ltrCySNxYb0H84CfY913QKBgAMXOJLGs3Alc+x4vsII7lWxlISymJ6kxJr1x6yQ
-aVFf1N5KkYVx4IHgeEcvy9Yw97Kygk6zzeCgWj/p1uB+Ye4QET0YeL/5OwNa66c3
-Xb6X6V1FYA/qqMR7w5Kyf4g10V7SOh36Gh7KyH7I0TW/KK6ptC+a7ZANWvRX5DLK
-oPVxAoGBAIX+Kk1njuAGy+QPsBIdgRfwYyPJZiBYkYJAHYglHHVuKgCEpj0FYmz1
-ATo9nIhVDcWPz+EyljtgCIp50C0ipRb/hu16DjtDPOu4GnofckE2OS51d5TVAGMu
-8Co7bxyn0CkSsdId4Gue7ThCUJJovwG4Si5wUprIorbIK9dTIlwO
------END RSA PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIIC6zCCAdOgAwIBAgIEUCOixTANBgkqhkiG9w0BAQUFADAeMQswCQYDVQQGEwJV
-UzEPMA0GA1UEAwwGY2xpZW50MB4XDTEyMDgwOTExNDUwOVoXDTM3MDgwMzExNDUw
-OVowHjELMAkGA1UEBhMCVVMxDzANBgNVBAMMBmNsaWVudDCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAKdvOZ5/BA/mtn0ZmBqzTlBbZJNrAnjIfH7YU7Kd
-ADqQSkQi641TIF7J4rzuf0bRDnTPiqoTqeh2k0eHZ1pVvGjXiA8nZnRYyv4LAaSS
-sn0MP+0FuzlR3h2y2z6+v82s8vtWaZMeRwTkmK56ldSslX6PjPmO5dkyQuf4twlS
-/neWvm6o7FKV62VnDelYLuVUTSf4ZPIwf1B4wPRVG5q3lEi9U6qCLVB54j3AAE6f
-pts8fYKDAgNgs1leb3nHvUCN8piuMxfmo8EVgyDKuy3TQ1ffWMUxi2veKAfa6tA0
-7HSiL7cReuzHhbZOe65z7hDOep6QyTtkK0QFeeyd7ddAJC8CAwEAAaMxMC8wHQYD
-VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMA4GA1UdDwEB/wQEAwIEsDANBgkq
-hkiG9w0BAQUFAAOCAQEAL1tEBvoFA8NlzIIXyALWRRLdFWV0b/FPu4lAv1RUF7Sk
-ZRw4nbBUOrMGrZFjnZ3TNRChwQY8P5GlDvyj5oLJ6VZFMAaidWvFrR5oDLm8Khkq
-2vLQXnnchje9hm6jDxaO58XsfU5zicfYRuXi2vYmOgltyCixBWQvEwbI+Uf7F6Lw
-Da7bpNwTgiYs3snB83trYe17hlUaiF7MNC6lCVdy1/F7FbN/ToQQIDpxHVx7jm6n
-SrOtPnOMLoXB9Gcfrtidu1k/ZFyySskK/HnYc1bfGJ9+B1GzbVahuzr/Jdfp62sE
-XxEVh9pXSb0gkB/CUpTEx7ve9jU8tEYNUqMDUj87Qg==
------END CERTIFICATE-----
diff --git a/cppcache/integration-test/keystore/client_keystore_chained.pem
b/cppcache/integration-test/keystore/client_keystore_chained.pem
deleted file mode 100644
index 1fb6b21..0000000
--- a/cppcache/integration-test/keystore/client_keystore_chained.pem
+++ /dev/null
@@ -1,128 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: AES-256-CBC,D0A85AB3E34995D142EEDF8DA2B84AEC
-
-T9esPURq+vuXXP2nMRdIEpmFu7ks+xqX458HwwhMS8UyQl4BMZ8AEzCVg0cxGwzN
-fka5a8AsR71ZPYbwNfYfCTMR+u2AeJ71U2wjRSGaKXool7Cp9IuJAcaVdbzEOiYf
-87IBpSvcxrY0Z3c9RhTAm6Ni3eWWBd3wbwH2hYfBt1WMUHtDoDO8zkVwRy20IXXv
-zccimsEZMD6KalWAaNXuuWcUBp/l7NdQ40cOoTaZ/ZnovjNOb/322GgMswtjGrVX
-5+T7bYynWIsF8nzu0AljOpwvazytxCZPE8hvfjVUv6WSDhwWbaZlUlTGy6bi/YXr
-LVXR3KCZiq36AOlgeJoz1dPAh9MB60xu6FHUvzCsO/toaAmQ5sTrQb2zo8AFpsz9
-o25S3e24tzabxej//c1fujFrVm7ThzgEShZMj9TewS7NGUsEAK+VDVvkENbJn4vW
-Ls0k6m+Nvdn2kaCGvmY5/m2CQlM5RcLvvTdWlw07nF9sm7oOv3zJ5YESKKoREjuC
-MVg8YWjVi/hHcRr2S6nE10EVWDlLFV+VncsPa8eWFDGYWJ36MfdqT4xlMiA26owx
-rlA3YIwX7cOkvjpIGyj2t6LvT69ZsEmaJ94FpcTiqmIHYwWJfVbH9og80zUe8QB5
-vNLTCIGLA1hinH5fSD/mWgA0Dzo5JGKzhXwYAhoNFppQcULw8hxcMtU5kPaWDJiP
-IRsrfmc+FCr9DKyYuE2WY2yYvDvZY19FlAPBNG7wcsivZamk+gB/tBV2b6xmpccB
-HJr8vLqr5qUPGrmWB7klWUxKxIYLRpW8Ie/K8gG0Uf++JlzcwHNIlsAEFgVpkFhN
-ok/K5SkGxJv5fdzNi3srnoeyhLs18sC6eX8y8mjHSsIF4g3l5yj58wDb4gmICQU6
-L9ehFVn426Kqfaj77oX5aGL7geNrH3lxOr3KtmJigpKM9e8vLGuK2MjBctOrvbhj
-g9fDLrfEnQW9/7hmM4ftONUc0sVjPcES/0vb7HcHVGhrowiPnNvw4R8XN8qv5+Wy
-0E/slwlKkXmkA3CWqjOUjzIdzvRUiGMWpiu8b2HjPRmj1wDvM8/q0JWMEz2rwp2F
-IvgSgYK4IeKCO5WmW+aqWAaVUQKPp7qarsqM5ffrI5DH5DbvqPW5LjHdyIFzbzgo
-kRQghUkS9gs9S/enivaPMLOFZ/SZckrYMMpLBmJL+oXHgjssOQT0pTlmqhAajQur
-sUyVITAyKGYQoyagkig/YJoSE8kDkSUYAudDdDvWa3TS1fv3C+hBNKBZX63F2nGR
-MlRb6thKV1OgZYcyyvJe6vtWpfJ0sk9TGIkW/y30au6Vt9F7WJxaUcBuM0v5VPpH
-ujIJIKJ1Vic1VIH6Xo3B3Km+Tl3OC+ZtvEJ/FnRv9JKe0K3zMYbyaeLNM2yOwmxc
-xGQM3Rj3ilJTweSBjjcLKgX7XGQZ6IErrTmSedj4Ze62JPnSPuWfESW+U/ep9lID
-0O7/nmpKqz0fAUNgplV6Jd+o0bTB2jkUBd4OuFqBF5kK64HBj8vfze8WW7kNvCqy
-OtDEnZZpoMwV1c9VEBjFn2C8uYw8WYDx5w0uzdHheFxIq2BpnNJcJDeoYotmk3hX
------END RSA PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIIFfjCCA2agAwIBAgICEAEwDQYJKoZIhvcNAQELBQAwWjELMAkGA1UEBhMCVVMx
-DzANBgNVBAgMBk9yZWdvbjEMMAoGA1UECgwDQVNGMSwwKgYDVQQDDCNBcGFjaGUg
-R2VvZGUgSW50ZXJtZWRpYXRlIEF1dGhvcml0eTAeFw0xOTA0MjQyMjM2MDRaFw0y
-NjA0MjIyMjM2MDRaMGoxCzAJBgNVBAYTAlVTMQ8wDQYDVQQIDAZPcmVnb24xEjAQ
-BgNVBAcMCUJlYXZlcnRvbjEMMAoGA1UECgwDQVNGMSgwJgYDVQQDDB9BcGFjaGUg
-R2VvZGUgQ2xpZW50IENlcnRpZmljYXRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEA5vvJdF7i0FXJtGqOgZBsJKrJzFYjmGPmfRaMgAH6FbIjgDMvSIfP
-qwDeUp0JYu2ubVE9AvE7LQoxSgpJKLMYjl5uEO7PsmZVDL2PyeW0KEewsFXzn8Fo
-4qTTtHBknMpQDtd4qXKV2V+QFgvOZg3tc2n3IeFW9kuDw5JjJ/d0Rsn2l+3EOzAE
-AoFei6svwBl0RRSO+Q1gheC6boj6XB/so6o9uMRrSYVRqbEMdkU4tUjHYOcLTMJx
-pxfMgp/Codm6slq5oV1eedks/PzVXOcr4L8MYZRW9oy2y+ZeVJehUW4aAgwa2eft
-fM9oGpkFVxZfyhYKhiTfWn9RBEuf3/SUHwIDAQABo4IBPDCCATgwCQYDVR0TBAIw
-ADARBglghkgBhvhCAQEEBAMCB4AwOQYJYIZIAYb4QgENBCwWKk9wZW5TU0wgR2Vu
-ZXJhdGVkIEdlb2RlIENsaWVudCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUZTMvHVkr
-Aw/w4L2rHRqnD7Z4escwgZgGA1UdIwSBkDCBjYAU36rGKVHxY48sqdC5EIgkToRz
-dvqhcaRvMG0xCzAJBgNVBAYTAlVTMQ8wDQYDVQQIDAZPcmVnb24xEjAQBgNVBAcM
-CUJlYXZlcnRvbjEMMAoGA1UECgwDQVNGMSswKQYDVQQDDCJBcGFjaGUgR2VvZGUg
-Q2VydGlmaWNhdGUgQXV0aG9yaXR5ggIQADAOBgNVHQ8BAf8EBAMCBaAwEwYDVR0l
-BAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQADggIBACdelXfgn8V7+Ni3NSlX
-qOYMF3uKXzluU/sTBBLiIwE7ggq9+ckXoOcSzWGiEwrgbl2bTsg0JqD88VdWcMB9
-a+jX0At11upYKRLffYg8RKDu0FFlaR5So4f1JjFBK8Rr5cMepYmoZy3qgCrPBgT4
-MWzFN+EJRomwUyU5JF2UUhIOT2qJHCI8lMvkJeAJiq5GYZurYt25y3l+po2dYogb
-vXWPcWOWiSN5+gkU5aE5vCh3kyDQ/WEg8FddLCaxizFXROTktix29Tq3rCXiGZGk
-cLHHsmLKxFb5iyzvHEcDSMK/0uInCwCBikEoOp8Ybsw27pM0F092MNnt3VXre3Pg
-ywqrOGly4vqOlc38VyPefGBTLFDD8p7ahSrMmeFyIVXJevIkIWjIHD2RXmY8/3DK
-pKH7KLKDS/1BRErMlRBheKj574GmlgXjsWKb/wW72l/rAMPX1YwaL8fJthLgSdQ9
-CCXOaBaTCwwjW8cM86TFdbc9yREHNkEF2Ss+YqzRTAoG7ztmle6TfkQoC2zQ9+EX
-oQkBM9740a8oqpYWI8oi311EJvJE7Yq3W78fp0cq6rYgvfBIFai/VtKU/l8xrj5N
-BeknimgQ4ePiFr7nbK7iScQ/bUnN5vN1U1Vu4uLEGDtvSRLG/bAvv0U8A49xUetA
-uetZI1uf4Cwk8MXPzdjGcDBs
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIFqTCCA5GgAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwbTELMAkGA1UEBhMCVVMx
-DzANBgNVBAgMBk9yZWdvbjESMBAGA1UEBwwJQmVhdmVydG9uMQwwCgYDVQQKDANB
-U0YxKzApBgNVBAMMIkFwYWNoZSBHZW9kZSBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkw
-HhcNMTkwNDI0MjIyMzI0WhcNMjkwNDIxMjIyMzI0WjBaMQswCQYDVQQGEwJVUzEP
-MA0GA1UECAwGT3JlZ29uMQwwCgYDVQQKDANBU0YxLDAqBgNVBAMMI0FwYWNoZSBH
-ZW9kZSBJbnRlcm1lZGlhdGUgQXV0aG9yaXR5MIICIjANBgkqhkiG9w0BAQEFAAOC
-Ag8AMIICCgKCAgEArWK9T8jA7CLliww5NOxOp0Lh+Wwr+JKtEz6JMUYUsey761ra
-dlq3C/BgedaU4B7SqTDX86Gvl3sRjpMD5GwkNhzjPSLhm5CJ3MMMYu2zC/SAyVbZ
-cDv8YUm/y6unnESaFh7E4vCvDzcZp8yHdD73Vl44yrWfFkJ7duwtF1cq3v2Z4wiZ
-UGAi+pcFCCav0kXiVD1BD3wGyFeyb/F9g5mP0Pmxs5/hyrvs59Ax5OjpAcNFMemF
-C4UMePWV7Shoex77m8KnpWxR8eNGk0crEOX1BYy76oWGwGUEqHgSWp+4R0hkxZFt
-oY684Z7e3L/aQ39/AwGaBamV9QIGRNoIQIdwYq+dWY/gI5OqfgIOiQypuWiyxfer
-LtI/DvpLjVDRIiZEBDJQcywzrhkZB+Wuo1LzHxo6GTb3IEfO9nVoDvedacFIDqce
-TTPr/nnB/YvqZLEpI2vfTBENr7PZ9uaaZONZwZWgGj28qVoGt4YgraoTIbgBbX+z
-WrOF9QE8ivxXAhTvYhE5qNbzNTWSfgINJWBiQrVh2NqTDudzBNoUYWG2uotb0C34
-7j4jJTTTtXdczjBo+/T4q+ZrOTOqpBdUWa9o5VcFIrcDV9ewCyiudevqWWJIKzZn
-+dmpW0SgKGDwiJxDs7XRDZW9qCJNhsInQdhI0eeWAIzsYobHltxEUS0qoFkCAwEA
-AaNmMGQwHQYDVR0OBBYEFN+qxilR8WOPLKnQuRCIJE6Ec3b6MB8GA1UdIwQYMBaA
-FFa2vPHAtcP9IVe5HgnLN9C5TVDIMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYDVR0P
-AQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4ICAQDNHBibIKdLjgdn6LD7ZVcPCwZt
-z/0OGUZOysI0dioBKwxXqgYwWP4Wpwk22ZABQ11nJir+apCatzaAJrCM3SN117dd
-EywOjO1LlShyOrUnYZDhn1GNE0dT6dvSvdtm3GmGly1PjqFUwis5gErrKTg5cp7z
-RIESL9sWJ57xoDLf2QBcqOjI422dODuay0/Hg8nqiFcFNHuIl1sZtAXbMCWoVn4U
-b5zN7x6k2Z/NL8aapCxZpscPab+ytrqrrgcIJ1D2Y3LmFCFIdSwdEou8dGhRl9lZ
-7+kB9XnXLuoxy/amKV0yjvWUkcg0EIHa8HcgO6/FIqaZxxt6ws4LpR8SHtbYWUK0
-JNbS6Po3TFizMhvXVaAJl5h5WAjYBqBSYZ3RB1EbKRiWOHLSsiAIYkh2t96k8L0t
-HYnsuzXeHdLgQOQUddbgH3udvr94xM81TDA79NHksC+WtWMeSP7DeshjOcyg6g9a
-0D513tIjuzArOjhoY0MpwaUKmZM+byfmNb1sMW2tFVodXuvR3zGSA4qanDYSGguP
-NNEB/HE5y7203rkJ5RJZmBCkBrgXXYG/WG1uHjQ6GlC8hsNO4SCR4F93NkB+6SmN
-7hutsVd+/QpmMQWr/yM+XcGXZ9+aRqAXJIoBbq2uoa06OKnABL04hnTNYiEi6M8r
-sCMLsQ38TzdplfODpg==
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIFwDCCA6igAwIBAgIJAIQE3AlDT4/2MA0GCSqGSIb3DQEBCwUAMG0xCzAJBgNV
-BAYTAlVTMQ8wDQYDVQQIDAZPcmVnb24xEjAQBgNVBAcMCUJlYXZlcnRvbjEMMAoG
-A1UECgwDQVNGMSswKQYDVQQDDCJBcGFjaGUgR2VvZGUgQ2VydGlmaWNhdGUgQXV0
-aG9yaXR5MB4XDTE5MDQyNDIyMTg1M1oXDTM5MDQxOTIyMTg1M1owbTELMAkGA1UE
-BhMCVVMxDzANBgNVBAgMBk9yZWdvbjESMBAGA1UEBwwJQmVhdmVydG9uMQwwCgYD
-VQQKDANBU0YxKzApBgNVBAMMIkFwYWNoZSBHZW9kZSBDZXJ0aWZpY2F0ZSBBdXRo
-b3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDQZ1pjDg2ci/X/
-j7Oiy3PpH6hqCLCPehi2yZyGPQcPzV0oTxhf52FGjQ1u6r1Vu05Mi9DiQDf6HtRQ
-0p/9e1c7lZWj9CQSAC0a+N/pBfyCZXzd8x/HOShtgmMIGnzbLtZr3uyOQ03yPEru
-noP4bUQOmVL7sViV2qFYYI8Sj0I0/VRAb1UtefRyzoavJiNahIYQjur4FSicXRBC
-KUazzUG22tmBcjUjGZLnBpz7pKOsvGcEAWt/8IMdsgpxZzIhwauXOzkPfdR6yyvv
-WWj8bSK7fNiq3uxBAuFLNcbTNDo6wp20UdL5KrWuvi/bzQrDqTmLjTm7fCH8hEd3
-V6e0VFGGUJoH1kRh3PadQTioYmr6n+mUvC1H96F8Eta/HJ9dbE07megAdZ/tALgb
-HvrQ9slZ847XAn8E/j/OJLcLoELrdoMCwIIUKSkaVC4WQo2iJE6JeivmsyREjYC/
-7k8Xlhvk46vakunDQC+MCPbwjU3T43lf1EVsM/bWo0hRYwCL+Ll2DIX8GPaRr9Lw
-llRhX5sVDrZFON8hmfOYHbfBMMz1WVeJOQ7CtkTu9rxfdkp25VBZSb8Q25ULD+ZF
-U5hygFMzWyaFC5gVUSo6vqZNLldlBm8QTsv567hru+ESnoOuTd4QoouPZ+3sTLJn
-yKPqCXXmcj9rCNfemk/ZdEsBhqyWUwIDAQABo2MwYTAdBgNVHQ4EFgQUVra88cC1
-w/0hV7keCcs30LlNUMgwHwYDVR0jBBgwFoAUVra88cC1w/0hV7keCcs30LlNUMgw
-DwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQELBQAD
-ggIBAMDismUiqc9z0xGtCwD7wMwppDcuCmQvL32XIMFjhcLLZMlvXLSgQuAEdDXh
-XKXq0pEBYjIYKmbopIvf9MujiC2dN5OmSXlZy/7frHjutLfaC9zW+QTiFU326QKV
-vVzaHPcyxodO/UrmymwbdITGU1IOpfolw3vBX17qOxNzT/2mGbFIrCs+BEWPwyKa
-3oZwNz33vGmj6yGavDamRdL+Y+HzYhoKuCEYG5YC4CNjQHe/4y5I2nrE4ks7wY7W
-AlNSs2aJuTbok59bph8lkM6HILceXGqKXQ7/oIbm6cYs+4eXiUFZfV3AN8rEKxM+
-MouUdkubKe3Nzqkg+dDuhUMol2mQbsKkJjOZtuDQ3+SWh8enUqe3RPRTQXUQlrqY
-YSjg4+l72vYaIgbTlA9VnZn/te4aPWheMhZo+57lg2cwF/B0sYXHNcaFg9QrTVAy
-dTZpfQEnL+qWYhpbqBS9m91dFK9RwIeS8NRrq2wlj2/4lOMY8m5Jlh1vaKO9Y9y2
-HhKnfzJ5hPdyck5LDTU3K1Qb7OQTBJjKCRdaT2idAKIT62OiUuoWwfMoajC+rNeS
-YDZUPULQJxzuzqsbFZ8Sy4uTAkd31bdoglouN7RFaeSnyLhb8xhSGhngcpIozHPf
-wuE+sjekQiToAPUHr83aAyCD6yYKBwucdkBZyb0jCD7SsQ53
------END CERTIFICATE-----
diff --git a/cppcache/integration-test/keystore/client_keystore_corrupt.pem
b/cppcache/integration-test/keystore/client_keystore_corrupt.pem
deleted file mode 100755
index e41f773..0000000
--- a/cppcache/integration-test/keystore/client_keystore_corrupt.pem
+++ /dev/null
@@ -1,45 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAp285nn8EDUa2fRmYGrNOUFtkk2sCeMh8fthTsp0AOpBKnCLr
-jVMgXsnivO5/RtEOdM+KqhOp6HaTR4dnWlW8aNeIDydmdFjK/gsBpJKyfQw/7QW7
-OVHeHbLbPr6/zazy+1Zpkx5HBOSYrnqV1KyVfo+M+Y7l2TJC5/i3CVL+d5a+bqjs
-UpXrZWcN6Vgu5VRNJ/hk8jB/UHjA9FUbmreUSL1TqoItUHniPcAATp+m2zx9goMC
-A2CzWV5vece9QI3ymK4zF+ajwRWDIMq7LdNDV99YxTGLa94oB9rq0DTsdKIvfxF6
-7MeFtk57rnPuEM56npDJO2QrRAV57J3t10AkLwIDAQABAoIBAD4sfyjr4YZGFd2+
-c0z26E3Oojpbsj9Hs3MmwW3B/yPAENPcYpvG8m5AaYHezkRtvQCDUOp3AtDftzEI
-hsh0rdIAtvVpnBH4JujPDX0fPEhTFCnfxvYyAFjm4aMbEf4+CrxqCionRBf9CvU/
-cAPZUmn8xEynU5Kjp1Scdttvhi7BoE/iP0KDhzyMjw9cLMOgant7qyWhhLexBf79
-QvqLPT0KpURLa/dQ/kgYs0owM/a2iPP0P9Kpvr8Q7UGdZOYyRi6J68/NbG661cAC
-jVV2hBU7n+CUw7UAO2ni+ahfcORgPxnvrJBSiT479agZN9//bYDXMDawpIQ6QV3j
-egeUg4ECgYEA61AImg4B5Jl1ikzCGLZsnPCZPyk7pNAvQ3x3/e/WuAr4vN3M5Cyx
-2mtYjrKH31Z8TeMEKdoS9ldnWHA5MGsXfX/5T7XN6aNUCCtLBQ2WvidQBeGW1PT5
-SAzeUhmtFuYC4Jx1teJc2ni4SevS/PEuJUjsmAZTik01USB2Y23aTK0CgYEAtieF
-EGiROyPuBpmbWFTN9O4di8RyePPbGlVTatb+kcLRhlD+KUzhjgm0aP7as8DlN8KI
-kQ/JxKhCXQcWo0hiooggf3kO1hihSTF/kjEG5a0c0aqqqDlAQ1hqd0SoOHvCcwPm
-Q0YCDC3hDTG5rwyHyUwqqTwf/tR9oOKoNvtWk8sCgYBgaqGrpdOmvC5KJZteDtlA
-EOFp3NZAeMD08PolhXFAZdZ3ZJZAZAPX0CYwCfzcSQ6Tx1H8aAte/n8s4Ia/BKMS
-XC5mN8MQWUjkNAEAJAo9DdSfJEjuJxZBLGynzTd763EAYXtltEOBjPdN6p+/3n6e
-7ltrCySNxYb0H84CfY913QKBgAMXOJLGs3Alc+x4vsII7lWxlISymJ6kxJr1x6yQ
-aVFf1N5KkYVx4IHgeEcvy9Yw97Kygk6zzeCgWj/p1uB+Ye4QET0YeL/5OwNa66c3
-Xb6X6V1FYA/qqMRdw5Kyf4g10V7SOh36Gh7KyH7I0TW/KK6ptC+a7ZANWvRX5DLK
-oPVxAoGBAIX+Kk1njuAGy+QPsBIdgRfwYyPJZiBYkYJAHYglHHVuKgCEpj0FYmz1
-ATo9nIhVDcWPz+EyljtgCIp50C0ipRb/hu16DjtDPOu4GnofckE2OS51d5TVAGMu
-8Co7bxyn0CkSsdId4Gue7ThCUJJovwG4Si5wUprIorbIK9dTIlwO
------END RSA PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIIC6zCCAdOgAwIBAgIEUCOixTANBgkqhki59w0BAQUFADAeMQswCQYDVQQGEwJV
-UzPPMA0GA1UEAwwGY2xpZW50MB4XDTEyMDgwOTExNDUwOVoXDTM3MDgwMzExNDUw
-OVowHjELMAkGA1UEBhMCVVMxDzANBgfVBAMMBmNsaWVudDCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAKdvOZ5/BA/mtn0ZmBqzTlBbZJNrAnjIfH7YU7Kd
-ADqQSkQi641TIF7J4rzuf0bRDnTPiqoTqeh2k0eHZ1pVvGjXiA8nZnRYyv4LAaSS
-sn0MP+0FuzlR3h2y2z6+v82s8vtWaZMeRwTkmK56ldSslX6PjPmO5dkyQuf4twlS
-/neWvm6o7FKV62VnDelYLuVUTSf4ZPIwf1B4wPRVG5q3lEi9U6qCLVB54G3AAE6f
-pts8fYKDAgNgs1leb3nHvUCN8piuMxfmo8EVgyDKuy3TQ1ffWMUxi2veKAfa6tA0
-7HSiL7cReuzHhbZOe65z7hDOep6QyTtkK0QFeeyd7ddAJC8CAwEAAaMxMC8wHQYD
-VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMA4GA1UdDwEB/wQEAwIEsDANBgkq
-hkiG9w0BAQUFAAOCAQEAL1tEBvoFA8NlzIIXyALWRRLdFWV0b/FPu4lAv1RUF7Sk
-ZRw4nbBUOrMGrZFjnZ3TNRChwQY8P5GlDvyj5oLJ6VZFMAaidWvFrR5oDLm8Khkq
-2vLQXnnchje9hm6jDxaO58XsfU5zicfYRuXi2vYmOgltyCixBWQvEwbI+Uf7F6Lw
-Da7bpNwTgiYs3snB83trYe17hlUaiF7MNC6lCVdy1/F7FbN/ToQQIDpxHVx7jm6n
-SrOtPnOMLoXB9Gcfrtidu1k/ZFyySskK/HnYc1bfGJ9+B1GzbVahuzr/Jdfp62sE
-XxEVh9pXSb0gkB/CUpTEx7ve9jU8tEYNUqMDUj87Qg==
------END CERTIFICATE-----
diff --git a/cppcache/integration-test/keystore/client_keystore_untrusted.pem
b/cppcache/integration-test/keystore/client_keystore_untrusted.pem
deleted file mode 100755
index b316d7b..0000000
--- a/cppcache/integration-test/keystore/client_keystore_untrusted.pem
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: AES-256-CBC,1D33EB50F0D52CAE9CB64EFBA17481E8
-
-Kh7gfmoqXOjwAjtshMs/nuPvsPJ1ihDbgebHHxvyh40tLQ1dNbR27gtzdxD98mbd
-6a+NrqrnB4+ki4z4TaUYUzZd2Z+p0jhUWTj1hrvOdydsUvSZ2oDAaiVZRUo38b52
-o6N1TY66TfSzAu9karcQnrDaQhLlBucjbHuBYuL9q7Mkf67S7ZoHd0vZ7f8tgxD8
-jGCPjEhA6yY9HcmgqcadICi0CyvKpxQvZ6+YLl8W0iIooou+FFDtfdqThwLETvE5
-fZVow7feAcUoKdglXopfKlKV72zU+AehgDKcAYHOlNnpm6awOHu73brlZc+D9A54
-MI4NkWE4wg8C6IWX+JJwZT8yvT3SIqMHW68Ie/owObPAm68o1zTwFdN4EL/2NqMO
-ktohvhpAa0cniv+bB6OD3xfQLcEYRtZGZ71wZmnLe4YExMIqrgxKnLNPAShdJmy/
-U9T4Meg7BF6kWx3gbB7iEOKsdTCdcuRnfMZsGP5tphJ7KcFeHCnTNAUQa2fKScIO
-+pnC4kJWRjEb85EeqeS6Rk5PsaUjxo0C0nJftoqMg1mkkfxCoxBrXHjLC/kz3sIj
-3PavkYur8pP2sceIbVntnJN4KFBLMIf6erpO6bx8o/bDZYAqf03F4R2Ja1TXnGjJ
-pr0gYx7If0qAufRjzh+MicA0ie3U2vsqYZL3zIvm8BPlmRtV2peWe8iwalo0ECVm
-raJQCK8+21vKS8xsZy/EhboSAAc8ZS9ZlnnjdhYt7381HY1Egtu5Y5TYDi8WeNQ+
-iegC4slCZjO/mCSgwe9LDZcyBv3G6jilYrHADEnb1QDj6kOkiZdWxIlpzyPztSwk
-JjRog1He1N+A/0rscIeftus8a6uLU4HMpKJdxvfsM6S5mK8C6pegZReUlvick0Ep
-w7d14/AqB380ZjlW72gCm7a1pTwYgRj3pALn3oR54bX3X0NTvJ6J5XzI7eI7EG6j
-a1fsRanSIq9tuaPbq8ddrIKPHsC+0tu2OTC62ZodmI07Q4veTKG6Wjcxd1dhxytd
-UYwmzt9pE8yX+RVB15iu27tDs1Z6ggo9NqgKmEv25Sw0AV6pIJ1ioWtltLfCqnqm
-7i7LCTmBL7ZlEqkgJ2qdMlKqFOzLU5kE8WUdAidPXBCJvITA/odrG8KSqXjL7Xr/
-afkRgl5/4ixa/DN9WZW3BWTcuWQzVZukEkIqdnaQED+O9Osle4sNfw3BVQAYXIO+
-gar6bHdu1+C/fQsECJAXX8WP14BQYO+riBhjwe/XjdVlqPjdhy9s+Y3klxl81H/B
-XI/bJDak5r1vEYmE4wvYK04oW/55U2LOrkahaJqX3+biaIwchyqjnJM9+6mlMDAm
-EK7TeeBUn0COkveWKiXYY+hm4GISSaawQLeIn1bBmfGvrmPzSrJCrkQN7UTuk++o
-T8Lwn1O8g50J3PwZcSmxe13ev/TD/kpl/DOP24oZr29DBewAK3Z8IXD643iSMEuB
-eKImj7+roGKQjFoy/fFb4kQg1guz+vuXkCv1iovDY/5M4316X8eYF6GMHjEGKvgM
-ThE+Y2kC8GEDzBWYKrJJ5P6xg+t5qcimSAQrS94bG+E8ntuYcOscZaRLwEgoOaEV
------END RSA PRIVATE KEY-----
diff --git a/cppcache/integration-test/keystore/client_truststore.pem
b/cppcache/integration-test/keystore/client_truststore.pem
deleted file mode 100755
index def668f..0000000
--- a/cppcache/integration-test/keystore/client_truststore.pem
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC6zCCAdOgAwIBAgIEUCOimzANBgkqhkiG9w0BAQUFADAeMQswCQYDVQQGEwJVUzEPMA0GA1UE
-AwwGc2VydmVyMB4XDTEyMDgwOTExNDQyN1oXDTM3MDgwMzExNDQyN1owHjELMAkGA1UEBhMCVVMx
-DzANBgNVBAMMBnNlcnZlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMKe/Phwhj/V
-KcFrQuEcnlsWgDGYedyAYwUXItmolvyTeqPRI89H+NktE0zxsn3FjINN/ioz/LLSk6n4y68RGwg+
-8/7EBnYJ/zWYnmPdFeDjzQP6B81YR2YHZH7h+FweQpSpWvo4tZEeiMskQHVMO6t8tE/rwNqcoNfa
-BEFUxPWm/S2q22rueS71ft1MtcGRAUr31fGuKslmoBeT8PqBavo0eVeFu4x/b0TbVg5+arJ/JcOc
-0qFtSBacnY4hMs4uvTKe4yWd0g3wEEMpy5NpImew1be9nDuCnmP2jorvH4RMfNmq4bNWTJJr6sbt
-cCooOE7wEB20Gx69jIATxoXkzHkCAwEAAaMxMC8wHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-BwMCMA4GA1UdDwEB/wQEAwIEsDANBgkqhkiG9w0BAQUFAAOCAQEAYEt4ia2UcU21clHqzsyg1X1R
-nyImw/AKg8D62U1XCdJtqE9JN1H56cijZGKKJqItEtk/ZvsKSUvvBx9tnrrtR/Tz4UZudhG6L/2R
-CeU2A2FXk4t0o1PhWY7aOyNfJ9Y7PRRhYuZ5gXCVGy3c+Aiemb1JUF+pwOs92OvALpv+cG6UfxU7
-gZ/VucKvHROFLMru6Kx0luS3SxdAcYa1XhX0OlbYtbZ+8kzfUbKUvNHFfamsHJzfVzuFENQmDNU0
-wtDX7OgyAhUH/UB1TSk0JFa/upODpZNwyy5OVfF4aFQJ7TH//x8vaiy1zo/V7HBhxU8yzk+GlOTD
-x/VMmE7x5hJakA==
------END CERTIFICATE-----
diff --git
a/cppcache/integration-test/keystore/client_truststore_chained_root.pem
b/cppcache/integration-test/keystore/client_truststore_chained_root.pem
deleted file mode 100644
index 0aaf749..0000000
--- a/cppcache/integration-test/keystore/client_truststore_chained_root.pem
+++ /dev/null
@@ -1,33 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFwDCCA6igAwIBAgIJAIQE3AlDT4/2MA0GCSqGSIb3DQEBCwUAMG0xCzAJBgNV
-BAYTAlVTMQ8wDQYDVQQIDAZPcmVnb24xEjAQBgNVBAcMCUJlYXZlcnRvbjEMMAoG
-A1UECgwDQVNGMSswKQYDVQQDDCJBcGFjaGUgR2VvZGUgQ2VydGlmaWNhdGUgQXV0
-aG9yaXR5MB4XDTE5MDQyNDIyMTg1M1oXDTM5MDQxOTIyMTg1M1owbTELMAkGA1UE
-BhMCVVMxDzANBgNVBAgMBk9yZWdvbjESMBAGA1UEBwwJQmVhdmVydG9uMQwwCgYD
-VQQKDANBU0YxKzApBgNVBAMMIkFwYWNoZSBHZW9kZSBDZXJ0aWZpY2F0ZSBBdXRo
-b3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDQZ1pjDg2ci/X/
-j7Oiy3PpH6hqCLCPehi2yZyGPQcPzV0oTxhf52FGjQ1u6r1Vu05Mi9DiQDf6HtRQ
-0p/9e1c7lZWj9CQSAC0a+N/pBfyCZXzd8x/HOShtgmMIGnzbLtZr3uyOQ03yPEru
-noP4bUQOmVL7sViV2qFYYI8Sj0I0/VRAb1UtefRyzoavJiNahIYQjur4FSicXRBC
-KUazzUG22tmBcjUjGZLnBpz7pKOsvGcEAWt/8IMdsgpxZzIhwauXOzkPfdR6yyvv
-WWj8bSK7fNiq3uxBAuFLNcbTNDo6wp20UdL5KrWuvi/bzQrDqTmLjTm7fCH8hEd3
-V6e0VFGGUJoH1kRh3PadQTioYmr6n+mUvC1H96F8Eta/HJ9dbE07megAdZ/tALgb
-HvrQ9slZ847XAn8E/j/OJLcLoELrdoMCwIIUKSkaVC4WQo2iJE6JeivmsyREjYC/
-7k8Xlhvk46vakunDQC+MCPbwjU3T43lf1EVsM/bWo0hRYwCL+Ll2DIX8GPaRr9Lw
-llRhX5sVDrZFON8hmfOYHbfBMMz1WVeJOQ7CtkTu9rxfdkp25VBZSb8Q25ULD+ZF
-U5hygFMzWyaFC5gVUSo6vqZNLldlBm8QTsv567hru+ESnoOuTd4QoouPZ+3sTLJn
-yKPqCXXmcj9rCNfemk/ZdEsBhqyWUwIDAQABo2MwYTAdBgNVHQ4EFgQUVra88cC1
-w/0hV7keCcs30LlNUMgwHwYDVR0jBBgwFoAUVra88cC1w/0hV7keCcs30LlNUMgw
-DwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQELBQAD
-ggIBAMDismUiqc9z0xGtCwD7wMwppDcuCmQvL32XIMFjhcLLZMlvXLSgQuAEdDXh
-XKXq0pEBYjIYKmbopIvf9MujiC2dN5OmSXlZy/7frHjutLfaC9zW+QTiFU326QKV
-vVzaHPcyxodO/UrmymwbdITGU1IOpfolw3vBX17qOxNzT/2mGbFIrCs+BEWPwyKa
-3oZwNz33vGmj6yGavDamRdL+Y+HzYhoKuCEYG5YC4CNjQHe/4y5I2nrE4ks7wY7W
-AlNSs2aJuTbok59bph8lkM6HILceXGqKXQ7/oIbm6cYs+4eXiUFZfV3AN8rEKxM+
-MouUdkubKe3Nzqkg+dDuhUMol2mQbsKkJjOZtuDQ3+SWh8enUqe3RPRTQXUQlrqY
-YSjg4+l72vYaIgbTlA9VnZn/te4aPWheMhZo+57lg2cwF/B0sYXHNcaFg9QrTVAy
-dTZpfQEnL+qWYhpbqBS9m91dFK9RwIeS8NRrq2wlj2/4lOMY8m5Jlh1vaKO9Y9y2
-HhKnfzJ5hPdyck5LDTU3K1Qb7OQTBJjKCRdaT2idAKIT62OiUuoWwfMoajC+rNeS
-YDZUPULQJxzuzqsbFZ8Sy4uTAkd31bdoglouN7RFaeSnyLhb8xhSGhngcpIozHPf
-wuE+sjekQiToAPUHr83aAyCD6yYKBwucdkBZyb0jCD7SsQ53
------END CERTIFICATE-----
diff --git a/cppcache/integration-test/keystore/server_keystore.jks
b/cppcache/integration-test/keystore/server_keystore.jks
deleted file mode 100755
index f67f87b..0000000
Binary files a/cppcache/integration-test/keystore/server_keystore.jks and
/dev/null differ
diff --git a/cppcache/integration-test/keystore/server_keystore_chained.jks
b/cppcache/integration-test/keystore/server_keystore_chained.jks
deleted file mode 100644
index 9c80ac1..0000000
Binary files a/cppcache/integration-test/keystore/server_keystore_chained.jks
and /dev/null differ
diff --git a/cppcache/integration-test/keystore/server_truststore.jks
b/cppcache/integration-test/keystore/server_truststore.jks
deleted file mode 100755
index eca7330..0000000
Binary files a/cppcache/integration-test/keystore/server_truststore.jks and
/dev/null differ
diff --git
a/cppcache/integration-test/keystore/server_truststore_chained_root.jks
b/cppcache/integration-test/keystore/server_truststore_chained_root.jks
deleted file mode 100644
index dde526b..0000000
Binary files
a/cppcache/integration-test/keystore/server_truststore_chained_root.jks and
/dev/null differ
diff --git a/cppcache/integration-test/keystore/untrusted_server_keystore.jks
b/cppcache/integration-test/keystore/untrusted_server_keystore.jks
deleted file mode 100644
index fb8f5ae..0000000
Binary files a/cppcache/integration-test/keystore/untrusted_server_keystore.jks
and /dev/null differ
diff --git a/cppcache/integration-test/keystore/untrusted_server_truststore.jks
b/cppcache/integration-test/keystore/untrusted_server_truststore.jks
deleted file mode 100644
index 197b35f..0000000
Binary files
a/cppcache/integration-test/keystore/untrusted_server_truststore.jks and
/dev/null differ
diff --git a/cppcache/integration/framework/TestConfig.cpp.in
b/cppcache/integration/framework/TestConfig.cpp.in
index 2b35db3..f937640 100644
--- a/cppcache/integration/framework/TestConfig.cpp.in
+++ b/cppcache/integration/framework/TestConfig.cpp.in
@@ -22,6 +22,8 @@ const char *getFrameworkString(FrameworkVariable name) {
case FrameworkVariable::JavaObjectJarPath: return "@JAVAOBJECT_JAR_PATH@";
case FrameworkVariable::GfShExecutable: return "@Geode_gfsh_EXECUTABLE@";
case FrameworkVariable::TestCacheXmlDir: return
"@CMAKE_CURRENT_SOURCE_DIR@/../../integration-test/resources";
+ case FrameworkVariable::TestClientSslKeysDir: return
"@CMAKE_CURRENT_SOURCE_DIR@/../../../ssl_keys/client_keys";
+ case FrameworkVariable::TestServerSslKeysDir: return
"@CMAKE_CURRENT_SOURCE_DIR@/../../../ssl_keys/server_keys";
default: return "";
}
}
diff --git a/cppcache/integration/framework/TestConfig.h
b/cppcache/integration/framework/TestConfig.h
index ac057b9..b7362d0 100644
--- a/cppcache/integration/framework/TestConfig.h
+++ b/cppcache/integration/framework/TestConfig.h
@@ -20,7 +20,7 @@
#ifndef INTEGRATION_TEST_FRAMEWORK_CONFIG_H
#define INTEGRATION_TEST_FRAMEWORK_CONFIG_H
-enum class FrameworkVariable {JavaObjectJarPath, GfShExecutable,
TestCacheXmlDir};
+enum class FrameworkVariable {JavaObjectJarPath, GfShExecutable,
TestCacheXmlDir, TestClientSslKeysDir, TestServerSslKeysDir};
const char *getFrameworkString(FrameworkVariable name);
diff --git a/cppcache/integration/test/SslOneWayTest.cpp
b/cppcache/integration/test/SslOneWayTest.cpp
index 2948368..177e228 100644
--- a/cppcache/integration/test/SslOneWayTest.cpp
+++ b/cppcache/integration/test/SslOneWayTest.cpp
@@ -42,7 +42,10 @@ class SslOneWayTest : public ::testing::Test {
SslOneWayTest() {
// You can do set-up work for each test here.
certificatePassword = std::string("apachegeode");
- currentWorkingDirectory = boost::filesystem::current_path();
+ serverSslKeysDir = boost::filesystem::path(
+ getFrameworkString(FrameworkVariable::TestServerSslKeysDir));
+ clientSslKeysDir = boost::filesystem::path(
+ getFrameworkString(FrameworkVariable::TestClientSslKeysDir));
}
~SslOneWayTest() override = default;
@@ -54,12 +57,11 @@ class SslOneWayTest : public ::testing::Test {
// Code here will be called immediately after the constructor (right
// before each test).
const auto clusterKeystore =
- (currentWorkingDirectory /
- boost::filesystem::path("ServerSslKeys/server_keystore_chained.p12"));
+ (serverSslKeysDir /
+ boost::filesystem::path("server_keystore_chained.p12"));
const auto clusterTruststore =
- (currentWorkingDirectory /
- boost::filesystem::path(
- "ServerSslKeys/server_truststore_chained_root.jks"));
+ (serverSslKeysDir /
+ boost::filesystem::path("server_truststore_chained_root.jks"));
cluster.useSsl(false, clusterKeystore.string(), clusterTruststore.string(),
certificatePassword, certificatePassword);
@@ -83,14 +85,14 @@ class SslOneWayTest : public ::testing::Test {
// for Ssl.
Cluster cluster = Cluster{LocatorCount{1}, ServerCount{1}};
std::string certificatePassword;
- boost::filesystem::path currentWorkingDirectory;
+ boost::filesystem::path serverSslKeysDir;
+ boost::filesystem::path clientSslKeysDir;
};
TEST_F(SslOneWayTest, PutGetWithValidSslConfiguration) {
const auto clientTruststore =
- (currentWorkingDirectory /
- boost::filesystem::path(
- "ClientSslKeys/client_truststore_chained_root.pem"));
+ (clientSslKeysDir /
+ boost::filesystem::path("client_truststore_chained_root.pem"));
auto cache = CacheFactory()
.set("log-level", "DEBUG")
.set("ssl-enabled", "true")
@@ -113,9 +115,8 @@ TEST_F(SslOneWayTest, PutGetWithValidSslConfiguration) {
TEST_F(SslOneWayTest, PutWithUntrustedTruststore) {
const auto clientUntrustedTruststore =
- (currentWorkingDirectory /
- boost::filesystem::path(
- "ClientSslKeys/client_truststore_untrusting.pem"));
+ (clientSslKeysDir /
+ boost::filesystem::path("client_truststore_untrusting.pem"));
auto cache = CacheFactory()
.set("log-level", "none")
@@ -145,8 +146,8 @@ TEST_F(SslOneWayTest, PutWithUntrustedTruststore) {
TEST_F(SslOneWayTest, PutWithCorruptTruststore) {
const auto clientUntrustedTruststore =
- (currentWorkingDirectory /
- boost::filesystem::path("ClientSslKeys/client_truststore_corrupt.pem"));
+ (clientSslKeysDir /
+ boost::filesystem::path("client_truststore_corrupt.pem"));
auto cache = CacheFactory()
.set("log-level", "none")
@@ -176,8 +177,8 @@ TEST_F(SslOneWayTest, PutWithCorruptTruststore) {
TEST_F(SslOneWayTest, PutWithMissingTruststore) {
const auto clientMissingTruststore =
- (currentWorkingDirectory /
- boost::filesystem::path("ClientSslKeys/client_truststore_missing.pem"));
+ (clientSslKeysDir /
+ boost::filesystem::path("client_truststore_missing.pem"));
auto cache = CacheFactory()
.set("log-level", "none")
diff --git a/cppcache/integration/test/SslTwoWayTest.cpp
b/cppcache/integration/test/SslTwoWayTest.cpp
index 09b6bfa..01edc50 100644
--- a/cppcache/integration/test/SslTwoWayTest.cpp
+++ b/cppcache/integration/test/SslTwoWayTest.cpp
@@ -42,7 +42,10 @@ class SslTwoWayTest : public ::testing::Test {
SslTwoWayTest() {
// You can do set-up work for each test here.
certificatePassword = std::string("apachegeode");
- currentWorkingDirectory = boost::filesystem::current_path();
+ serverSslKeysDir = boost::filesystem::path(
+ getFrameworkString(FrameworkVariable::TestServerSslKeysDir));
+ clientSslKeysDir = boost::filesystem::path(
+ getFrameworkString(FrameworkVariable::TestClientSslKeysDir));
}
~SslTwoWayTest() override = default;
@@ -54,12 +57,11 @@ class SslTwoWayTest : public ::testing::Test {
// Code here will be called immediately after the constructor (right
// before each test).
const auto clusterKeystore =
- (currentWorkingDirectory /
- boost::filesystem::path("ServerSslKeys/server_keystore_chained.p12"));
+ (serverSslKeysDir /
+ boost::filesystem::path("server_keystore_chained.p12"));
const auto clusterTruststore =
- (currentWorkingDirectory /
- boost::filesystem::path(
- "ServerSslKeys/server_truststore_chained_root.jks"));
+ (serverSslKeysDir /
+ boost::filesystem::path("server_truststore_chained_root.jks"));
cluster.useSsl(true, clusterKeystore.string(), clusterTruststore.string(),
certificatePassword, certificatePassword);
@@ -83,17 +85,17 @@ class SslTwoWayTest : public ::testing::Test {
// for Ssl.
Cluster cluster = Cluster{LocatorCount{1}, ServerCount{1}};
std::string certificatePassword;
- boost::filesystem::path currentWorkingDirectory;
+ boost::filesystem::path serverSslKeysDir;
+ boost::filesystem::path clientSslKeysDir;
};
TEST_F(SslTwoWayTest, PutGetWithValidSslConfiguration) {
const auto clientKeystore =
- (currentWorkingDirectory /
- boost::filesystem::path("ClientSslKeys/client_keystore_chained.pem"));
+ (clientSslKeysDir /
+ boost::filesystem::path("client_keystore_chained.pem"));
const auto clientTruststore =
- (currentWorkingDirectory /
- boost::filesystem::path(
- "ClientSslKeys/client_truststore_chained_root.pem"));
+ (clientSslKeysDir /
+ boost::filesystem::path("client_truststore_chained_root.pem"));
auto cache = CacheFactory()
.set("log-level", "DEBUG")
.set("ssl-enabled", "true")
@@ -118,12 +120,11 @@ TEST_F(SslTwoWayTest, PutGetWithValidSslConfiguration) {
TEST_F(SslTwoWayTest, PutWithInvalidKeystorePassword) {
const auto clientKeystore =
- (currentWorkingDirectory /
- boost::filesystem::path("ClientSslKeys/client_keystore_chained.pem"));
+ (clientSslKeysDir /
+ boost::filesystem::path("client_keystore_chained.pem"));
const auto clientTruststore =
- (currentWorkingDirectory /
- boost::filesystem::path(
- "ClientSslKeys/client_truststore_chained_root.pem"));
+ (clientSslKeysDir /
+ boost::filesystem::path("client_truststore_chained_root.pem"));
auto cache = CacheFactory()
.set("log-level", "none")
.set("ssl-enabled", "true")
@@ -154,12 +155,11 @@ TEST_F(SslTwoWayTest, PutWithInvalidKeystorePassword) {
TEST_F(SslTwoWayTest, PutWithUntrustedKeystore) {
const auto clientUntrustedKeystore =
- (currentWorkingDirectory /
- boost::filesystem::path("ClientSslKeys/client_keystore_untrusted.pem"));
+ (clientSslKeysDir /
+ boost::filesystem::path("client_keystore_untrusted.pem"));
const auto clientTruststore =
- (currentWorkingDirectory /
- boost::filesystem::path(
- "ClientSslKeys/client_truststore_chained_root.pem"));
+ (clientSslKeysDir /
+ boost::filesystem::path("client_truststore_chained_root.pem"));
auto cache = CacheFactory()
.set("log-level", "none")
@@ -191,13 +191,12 @@ TEST_F(SslTwoWayTest, PutWithUntrustedKeystore) {
TEST_F(SslTwoWayTest, PutWithCorruptKeystore) {
const auto clientCorruptKeystore =
- (currentWorkingDirectory /
- boost::filesystem::path("ClientSslKeys/client_keystore_corrupt.pem"));
+ (clientSslKeysDir /
+ boost::filesystem::path("client_keystore_corrupt.pem"));
const auto clientTruststore =
- (currentWorkingDirectory /
- boost::filesystem::path(
- "ClientSslKeys/client_truststore_chained_root.pem"));
+ (clientSslKeysDir /
+ boost::filesystem::path("client_truststore_chained_root.pem"));
auto cache = CacheFactory()
.set("log-level", "DEBUG")
@@ -229,12 +228,11 @@ TEST_F(SslTwoWayTest, PutWithCorruptKeystore) {
TEST_F(SslTwoWayTest, PutWithUntrustedTruststore) {
const auto clientKeystore =
- (currentWorkingDirectory /
- boost::filesystem::path("ClientSslKeys/client_keystore_chained.pem"));
+ (clientSslKeysDir /
+ boost::filesystem::path("client_keystore_chained.pem"));
const auto clientUntrustedTruststore =
- (currentWorkingDirectory /
- boost::filesystem::path(
- "ClientSslKeys/client_truststore_untrusting.pem"));
+ (clientSslKeysDir /
+ boost::filesystem::path("client_truststore_untrusting.pem"));
auto cache = CacheFactory()
.set("log-level", "none")
@@ -266,11 +264,11 @@ TEST_F(SslTwoWayTest, PutWithUntrustedTruststore) {
TEST_F(SslTwoWayTest, PutWithCorruptTruststore) {
const auto clientKeystore =
- (currentWorkingDirectory /
- boost::filesystem::path("ClientSslKeys/client_keystore_chained.pem"));
+ (clientSslKeysDir /
+ boost::filesystem::path("client_keystore_chained.pem"));
const auto clientUntrustedTruststore =
- (currentWorkingDirectory /
- boost::filesystem::path("ClientSslKeys/client_truststore_corrupt.pem"));
+ (clientSslKeysDir /
+ boost::filesystem::path("client_truststore_corrupt.pem"));
auto cache = CacheFactory()
.set("log-level", "none")
@@ -302,11 +300,11 @@ TEST_F(SslTwoWayTest, PutWithCorruptTruststore) {
TEST_F(SslTwoWayTest, PutWithMissingTruststore) {
const auto clientKeystore =
- (currentWorkingDirectory /
- boost::filesystem::path("ClientSslKeys/client_keystore_chained.pem"));
+ (clientSslKeysDir /
+ boost::filesystem::path("client_keystore_chained.pem"));
const auto clientMissingTruststore =
- (currentWorkingDirectory /
- boost::filesystem::path("ClientSslKeys/client_truststore_missing.pem"));
+ (clientSslKeysDir /
+ boost::filesystem::path("client_truststore_missing.pem"));
auto cache = CacheFactory()
.set("log-level", "none")
diff --git a/examples/utilities/ClientSslKeys/client_keystore.pem
b/examples/utilities/ClientSslKeys/client_keystore.pem
deleted file mode 100644
index 1fb6b21..0000000
--- a/examples/utilities/ClientSslKeys/client_keystore.pem
+++ /dev/null
@@ -1,128 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: AES-256-CBC,D0A85AB3E34995D142EEDF8DA2B84AEC
-
-T9esPURq+vuXXP2nMRdIEpmFu7ks+xqX458HwwhMS8UyQl4BMZ8AEzCVg0cxGwzN
-fka5a8AsR71ZPYbwNfYfCTMR+u2AeJ71U2wjRSGaKXool7Cp9IuJAcaVdbzEOiYf
-87IBpSvcxrY0Z3c9RhTAm6Ni3eWWBd3wbwH2hYfBt1WMUHtDoDO8zkVwRy20IXXv
-zccimsEZMD6KalWAaNXuuWcUBp/l7NdQ40cOoTaZ/ZnovjNOb/322GgMswtjGrVX
-5+T7bYynWIsF8nzu0AljOpwvazytxCZPE8hvfjVUv6WSDhwWbaZlUlTGy6bi/YXr
-LVXR3KCZiq36AOlgeJoz1dPAh9MB60xu6FHUvzCsO/toaAmQ5sTrQb2zo8AFpsz9
-o25S3e24tzabxej//c1fujFrVm7ThzgEShZMj9TewS7NGUsEAK+VDVvkENbJn4vW
-Ls0k6m+Nvdn2kaCGvmY5/m2CQlM5RcLvvTdWlw07nF9sm7oOv3zJ5YESKKoREjuC
-MVg8YWjVi/hHcRr2S6nE10EVWDlLFV+VncsPa8eWFDGYWJ36MfdqT4xlMiA26owx
-rlA3YIwX7cOkvjpIGyj2t6LvT69ZsEmaJ94FpcTiqmIHYwWJfVbH9og80zUe8QB5
-vNLTCIGLA1hinH5fSD/mWgA0Dzo5JGKzhXwYAhoNFppQcULw8hxcMtU5kPaWDJiP
-IRsrfmc+FCr9DKyYuE2WY2yYvDvZY19FlAPBNG7wcsivZamk+gB/tBV2b6xmpccB
-HJr8vLqr5qUPGrmWB7klWUxKxIYLRpW8Ie/K8gG0Uf++JlzcwHNIlsAEFgVpkFhN
-ok/K5SkGxJv5fdzNi3srnoeyhLs18sC6eX8y8mjHSsIF4g3l5yj58wDb4gmICQU6
-L9ehFVn426Kqfaj77oX5aGL7geNrH3lxOr3KtmJigpKM9e8vLGuK2MjBctOrvbhj
-g9fDLrfEnQW9/7hmM4ftONUc0sVjPcES/0vb7HcHVGhrowiPnNvw4R8XN8qv5+Wy
-0E/slwlKkXmkA3CWqjOUjzIdzvRUiGMWpiu8b2HjPRmj1wDvM8/q0JWMEz2rwp2F
-IvgSgYK4IeKCO5WmW+aqWAaVUQKPp7qarsqM5ffrI5DH5DbvqPW5LjHdyIFzbzgo
-kRQghUkS9gs9S/enivaPMLOFZ/SZckrYMMpLBmJL+oXHgjssOQT0pTlmqhAajQur
-sUyVITAyKGYQoyagkig/YJoSE8kDkSUYAudDdDvWa3TS1fv3C+hBNKBZX63F2nGR
-MlRb6thKV1OgZYcyyvJe6vtWpfJ0sk9TGIkW/y30au6Vt9F7WJxaUcBuM0v5VPpH
-ujIJIKJ1Vic1VIH6Xo3B3Km+Tl3OC+ZtvEJ/FnRv9JKe0K3zMYbyaeLNM2yOwmxc
-xGQM3Rj3ilJTweSBjjcLKgX7XGQZ6IErrTmSedj4Ze62JPnSPuWfESW+U/ep9lID
-0O7/nmpKqz0fAUNgplV6Jd+o0bTB2jkUBd4OuFqBF5kK64HBj8vfze8WW7kNvCqy
-OtDEnZZpoMwV1c9VEBjFn2C8uYw8WYDx5w0uzdHheFxIq2BpnNJcJDeoYotmk3hX
------END RSA PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIIFfjCCA2agAwIBAgICEAEwDQYJKoZIhvcNAQELBQAwWjELMAkGA1UEBhMCVVMx
-DzANBgNVBAgMBk9yZWdvbjEMMAoGA1UECgwDQVNGMSwwKgYDVQQDDCNBcGFjaGUg
-R2VvZGUgSW50ZXJtZWRpYXRlIEF1dGhvcml0eTAeFw0xOTA0MjQyMjM2MDRaFw0y
-NjA0MjIyMjM2MDRaMGoxCzAJBgNVBAYTAlVTMQ8wDQYDVQQIDAZPcmVnb24xEjAQ
-BgNVBAcMCUJlYXZlcnRvbjEMMAoGA1UECgwDQVNGMSgwJgYDVQQDDB9BcGFjaGUg
-R2VvZGUgQ2xpZW50IENlcnRpZmljYXRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEA5vvJdF7i0FXJtGqOgZBsJKrJzFYjmGPmfRaMgAH6FbIjgDMvSIfP
-qwDeUp0JYu2ubVE9AvE7LQoxSgpJKLMYjl5uEO7PsmZVDL2PyeW0KEewsFXzn8Fo
-4qTTtHBknMpQDtd4qXKV2V+QFgvOZg3tc2n3IeFW9kuDw5JjJ/d0Rsn2l+3EOzAE
-AoFei6svwBl0RRSO+Q1gheC6boj6XB/so6o9uMRrSYVRqbEMdkU4tUjHYOcLTMJx
-pxfMgp/Codm6slq5oV1eedks/PzVXOcr4L8MYZRW9oy2y+ZeVJehUW4aAgwa2eft
-fM9oGpkFVxZfyhYKhiTfWn9RBEuf3/SUHwIDAQABo4IBPDCCATgwCQYDVR0TBAIw
-ADARBglghkgBhvhCAQEEBAMCB4AwOQYJYIZIAYb4QgENBCwWKk9wZW5TU0wgR2Vu
-ZXJhdGVkIEdlb2RlIENsaWVudCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUZTMvHVkr
-Aw/w4L2rHRqnD7Z4escwgZgGA1UdIwSBkDCBjYAU36rGKVHxY48sqdC5EIgkToRz
-dvqhcaRvMG0xCzAJBgNVBAYTAlVTMQ8wDQYDVQQIDAZPcmVnb24xEjAQBgNVBAcM
-CUJlYXZlcnRvbjEMMAoGA1UECgwDQVNGMSswKQYDVQQDDCJBcGFjaGUgR2VvZGUg
-Q2VydGlmaWNhdGUgQXV0aG9yaXR5ggIQADAOBgNVHQ8BAf8EBAMCBaAwEwYDVR0l
-BAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQADggIBACdelXfgn8V7+Ni3NSlX
-qOYMF3uKXzluU/sTBBLiIwE7ggq9+ckXoOcSzWGiEwrgbl2bTsg0JqD88VdWcMB9
-a+jX0At11upYKRLffYg8RKDu0FFlaR5So4f1JjFBK8Rr5cMepYmoZy3qgCrPBgT4
-MWzFN+EJRomwUyU5JF2UUhIOT2qJHCI8lMvkJeAJiq5GYZurYt25y3l+po2dYogb
-vXWPcWOWiSN5+gkU5aE5vCh3kyDQ/WEg8FddLCaxizFXROTktix29Tq3rCXiGZGk
-cLHHsmLKxFb5iyzvHEcDSMK/0uInCwCBikEoOp8Ybsw27pM0F092MNnt3VXre3Pg
-ywqrOGly4vqOlc38VyPefGBTLFDD8p7ahSrMmeFyIVXJevIkIWjIHD2RXmY8/3DK
-pKH7KLKDS/1BRErMlRBheKj574GmlgXjsWKb/wW72l/rAMPX1YwaL8fJthLgSdQ9
-CCXOaBaTCwwjW8cM86TFdbc9yREHNkEF2Ss+YqzRTAoG7ztmle6TfkQoC2zQ9+EX
-oQkBM9740a8oqpYWI8oi311EJvJE7Yq3W78fp0cq6rYgvfBIFai/VtKU/l8xrj5N
-BeknimgQ4ePiFr7nbK7iScQ/bUnN5vN1U1Vu4uLEGDtvSRLG/bAvv0U8A49xUetA
-uetZI1uf4Cwk8MXPzdjGcDBs
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIFqTCCA5GgAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwbTELMAkGA1UEBhMCVVMx
-DzANBgNVBAgMBk9yZWdvbjESMBAGA1UEBwwJQmVhdmVydG9uMQwwCgYDVQQKDANB
-U0YxKzApBgNVBAMMIkFwYWNoZSBHZW9kZSBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkw
-HhcNMTkwNDI0MjIyMzI0WhcNMjkwNDIxMjIyMzI0WjBaMQswCQYDVQQGEwJVUzEP
-MA0GA1UECAwGT3JlZ29uMQwwCgYDVQQKDANBU0YxLDAqBgNVBAMMI0FwYWNoZSBH
-ZW9kZSBJbnRlcm1lZGlhdGUgQXV0aG9yaXR5MIICIjANBgkqhkiG9w0BAQEFAAOC
-Ag8AMIICCgKCAgEArWK9T8jA7CLliww5NOxOp0Lh+Wwr+JKtEz6JMUYUsey761ra
-dlq3C/BgedaU4B7SqTDX86Gvl3sRjpMD5GwkNhzjPSLhm5CJ3MMMYu2zC/SAyVbZ
-cDv8YUm/y6unnESaFh7E4vCvDzcZp8yHdD73Vl44yrWfFkJ7duwtF1cq3v2Z4wiZ
-UGAi+pcFCCav0kXiVD1BD3wGyFeyb/F9g5mP0Pmxs5/hyrvs59Ax5OjpAcNFMemF
-C4UMePWV7Shoex77m8KnpWxR8eNGk0crEOX1BYy76oWGwGUEqHgSWp+4R0hkxZFt
-oY684Z7e3L/aQ39/AwGaBamV9QIGRNoIQIdwYq+dWY/gI5OqfgIOiQypuWiyxfer
-LtI/DvpLjVDRIiZEBDJQcywzrhkZB+Wuo1LzHxo6GTb3IEfO9nVoDvedacFIDqce
-TTPr/nnB/YvqZLEpI2vfTBENr7PZ9uaaZONZwZWgGj28qVoGt4YgraoTIbgBbX+z
-WrOF9QE8ivxXAhTvYhE5qNbzNTWSfgINJWBiQrVh2NqTDudzBNoUYWG2uotb0C34
-7j4jJTTTtXdczjBo+/T4q+ZrOTOqpBdUWa9o5VcFIrcDV9ewCyiudevqWWJIKzZn
-+dmpW0SgKGDwiJxDs7XRDZW9qCJNhsInQdhI0eeWAIzsYobHltxEUS0qoFkCAwEA
-AaNmMGQwHQYDVR0OBBYEFN+qxilR8WOPLKnQuRCIJE6Ec3b6MB8GA1UdIwQYMBaA
-FFa2vPHAtcP9IVe5HgnLN9C5TVDIMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYDVR0P
-AQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4ICAQDNHBibIKdLjgdn6LD7ZVcPCwZt
-z/0OGUZOysI0dioBKwxXqgYwWP4Wpwk22ZABQ11nJir+apCatzaAJrCM3SN117dd
-EywOjO1LlShyOrUnYZDhn1GNE0dT6dvSvdtm3GmGly1PjqFUwis5gErrKTg5cp7z
-RIESL9sWJ57xoDLf2QBcqOjI422dODuay0/Hg8nqiFcFNHuIl1sZtAXbMCWoVn4U
-b5zN7x6k2Z/NL8aapCxZpscPab+ytrqrrgcIJ1D2Y3LmFCFIdSwdEou8dGhRl9lZ
-7+kB9XnXLuoxy/amKV0yjvWUkcg0EIHa8HcgO6/FIqaZxxt6ws4LpR8SHtbYWUK0
-JNbS6Po3TFizMhvXVaAJl5h5WAjYBqBSYZ3RB1EbKRiWOHLSsiAIYkh2t96k8L0t
-HYnsuzXeHdLgQOQUddbgH3udvr94xM81TDA79NHksC+WtWMeSP7DeshjOcyg6g9a
-0D513tIjuzArOjhoY0MpwaUKmZM+byfmNb1sMW2tFVodXuvR3zGSA4qanDYSGguP
-NNEB/HE5y7203rkJ5RJZmBCkBrgXXYG/WG1uHjQ6GlC8hsNO4SCR4F93NkB+6SmN
-7hutsVd+/QpmMQWr/yM+XcGXZ9+aRqAXJIoBbq2uoa06OKnABL04hnTNYiEi6M8r
-sCMLsQ38TzdplfODpg==
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIFwDCCA6igAwIBAgIJAIQE3AlDT4/2MA0GCSqGSIb3DQEBCwUAMG0xCzAJBgNV
-BAYTAlVTMQ8wDQYDVQQIDAZPcmVnb24xEjAQBgNVBAcMCUJlYXZlcnRvbjEMMAoG
-A1UECgwDQVNGMSswKQYDVQQDDCJBcGFjaGUgR2VvZGUgQ2VydGlmaWNhdGUgQXV0
-aG9yaXR5MB4XDTE5MDQyNDIyMTg1M1oXDTM5MDQxOTIyMTg1M1owbTELMAkGA1UE
-BhMCVVMxDzANBgNVBAgMBk9yZWdvbjESMBAGA1UEBwwJQmVhdmVydG9uMQwwCgYD
-VQQKDANBU0YxKzApBgNVBAMMIkFwYWNoZSBHZW9kZSBDZXJ0aWZpY2F0ZSBBdXRo
-b3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDQZ1pjDg2ci/X/
-j7Oiy3PpH6hqCLCPehi2yZyGPQcPzV0oTxhf52FGjQ1u6r1Vu05Mi9DiQDf6HtRQ
-0p/9e1c7lZWj9CQSAC0a+N/pBfyCZXzd8x/HOShtgmMIGnzbLtZr3uyOQ03yPEru
-noP4bUQOmVL7sViV2qFYYI8Sj0I0/VRAb1UtefRyzoavJiNahIYQjur4FSicXRBC
-KUazzUG22tmBcjUjGZLnBpz7pKOsvGcEAWt/8IMdsgpxZzIhwauXOzkPfdR6yyvv
-WWj8bSK7fNiq3uxBAuFLNcbTNDo6wp20UdL5KrWuvi/bzQrDqTmLjTm7fCH8hEd3
-V6e0VFGGUJoH1kRh3PadQTioYmr6n+mUvC1H96F8Eta/HJ9dbE07megAdZ/tALgb
-HvrQ9slZ847XAn8E/j/OJLcLoELrdoMCwIIUKSkaVC4WQo2iJE6JeivmsyREjYC/
-7k8Xlhvk46vakunDQC+MCPbwjU3T43lf1EVsM/bWo0hRYwCL+Ll2DIX8GPaRr9Lw
-llRhX5sVDrZFON8hmfOYHbfBMMz1WVeJOQ7CtkTu9rxfdkp25VBZSb8Q25ULD+ZF
-U5hygFMzWyaFC5gVUSo6vqZNLldlBm8QTsv567hru+ESnoOuTd4QoouPZ+3sTLJn
-yKPqCXXmcj9rCNfemk/ZdEsBhqyWUwIDAQABo2MwYTAdBgNVHQ4EFgQUVra88cC1
-w/0hV7keCcs30LlNUMgwHwYDVR0jBBgwFoAUVra88cC1w/0hV7keCcs30LlNUMgw
-DwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQELBQAD
-ggIBAMDismUiqc9z0xGtCwD7wMwppDcuCmQvL32XIMFjhcLLZMlvXLSgQuAEdDXh
-XKXq0pEBYjIYKmbopIvf9MujiC2dN5OmSXlZy/7frHjutLfaC9zW+QTiFU326QKV
-vVzaHPcyxodO/UrmymwbdITGU1IOpfolw3vBX17qOxNzT/2mGbFIrCs+BEWPwyKa
-3oZwNz33vGmj6yGavDamRdL+Y+HzYhoKuCEYG5YC4CNjQHe/4y5I2nrE4ks7wY7W
-AlNSs2aJuTbok59bph8lkM6HILceXGqKXQ7/oIbm6cYs+4eXiUFZfV3AN8rEKxM+
-MouUdkubKe3Nzqkg+dDuhUMol2mQbsKkJjOZtuDQ3+SWh8enUqe3RPRTQXUQlrqY
-YSjg4+l72vYaIgbTlA9VnZn/te4aPWheMhZo+57lg2cwF/B0sYXHNcaFg9QrTVAy
-dTZpfQEnL+qWYhpbqBS9m91dFK9RwIeS8NRrq2wlj2/4lOMY8m5Jlh1vaKO9Y9y2
-HhKnfzJ5hPdyck5LDTU3K1Qb7OQTBJjKCRdaT2idAKIT62OiUuoWwfMoajC+rNeS
-YDZUPULQJxzuzqsbFZ8Sy4uTAkd31bdoglouN7RFaeSnyLhb8xhSGhngcpIozHPf
-wuE+sjekQiToAPUHr83aAyCD6yYKBwucdkBZyb0jCD7SsQ53
------END CERTIFICATE-----
diff --git a/examples/utilities/ClientSslKeys/client_truststore.pem
b/examples/utilities/ClientSslKeys/client_truststore.pem
deleted file mode 100644
index 0aaf749..0000000
--- a/examples/utilities/ClientSslKeys/client_truststore.pem
+++ /dev/null
@@ -1,33 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFwDCCA6igAwIBAgIJAIQE3AlDT4/2MA0GCSqGSIb3DQEBCwUAMG0xCzAJBgNV
-BAYTAlVTMQ8wDQYDVQQIDAZPcmVnb24xEjAQBgNVBAcMCUJlYXZlcnRvbjEMMAoG
-A1UECgwDQVNGMSswKQYDVQQDDCJBcGFjaGUgR2VvZGUgQ2VydGlmaWNhdGUgQXV0
-aG9yaXR5MB4XDTE5MDQyNDIyMTg1M1oXDTM5MDQxOTIyMTg1M1owbTELMAkGA1UE
-BhMCVVMxDzANBgNVBAgMBk9yZWdvbjESMBAGA1UEBwwJQmVhdmVydG9uMQwwCgYD
-VQQKDANBU0YxKzApBgNVBAMMIkFwYWNoZSBHZW9kZSBDZXJ0aWZpY2F0ZSBBdXRo
-b3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDQZ1pjDg2ci/X/
-j7Oiy3PpH6hqCLCPehi2yZyGPQcPzV0oTxhf52FGjQ1u6r1Vu05Mi9DiQDf6HtRQ
-0p/9e1c7lZWj9CQSAC0a+N/pBfyCZXzd8x/HOShtgmMIGnzbLtZr3uyOQ03yPEru
-noP4bUQOmVL7sViV2qFYYI8Sj0I0/VRAb1UtefRyzoavJiNahIYQjur4FSicXRBC
-KUazzUG22tmBcjUjGZLnBpz7pKOsvGcEAWt/8IMdsgpxZzIhwauXOzkPfdR6yyvv
-WWj8bSK7fNiq3uxBAuFLNcbTNDo6wp20UdL5KrWuvi/bzQrDqTmLjTm7fCH8hEd3
-V6e0VFGGUJoH1kRh3PadQTioYmr6n+mUvC1H96F8Eta/HJ9dbE07megAdZ/tALgb
-HvrQ9slZ847XAn8E/j/OJLcLoELrdoMCwIIUKSkaVC4WQo2iJE6JeivmsyREjYC/
-7k8Xlhvk46vakunDQC+MCPbwjU3T43lf1EVsM/bWo0hRYwCL+Ll2DIX8GPaRr9Lw
-llRhX5sVDrZFON8hmfOYHbfBMMz1WVeJOQ7CtkTu9rxfdkp25VBZSb8Q25ULD+ZF
-U5hygFMzWyaFC5gVUSo6vqZNLldlBm8QTsv567hru+ESnoOuTd4QoouPZ+3sTLJn
-yKPqCXXmcj9rCNfemk/ZdEsBhqyWUwIDAQABo2MwYTAdBgNVHQ4EFgQUVra88cC1
-w/0hV7keCcs30LlNUMgwHwYDVR0jBBgwFoAUVra88cC1w/0hV7keCcs30LlNUMgw
-DwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQELBQAD
-ggIBAMDismUiqc9z0xGtCwD7wMwppDcuCmQvL32XIMFjhcLLZMlvXLSgQuAEdDXh
-XKXq0pEBYjIYKmbopIvf9MujiC2dN5OmSXlZy/7frHjutLfaC9zW+QTiFU326QKV
-vVzaHPcyxodO/UrmymwbdITGU1IOpfolw3vBX17qOxNzT/2mGbFIrCs+BEWPwyKa
-3oZwNz33vGmj6yGavDamRdL+Y+HzYhoKuCEYG5YC4CNjQHe/4y5I2nrE4ks7wY7W
-AlNSs2aJuTbok59bph8lkM6HILceXGqKXQ7/oIbm6cYs+4eXiUFZfV3AN8rEKxM+
-MouUdkubKe3Nzqkg+dDuhUMol2mQbsKkJjOZtuDQ3+SWh8enUqe3RPRTQXUQlrqY
-YSjg4+l72vYaIgbTlA9VnZn/te4aPWheMhZo+57lg2cwF/B0sYXHNcaFg9QrTVAy
-dTZpfQEnL+qWYhpbqBS9m91dFK9RwIeS8NRrq2wlj2/4lOMY8m5Jlh1vaKO9Y9y2
-HhKnfzJ5hPdyck5LDTU3K1Qb7OQTBJjKCRdaT2idAKIT62OiUuoWwfMoajC+rNeS
-YDZUPULQJxzuzqsbFZ8Sy4uTAkd31bdoglouN7RFaeSnyLhb8xhSGhngcpIozHPf
-wuE+sjekQiToAPUHr83aAyCD6yYKBwucdkBZyb0jCD7SsQ53
------END CERTIFICATE-----
diff --git a/examples/utilities/ServerSslKeys/server_keystore.p12
b/examples/utilities/ServerSslKeys/server_keystore.p12
deleted file mode 100644
index 9c51481..0000000
Binary files a/examples/utilities/ServerSslKeys/server_keystore.p12 and
/dev/null differ
diff --git a/examples/utilities/ServerSslKeys/server_truststore.jks
b/examples/utilities/ServerSslKeys/server_truststore.jks
deleted file mode 100644
index dde526b..0000000
Binary files a/examples/utilities/ServerSslKeys/server_truststore.jks and
/dev/null differ
diff --git
a/cppcache/integration/test/ClientSslKeys/client_keystore.password.pem
b/ssl_keys/client_keys/client_keystore.password.pem
old mode 100755
new mode 100644
similarity index 100%
rename from cppcache/integration/test/ClientSslKeys/client_keystore.password.pem
rename to ssl_keys/client_keys/client_keystore.password.pem
diff --git a/cppcache/integration/test/ClientSslKeys/client_keystore.pem
b/ssl_keys/client_keys/client_keystore.pem
similarity index 100%
rename from cppcache/integration/test/ClientSslKeys/client_keystore.pem
rename to ssl_keys/client_keys/client_keystore.pem
diff --git
a/cppcache/integration/test/ClientSslKeys/client_keystore_chained.pem
b/ssl_keys/client_keys/client_keystore_chained.pem
similarity index 100%
rename from cppcache/integration/test/ClientSslKeys/client_keystore_chained.pem
rename to ssl_keys/client_keys/client_keystore_chained.pem
diff --git
a/cppcache/integration/test/ClientSslKeys/client_keystore_corrupt.pem
b/ssl_keys/client_keys/client_keystore_corrupt.pem
similarity index 100%
rename from cppcache/integration/test/ClientSslKeys/client_keystore_corrupt.pem
rename to ssl_keys/client_keys/client_keystore_corrupt.pem
diff --git
a/cppcache/integration/test/ClientSslKeys/client_keystore_untrusted.pem
b/ssl_keys/client_keys/client_keystore_untrusted.pem
similarity index 100%
rename from
cppcache/integration/test/ClientSslKeys/client_keystore_untrusted.pem
rename to ssl_keys/client_keys/client_keystore_untrusted.pem
diff --git a/cppcache/integration/test/ClientSslKeys/client_truststore.pem
b/ssl_keys/client_keys/client_truststore.pem
old mode 100755
new mode 100644
similarity index 100%
rename from cppcache/integration/test/ClientSslKeys/client_truststore.pem
rename to ssl_keys/client_keys/client_truststore.pem
diff --git
a/cppcache/integration/test/ClientSslKeys/client_truststore_chained_root.pem
b/ssl_keys/client_keys/client_truststore_chained_root.pem
similarity index 100%
rename from
cppcache/integration/test/ClientSslKeys/client_truststore_chained_root.pem
rename to ssl_keys/client_keys/client_truststore_chained_root.pem
diff --git
a/cppcache/integration/test/ClientSslKeys/client_truststore_corrupt.pem
b/ssl_keys/client_keys/client_truststore_corrupt.pem
similarity index 100%
rename from
cppcache/integration/test/ClientSslKeys/client_truststore_corrupt.pem
rename to ssl_keys/client_keys/client_truststore_corrupt.pem
diff --git
a/cppcache/integration/test/ClientSslKeys/client_truststore_untrusting.pem
b/ssl_keys/client_keys/client_truststore_untrusting.pem
similarity index 100%
rename from
cppcache/integration/test/ClientSslKeys/client_truststore_untrusting.pem
rename to ssl_keys/client_keys/client_truststore_untrusting.pem
diff --git a/cppcache/integration-test/keystore/gemfire.pem
b/ssl_keys/client_keys/gemfire.pem
similarity index 100%
rename from cppcache/integration-test/keystore/gemfire.pem
rename to ssl_keys/client_keys/gemfire.pem
diff --git a/cppcache/integration/test/ServerSslKeys/server_keystore.jks
b/ssl_keys/server_keys/server_keystore.jks
old mode 100755
new mode 100644
similarity index 100%
rename from cppcache/integration/test/ServerSslKeys/server_keystore.jks
rename to ssl_keys/server_keys/server_keystore.jks
diff --git
a/cppcache/integration/test/ServerSslKeys/server_keystore_chained.jks
b/ssl_keys/server_keys/server_keystore_chained.jks
similarity index 100%
rename from cppcache/integration/test/ServerSslKeys/server_keystore_chained.jks
rename to ssl_keys/server_keys/server_keystore_chained.jks
diff --git
a/cppcache/integration/test/ServerSslKeys/server_keystore_chained.p12
b/ssl_keys/server_keys/server_keystore_chained.p12
similarity index 100%
rename from cppcache/integration/test/ServerSslKeys/server_keystore_chained.p12
rename to ssl_keys/server_keys/server_keystore_chained.p12
diff --git a/cppcache/integration/test/ServerSslKeys/server_truststore.jks
b/ssl_keys/server_keys/server_truststore.jks
old mode 100755
new mode 100644
similarity index 100%
rename from cppcache/integration/test/ServerSslKeys/server_truststore.jks
rename to ssl_keys/server_keys/server_truststore.jks
diff --git
a/cppcache/integration/test/ServerSslKeys/server_truststore_chained_root.jks
b/ssl_keys/server_keys/server_truststore_chained_root.jks
similarity index 100%
rename from
cppcache/integration/test/ServerSslKeys/server_truststore_chained_root.jks
rename to ssl_keys/server_keys/server_truststore_chained_root.jks
diff --git
a/cppcache/integration/test/ServerSslKeys/untrusted_server_keystore.jks
b/ssl_keys/server_keys/untrusted_server_keystore.jks
similarity index 100%
rename from
cppcache/integration/test/ServerSslKeys/untrusted_server_keystore.jks
rename to ssl_keys/server_keys/untrusted_server_keystore.jks
diff --git
a/cppcache/integration/test/ServerSslKeys/untrusted_server_truststore.jks
b/ssl_keys/server_keys/untrusted_server_truststore.jks
similarity index 100%
rename from
cppcache/integration/test/ServerSslKeys/untrusted_server_truststore.jks
rename to ssl_keys/server_keys/untrusted_server_truststore.jks
