From 3d01d2daabb3da6616403c9e7a9240845ad4e96d Mon Sep 17 00:00:00 2001
From: Jonathan Knight <jk@thegridman.com>
Date: Mon, 30 Mar 2020 16:01:58 +0300
Subject: [PATCH] Fix keys and certs used in gRPC TLS/SSL tests (#1597)

* Fix keys and certs used in gRPC TLS/SSL tests
---
 grpc/client/src/test/resources/ssl/ca.pem     | 44 ++++-------
 .../src/test/resources/ssl/clientCert.pem     | 41 ++++------
 .../src/test/resources/ssl/clientKey.pem      | 76 +++++++------------
 grpc/client/src/test/resources/ssl/keys.sh    | 49 ++++++++++++
 .../src/test/resources/ssl/serverCert.pem     | 42 ++++------
 .../src/test/resources/ssl/serverKey.pem      | 76 +++++++------------
 grpc/server/src/test/resources/ssl/ca.pem     | 44 ++++-------
 .../src/test/resources/ssl/clientCert.pem     | 41 ++++------
 .../src/test/resources/ssl/clientKey.pem      | 76 +++++++------------
 grpc/server/src/test/resources/ssl/keys.sh    | 49 ++++++++++++
 .../src/test/resources/ssl/serverCert.pem     | 42 ++++------
 .../src/test/resources/ssl/serverKey.pem      | 76 +++++++------------
 12 files changed, 290 insertions(+), 366 deletions(-)
 create mode 100644 grpc/client/src/test/resources/ssl/keys.sh
 create mode 100644 grpc/server/src/test/resources/ssl/keys.sh

diff --git a/grpc/client/src/test/resources/ssl/ca.pem b/grpc/client/src/test/resources/ssl/ca.pem
index fe872b835..9edce3cf4 100644
--- a/grpc/client/src/test/resources/ssl/ca.pem
+++ b/grpc/client/src/test/resources/ssl/ca.pem
@@ -1,31 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIIFZDCCA0wCCQDcF3EaDha/QjANBgkqhkiG9w0BAQsFADB0MQswCQYDVQQGEwJV
-UzETMBEGA1UECAwKQ2FsaWZvcm5pYTEUMBIGA1UEBwwLU2FudGEgQ2xhcmExDzAN
-BgNVBAoMBk9yYWNsZTEVMBMGA1UECwwMSGVsaWRvbi1nUlBDMRIwEAYDVQQDDAls
-b2NhbGhvc3QwHhcNMTkwMzI4MTg0NTA0WhcNMjAwMzI3MTg0NTA0WjB0MQswCQYD
-VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEUMBIGA1UEBwwLU2FudGEgQ2xh
-cmExDzANBgNVBAoMBk9yYWNsZTEVMBMGA1UECwwMSGVsaWRvbi1nUlBDMRIwEAYD
-VQQDDAlsb2NhbGhvc3QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC1
-x5GX12M9tP/W8VVwytr95wOtqNfZ46bIMtJAF3JoCWTug54TOeW3RRGnVpdXt1ww
-AxQffgZdLVm/AE88MbEhrRkUlEkzktyd6fUr2XSYZ/NlzvNDAhftfoz25o8Olww6
-oScD0CFmw4vlVo9203BmLMjZzaX/srDLylRhiLaq3pgcKS82oVesh/qCzQXcWX09
-EuRKJX4ktG5kcPqfYxuZLCn2Wf/JsLmxRwxGe0ux4dpyZ2F+Ehmfe7ukMA8eehJH
-H6IdN08A9Pd7o/koJuhBYkDIP9JymdNhJNod7kjiYxOEcmxRR9v3/vQR6ZF92fwA
-frO7K0/Rg5meXw8VviDJryHEVYODXSOvfpLmCrjZ3esWkj//R9oybtTWYrDxkva9
-4fYmedXX4c3FWxtNljtz5thS6TXg2u8IDHvh0xcN0JPkfiw+Kql0+8/JOGw1JChQ
-9G8SnsKcg+hRccd823tLAiUNbznY+ZOyyVwX70bZu1Uvj8KTRiBRGzfCv8QTAHbX
-YYYlaPV3WDiDKpRQy5zE/FQKFqZ2Avtab/09tyd3kc05JJW0xqhN7tgOF1WunQEh
-ciDGlywSFhPxU7K2w/YptQW8HEFoMIKXnd0c1ERhwNuCbcnPeUwvdeTT+IiiDtdo
-kqYDudhnc+kjCsnTkrl06bzvmFxV/ETIovAxAiY9wwIDAQABMA0GCSqGSIb3DQEB
-CwUAA4ICAQCpvl8JII4wo02jcDA0eaL9XBj7w0D1yPEtnwjbszpVqVHPNHiZ/239
-DEk07eEDQxF0sH9sQlZzidAVtLSqtWncfkcKruI1Hn4HtR/CyF6bqHqby3Y4P4PJ
-kGuHqYo6V9d0I+AHUZdqV/d9rU0CB8jeff1WJi+jirvQnYHlImPd09tCLuyH6cqI
-lT1yKzXPT9IyqLmVmxhpLxI4Zysfz5bKAkeKBMW1qXl4XiN5pq6hN5x3uX9zo5dA
-rpL9LU/+DxVcrb6PZCJpAtmRsVwbRmQz3lTSa1NOgCeW1mzb3Fljevg1uQ3nuy29
-34/1vX9d9pz1eFaGOf/eECz1cNsvQjCTPuhEMaU4HVIKC3BTiGeiQoT1sdgd8OdA
-nGVSVOuydcL/UQOCm/DJb6X7wAaOQj5JL9FvhPNEEnf5zYzX0Tc8KHIyg/wRkTGv
-BgtbTIg51fGyHpReKTBQkfExG09yjfHvJHIBw8PYn81IM3ViueqpPoiH91XPl87h
-bwHd0fjd77vfysKi/owYkJxNn5xaVLaVaeZegkXw/b7jy0oGJaUiKspfi8RBTvZa
-PfALLqpgcjBllAzThEbH7/rAiSU6JQwkuaFgZpg00r7cZ85nr88j+p4sm9ou/o8U
-EwmKA60B42To6yE8Hb6byBSXf2rZeWCEyZUyv2LTW1HST4SeUWVM/A==
+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
+t2Dcg5m1p2llRQ==
 -----END CERTIFICATE-----
diff --git a/grpc/client/src/test/resources/ssl/clientCert.pem b/grpc/client/src/test/resources/ssl/clientCert.pem
index c15fb6c17..49aaa60c6 100644
--- a/grpc/client/src/test/resources/ssl/clientCert.pem
+++ b/grpc/client/src/test/resources/ssl/clientCert.pem
@@ -1,29 +1,16 @@
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
diff --git a/grpc/client/src/test/resources/ssl/clientKey.pem b/grpc/client/src/test/resources/ssl/clientKey.pem
index 0c1063efe..b911b9637 100644
--- a/grpc/client/src/test/resources/ssl/clientKey.pem
+++ b/grpc/client/src/test/resources/ssl/clientKey.pem
@@ -1,52 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQCnlXKj52SUzhUf
-APgsi9GLBh8f92A00uMQGYrmTu0lFVdNsV/TFH3CjrltTOkdw6/HFeOMQxXqCT7I
-uqCBYYXHUHriLjfgcWX7JVGEPQs/8pJBFW/6odU4DGxwQzPhM10psYaeO7cc2EZy
-9TbhyGfRAr1BYZMGz5/4ZqcmT9RKyKd8gHfESWV67maJeZcXIeQfNT3y5EGDcfGX
-W2/3Q6lUH5HCDBdhG9KTzCgZnUhG4CoTYNnPNISJeWtwVcCi8a4KlrJ9EnJAGUZG
-yJirrGRx5Ksw11joEwXDUP8IZw8aVVvcoGFoSjdTtYWe05/Nn2y4S+fhKvOAMJA7
-KuX+xZ6EeYOtnJaTcHc9ytAji3MbWKKaO3WR4Js2PsusEeksHe8mwfyBRekMeobo
-BBLhWS1HjWtKSdP9+Os+oyslyUIFmLbhn8klasXrZ2l1pxlumTEEPgfPL6L6wuxF
-s46H1Xh2B0YEi/KskN93nivjeLWZ8yjeEQydPQ8EH2aK6fZq7QBvFk9qPSIwynrQ
-hnRLJU10xkRVqlrEkOJBR3Y9H2Fez/crlUYto+Fz5Ef2sOz7lzJDOHGU6Sb5nZCk
-EkAO5ia4IucVmuUf5wZIvUXRNfRj4XL6LiF2d38ssRPm36wsu4n8vVfL/Lfa9uEU
-plRUqwmw3esgAvsxSnP3/o4jaxTk2QIDAQABAoICAGoJiixjsaTmcT7Y4i9tmP0a
-tn8Hi/xgpAP/5X+s2SjpxAAJB9UL1jdRD8s1KxwGQib6lqydljQr/WoNjJnRF1Dy
-f462J+0AU8MB7f56ka+40QoVgnFYDQ4V7ldqbl1EnuJOzhs5NbgusQT0W/GpWOdL
-kGzaTKm2nkYSzhjT0kQviqqgryeoOWn7hy3dndipPSryCWyzOTDu3CslVEdkrLPp
-9dSOygxMCoYyW/05JA6UsIrqcWdGl8ZU6cJ+wBFaUwGoMPAqx9f/JhSLwO5/el8G
-jbutxzexMahQi87JRykmcaW8ZWYT78YryYyh4y+8fJJwlRxIjSLDl7+YeUcnzBCI
-ltcCIV272HCF+lhYSa76ug2sGAUXdE5G5ANOfMcBu2siRaWlEnLuYdc5XjpphrFr
-XUYZWK+vckQh5bLZ+KvP83tmPn0i2S7WyntD6r1gb2VobSU+92TWyoTB0MeauNpA
-uoiaZHDkdEgc9m702/WAfv5peOnbyys3vHYJSm+d+Xqm+0lMW01tgbxf/kMQ2y5e
-fI/JaHC9nj5+eSQrrLl8OHati4QQ6nV6ZQi3iolag5b2krKh95cihopVvV+6MWsb
-9QhjADQLOHbIm1jypldrDBLNP4gDf4h81Ux6obL+/yenEVXsZtam/3G1gwrjihvC
-K3KYuiwX73tQiHDjt0BxAoIBAQDTUo1QSNpGVwR0f4d32D9kUSS1Wh+6v/tDlmO4
-CIj9LaPIwnctLO9I3xH+YdHADnAiL2+86ymx9dNTlfz/Rci91BKOksRoJIdHngbh
-/Opd2/PYNYE9ZWlo574QfE91UyRqOo786f4ydkygIFXZ0EUL1h4vwnA05TrpiQsU
-0b33c9qruG/kj2yqv7ggeTB1gqHUV5ONLYOx0gJTVmRJ8TesiDjuR+2MhiX0TFz/
-yaqE+BlvK76UCqYA/UoVztQ6s99JxAQDx5FSZS0IaApjS1X0Ug8R8B73pXj/DHgI
-NFFXA4EtcCelPa8rsup6K5B2B/+IZvqDE+he7Pz8atYIkTdDAoIBAQDLA5466roY
-boaKIRv5UXlTNbm9SYqyWuk5q04dLgSnGX101rjDatjP1sTXHDutj2Caxv5wXvt9
-chm4xEU2qleeg55V+QskUrTZI0FxMI9TCJN/dmijteB7SLyaXpbVCwnkoIbv+Z9T
-JKn8Dc0DjeBlTsGBx02fjeA1AMBFvmnKJ8z8pCmi/xx5IJmC4Yb/tkiZs2FzVPKa
-qwaMdluIXQhjjQ5rnanHHHGwTo1XbiIY44D3akcay4Wad15Bos4eZBJ5kkMzJsxe
-LS72BRqrpg2+rswWLYGoWdZ8lKxOCLmhzUm3aKLMyuBE1VyXWaID1dD3Cvg10UcU
-ZeVAyZTGASuzAoIBAQCo4cVrjv1Zz3sQ+0YxIdHvguWaRS8sWPceGZcR4UhRRWMq
-Mzd5E/sbOqKvsE8ndKJqv4xF544H2dSMbUamX4fBJTW7WVG7hM3UD1eizTQj1H84
-n/HsNhqaqvF7TU1XDx4AA1J4jywF+gLcyVqy2r4DapfvRS3VKAj/z/TaK5DsrFrq
-d1h8yZ5nixZEZXWzw7U+9MpHvkMMHjCbl2RIr4z1xlvxGeyfLCoy5cBA71LmNzxk
-WwpQV345NjM54HQ9gbiFxDANMTVTKuZlXHhIyFEmE1pV1Jd7BHQBKF7Y9661omhe
-/s3AQd63RqIbBqvJmDTANsQncwZ2rmCz/VGVwS/vAoIBAQCjuQ5Bq41bKL+d5CfA
-QMGcpqZdjlKplgGi/ZEonTUpYbg4ovYsux2ROD5U0LMcPJYHHNaT3zXorD0sMjUz
-adrxvmnSId+ncn/g4brkQupDZ5Y0ZFTtOj+IjVd1EzWHKLjYxdEs9V5VWiswWBzv
-cdr3OLV8KTRjqbKYbDujw3VjkAeT8/yUNDNNSEolMCaEUQhp1C2SKn7g126Xltgo
-uAaM6nQnu+Xw6vKQ4jjAutQKyGb4oaAobtwXf47nVhnujnwLyTYiqXaFuOC3jdQ9
-e9R35FY4yIhZMeJ1ZB01bXnvkDSUEnHAwRhuyrc6ZBHyD9zPbuxP0rAFNkvVnPw7
-VzRbAoIBAFnytzhO1hSyExdG8XJzZWHwNt48sncq/SGIt3r7wW7x5jigU1agwyLc
-ikaxjItdd1bt8XgGxiqKveKsVZ/Z/ZCdvS9h+l7xPWLRAVesQR3Pugynxz7bMyBo
-3RWbPU2sxIxNEs5mGeqLS7qCOSFj/uX61H8yhjh4Wk15jPC96l+NTAZdTLhO5ko3
-m5xfJyly37Wl3L31F/EBwJDXbciQ73FfPIyYRtVThf0q/Xdt4IRsxpLnL/hC9EMk
-tzGSVVlF/85cBUGjEow4eKpVcGvNUHZefOSSWXKiabZCqMZ6ucUjk29DU4IcLNZr
-51XCua1iLx7dqivIxXwIbraXa7bE4Ew=
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDFxnJbbeSyA0EG
+jY9/hVnEcuP6PqNZVULkHhaHd2X1V1IsgjdPi5ZBs0Kh728gplGGy5ef99seR3z0
+wWIaQLTaQj53RGlZQuqCdGKNsS7l8KzEFhrt2kjQMeQdaNNPaqTa8DDWH7Pv2itG
+JW3AvLi8PgiDqxudr/UDIrz0VEd6r9hIxPdvSOFzFHFZJeYpvzVQnUeM1chbxsSV
+FyNnS8w1CwVaQ5Y5/I3fU1GQz6yrLjZ8qww/KyK2lTPlRDNXGmSbSuibz28M7VW5
+tCXMYrWAFXcuX2SRm3n5SORb9cT2V7JGDWJKxjyXk1OnREk2qnNmSus9gcUgWGzM
+s142+0HhAgMBAAECggEAeZXwg+jhada6SS8KAxmWAEGpihSsE6VpBBjDPPDYS6Yt
+LJO5MTvdWfK8ihVKukXFZRsQ0hVsLgdA+K9SglU5WdzTzjrOkUOkLCMk23sMG+yE
+KeB1GbjSfrvNQ49IKVCknLyBKYI/+rqjU/J6sLzUzVVNorS0u5KLDCx1Abg2YWNW
+6PmVdXQzusZB4NMD1eJOqxK4V0rFtFPkA+MgM74DKcMLz1uPnqZ2335Do6arwppv
+Cffk63lLPbfaHu6dC7wmVZFSluQ8Ic+l+k+nwGvPFdbXTgnp+lUcTFBExZzh4vDC
+yHW1IhCRb30bSd5VlQzv/5UtBXKjBEFXveHyrBZ6AQKBgQD9tu4G9D6SyNLKB5HI
+95EvGkLck/mahGHkiXtLUiDeCBw3KIoHJL7MxpyO3n0yj9WIJV4lcc7kewKcz1SM
+uHcVwbCauseD8XzOvulOQy3Sr7E9cuAoGF6Ep9+hUh6xSdClblej1/1yVLbXhW2O
+9KTyGiHDzGiJ5baT7P2pQ0ci0QKBgQDHjoUMEBSOFXXKMeRl7h2Tp6KQbBACFMnP
+xJpHysMDK5wheqJFmtAm5kgoIZ2fUfAsfU2/Uqbb8ZFYiFck1P6dFNlY0bMzhC3g
+Nu2l/MzWTIw/fwZ15hy6JCEjSEAskdzA+AkfcvBQkf1eL64XX1KSVd/z8g9nvTDJ
+CDY0jStSEQKBgQCyMWG6Fp9AHrYVWP2mRWJ9z5b4LyHWyXWruneS7irRZqbSgrF2
+1PMBBdl9anxKH8VcaspVyDoENPUfx2pdr01MRY5RDjAE1n3PAzz/T6WGXQlB3EXd
+Q0hXKUSim/eckvhsyDPbil6ihycn9bl99wtGUt42E4G0oFb8TC3YTL1QkQKBgQCe
+3sDfZKHop/8ZlPTfjV1wouHSFqX78i7kwQGOrEbq7DolkStFPMYAYg8KHBEPuLz7
+vlo6OgPrUHtFP24ZPZTi26lZg8El/1JCkZhLMGKnLVPubSNok2VFb+QN4cRtd0aH
+PjCNIAVgL4nGBTGVG+dx5vofjRNkpIMFWQtGdSkK8QKBgQCm087/S1bbm4lZv/sP
+HB26w9+gSpyFImU7ZWbsfYHtqbTCYdSru/5nGBHwDjz0uMDDuUo+sL6Vt7bFAArX
+jR/edzXbfQf7boXsbPTx07rXvYkCe/usQsXpXQnf5QYlR5njj0r6fRLPfxygRbNS
+KSdweVzS2u7UrN/NxBqWRPJcSg==
 -----END PRIVATE KEY-----
diff --git a/grpc/client/src/test/resources/ssl/keys.sh b/grpc/client/src/test/resources/ssl/keys.sh
new file mode 100644
index 000000000..5faf6749d
--- /dev/null
+++ b/grpc/client/src/test/resources/ssl/keys.sh
@@ -0,0 +1,49 @@
+#!/bin/bash
+#
+# Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     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.
+#
+
+# ------------------------------------------------------------------------
+# This file was used to generate the keys and certs used for SSL testing.
+# ------------------------------------------------------------------------
+
+# Generate CA key:
+openssl genrsa -des3 -passout pass:1111 -out ca.key 2048
+
+# Generate CA certificate:
+openssl req -passin pass:1111 -new -x509 -days 99999 -key ca.key -out ca.pem -subj "/CN=localhost"
+
+# Generate server key:
+openssl genpkey -out serverKey.pem -algorithm RSA -pkeyopt rsa_keygen_bits:2048
+
+# Generate server signing request
+openssl req -passin pass:1111 -new -key serverKey.pem -out server.csr -subj "/CN=localhost"
+
+# Self-signed server certificate:
+openssl x509 -req -passin pass:1111 -days 99999 -in server.csr -CA ca.pem -CAkey ca.key -set_serial 01 -out serverCert.pem
+
+# Generate client key
+openssl genpkey -out clientKey.pem -algorithm RSA -pkeyopt rsa_keygen_bits:2048
+
+# Generate client signing request:
+openssl req -passin pass:1111 -new -key clientKey.pem -out client.csr -subj "/CN=test"
+
+# Self-signed client certificate:
+openssl x509 -passin pass:1111 -req -days 99999 -in client.csr -CA ca.pem -CAkey ca.key -set_serial 01  -out clientCert.pem
+
+rm ca.key
+rm server.csr
+rm rm client.csr
+
diff --git a/grpc/client/src/test/resources/ssl/serverCert.pem b/grpc/client/src/test/resources/ssl/serverCert.pem
index c81d2dee4..058c630aa 100644
--- a/grpc/client/src/test/resources/ssl/serverCert.pem
+++ b/grpc/client/src/test/resources/ssl/serverCert.pem
@@ -1,29 +1,17 @@
 -----BEGIN CERTIFICATE-----
-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
+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
+nXI=
 -----END CERTIFICATE-----
diff --git a/grpc/client/src/test/resources/ssl/serverKey.pem b/grpc/client/src/test/resources/ssl/serverKey.pem
index 28b09fc23..db5a5ab90 100644
--- a/grpc/client/src/test/resources/ssl/serverKey.pem
+++ b/grpc/client/src/test/resources/ssl/serverKey.pem
@@ -1,52 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-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
-U2AVsEYJOGQvHr0rVQF4Gwp5/GF8xUXW
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDU09otBo1bsNSa
+kO9hzDe3D37mY6i0q0iG3bIhrWb9crvizpIjyOCYuQzmdHCn488c5mEwZUpBA14J
+7OX1HwyQyiA+YtNKrhH6D6lSJyxigt/clmINbLTyTS0HRf2M18SnJLlMb20akUSu
+E9AevQsD/68PEbGJYwNkD8Z/mYsTm8kOXBliMG0EX4vzJy3m/ZywJ4CzISC+VGm3
+0hlUosssmfgtqmYSkE+PlrMT9lpcDec7zshOyd2QnEJdJERCC3EzfUpPAffhiepJ
+rfPwbHBJuOyRH+d/WEQwPP9z+AofsVhIxmgrj943tVMWbLoYSLBWFNPcWFBwNOAo
+SE4PRnilAgMBAAECggEBAKgY6EMV4MKiCVpHzXsOJJdnGtD3uAFzI+a55f8piaX3
+YCUFCXJQL+0Qg/rlzzEcArMN14e1CRAOi9EFFqAjtPYLX6pGviJHGJXMluz3Wdw5
+CH2fHbUCvmx+vmj3RAthRMbLf7u6ao9IW9mudnxAzhmLcoZRcEtWNBBtUVfpO2rw
++DA/0+P3vxrJ3Ky/QHcf/us+zpkJqhRn1yYe+J8VsGZVXHhOInlx8m9XHVCj+IDL
+StA1n5jdIP6LA/Uu5o7fkWapnG7miyR1cUBrGvh0MrT5TnKNynMK0ooFUx5HcEZJ
+hfHxwXMnnTz44kMCDe1BJscN2ElHSaSsfCy6zw0p8qUCgYEA+ZIM1RZe/KtkL4XC
+WWTrfjLk39Fh2RgQoferG/HkKe8bNpJkL1RMr7YLA2E6r8O+mxeU46eok1P9Ela4
+TQawXHv5SwnJTmzjEpnO4v1VMYf6+RGAuRvsgMYZZ1HfOV/7x1jRPQOSq4QVepkL
+zl2ecIJIKQ43CzJhb/nl0QMO6V8CgYEA2k96P5qRqOm0pXTMPe6UjfonPs5ZY8KQ
+YVT9dTAmQgbua13TsbfT7FytDRjtis+GDWOXmUd7r8qvRK1P8zoeZtuDw6S8dR2+
+k/Zf0szYcyjjQkIXmh6ceYwx+vpvbiO5uCYZTePE1fpzMgpkNHzQk+RVpPBnuye1
+X+Jir/fKqHsCgYEA2LjSeeyuWb5ABuCh790qfvGVPSNnVA2IzA31whOhbiTcPdyM
+MWmEGoX8NFgnjWBvUeD9g2AhjKa/ukAiVYk8d2OVDWuXK4p0+b8lIIqbg6Kw978S
+SC0OiJj+kHFRZlKKowbm1JQYtubBfDARR4iWwN7x6O0WMZvzbzjUMFf2iAMCgYBO
+c2cr+iDEAZAAMVPAIb9SsgVuZXrsBZwazg7zEOV+rrz46lPLtpK6iqdJYJ7kViUH
+JLXyyCRjjMOlO17Suhz4u4PDR6zNrW2yAER5HVHfOF9KjTOsF7oFV+MSHPL0MnRn
+/5DyU5qFhqXk4qUV05CkxNYeGqI8OE3Oci0irTovhwKBgQDyh+03r96OXBoS5H3o
+w18ujDZIU/xYdbZXUgBCfAzrjf6uIva046aDVXHqzMsSBm6kY7Xw9vRxJA7E7ckQ
+LO7pbmhlriOBiU6fu7oTmvR+k/E9e9KcbbjoftRG48uGabcGcZffO6neZEz2FH2l
+7ekffuQqdc/26IWzMZyIVpFG+w==
 -----END PRIVATE KEY-----
diff --git a/grpc/server/src/test/resources/ssl/ca.pem b/grpc/server/src/test/resources/ssl/ca.pem
index fe872b835..2bff01a94 100644
--- a/grpc/server/src/test/resources/ssl/ca.pem
+++ b/grpc/server/src/test/resources/ssl/ca.pem
@@ -1,31 +1,17 @@
 -----BEGIN CERTIFICATE-----
-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
+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
+4kF9xnIEJPh0kw==
 -----END CERTIFICATE-----
diff --git a/grpc/server/src/test/resources/ssl/clientCert.pem b/grpc/server/src/test/resources/ssl/clientCert.pem
index c15fb6c17..2af9d5c6a 100644
--- a/grpc/server/src/test/resources/ssl/clientCert.pem
+++ b/grpc/server/src/test/resources/ssl/clientCert.pem
@@ -1,29 +1,16 @@
 -----BEGIN CERTIFICATE-----
-MIIE/DCCAuQCAQEwDQYJKoZIhvcNAQEFBQAwdDELMAkGA1UEBhMCVVMxEzARBgNV
-BAgMCkNhbGlmb3JuaWExFDASBgNVBAcMC1NhbnRhIENsYXJhMQ8wDQYDVQQKDAZP
-cmFjbGUxFTATBgNVBAsMDEhlbGlkb24tZ1JQQzESMBAGA1UEAwwJbG9jYWxob3N0
-MB4XDTE5MDMyODE4NDUzMFoXDTIwMDMyNzE4NDUzMFowFDESMBAGA1UEAwwJbG9j
-YWxob3N0MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAp5Vyo+dklM4V
-HwD4LIvRiwYfH/dgNNLjEBmK5k7tJRVXTbFf0xR9wo65bUzpHcOvxxXjjEMV6gk+
-yLqggWGFx1B64i434HFl+yVRhD0LP/KSQRVv+qHVOAxscEMz4TNdKbGGnju3HNhG
-cvU24chn0QK9QWGTBs+f+GanJk/USsinfIB3xElleu5miXmXFyHkHzU98uRBg3Hx
-l1tv90OpVB+RwgwXYRvSk8woGZ1IRuAqE2DZzzSEiXlrcFXAovGuCpayfRJyQBlG
-RsiYq6xkceSrMNdY6BMFw1D/CGcPGlVb3KBhaEo3U7WFntOfzZ9suEvn4SrzgDCQ
-Oyrl/sWehHmDrZyWk3B3PcrQI4tzG1iimjt1keCbNj7LrBHpLB3vJsH8gUXpDHqG
-6AQS4VktR41rSknT/fjrPqMrJclCBZi24Z/JJWrF62dpdacZbpkxBD4Hzy+i+sLs
-RbOOh9V4dgdGBIvyrJDfd54r43i1mfMo3hEMnT0PBB9miun2au0AbxZPaj0iMMp6
-0IZ0SyVNdMZEVapaxJDiQUd2PR9hXs/3K5VGLaPhc+RH9rDs+5cyQzhxlOkm+Z2Q
-pBJADuYmuCLnFZrlH+cGSL1F0TX0Y+Fy+i4hdnd/LLET5t+sLLuJ/L1Xy/y32vbh
-FKZUVKsJsN3rIAL7MUpz9/6OI2sU5NkCAwEAATANBgkqhkiG9w0BAQUFAAOCAgEA
-YBeVjOWa72wI947ATWsB12SDS1jPXJCh3lzI5q8Zzt1DqJ1VIbPK2z2oIUg1ilQ9
-zY7kafa+8g5qIjjyA1YaL//wH/Eaw8LYqmc2EAWZoBNkRog5pTpY1D6dWtucjVvq
-g8YH+iKM294DDODBM01IqtDTvJPZQpi5x7xkv1JLAA6p4bgsoWNt8M3usHW9MTYW
-ZTTabmQA+6UBbYMq3nIqwY3Golw4U2htI/mj5dkUkeGc43e1ZhVNz80vavlZbB1A
-iBfifnfH6hTf4JYaU+HoxoTCMU72yK//VBLxhqAICjnFKWbwJPe2E+n2b1A6jmqV
-j0AWNEHFC4GFH7W/0IRaENXw7OZTEypxM+LGOXr8dZnn6wmFrdZrcEa0GhLQKQkX
-hNOvWYtXOVSq6DxB+Z7y8B7DB9CLcy2A1g2WXJKjnjMX3EQU0CBn6eatGTKL7nDp
-5SU6IWKfXgowNJM8biFz7T0hSdmYhisN7UOAat8+DOz7CkapHDUFp0WWeg9GqsXi
-En5/tsOqQXY9+aNQ4U9bJ1UT6xUZ3Nznv4nOfJ126jFTG5VAwMU4lhXrCw+AersI
-+ITqOiL8pARlhRIgWqgdO5vhhes2VYoa8Gi155UK9xKa26yochVkyPrO7q1DNLEb
-mpPKfTcMNGazZlx2uSvT65PQRhnnupJijTDD25yZoFQ=
+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
 -----END CERTIFICATE-----
diff --git a/grpc/server/src/test/resources/ssl/clientKey.pem b/grpc/server/src/test/resources/ssl/clientKey.pem
index 0c1063efe..575f1eddd 100644
--- a/grpc/server/src/test/resources/ssl/clientKey.pem
+++ b/grpc/server/src/test/resources/ssl/clientKey.pem
@@ -1,52 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-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
-51XCua1iLx7dqivIxXwIbraXa7bE4Ew=
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDQwqKaCy8Pimoo
+MqIkPVHxYBEKIRGPo6MxkYDGpRtjeRiNtDhAzZ1Co4mfjtLjrqLT2YxPzJRk8+kv
+7i0FivMqtFloEGpZc2Ed2zHEbXbPIxBlTUplL1GuIX/8XDVMfIh3/kTTm9xZ3TVe
+EQdRhCGWLGapzZ1JIv3w1Cn6QLCtzhZqSUd5iLF2aT+zzwJ37D2eDnXmWHh6eoFH
+yrUbNlroAwpLNojlPI+6iAqirQWynnJbae2LG9UvhBiWlWVn3QZuba72uU12F+bO
+AGw4lEn+TYWxG7cB5w5n1IuOdEsbQjwse/BgMnj8fQnbYH2OXWYty5VRtD+Bvw82
+GY+0hqIJAgMBAAECggEAGJTimqr4dqcAywzzRLsnu/lo6D1umPBW1g5hEIL+j58B
+wiXXfeH4Q5GIMg6aTI8Sw0lZmUforV5/NdKg4Ic1DPFBmdxc+X15kQ9vc8bD964U
+TyljujhxMMTnEis1Z3U+iIqbRiOTNc2zbAkrSHD7l3hQ+muouqTxK/t/meUmKMDm
+KsZJXVWi075lEUdDMx+px8HD+yTl0AecOrXxVnjskVS3bTMUZMmqu/WFASxMWPgE
+hb/5siDXkb49h7kA6KM/smmb5ml/fJmrejOTVbkEDe4Ba0AXBDgby5GJvuQG2hPD
+DJN5vim6ielYmyOVp7Db2oU09xJAjq2dv7Q+Mx/NgQKBgQDxN6q/G94Y4G5Lp6Lj
+XKGk5nC4BMCw/T0k3poLumDGjf2ShY9Yt0hIu/SgMCMNZ3i2lKcSMpv0TXBXfX2J
+s5mmNycCZU6Nr/r5kYyHc+nXsb3dagLfbbJkYDi3aYt/8cCzXMQsPmEu2n5AqE40
+PAGsoWXKf22CQqE+9N1KSxMDEQKBgQDdjcPZJ+zfESVr8o0r3ZfcYJV9fpLv9puI
+MHUpz/T11xN5ofELwmdWw6a5WB9uttEGdSvFFTSvIviK/kVzayS+3wY9opZxJj6g
+3/8SZ7O1k6ZnHc/zd7SdK0rXewCN6531vfPdsAzHkuN3ixuMdK0D2DJ07QpGuEsl
+w/j3HDk/eQKBgBvdtXD8dCzliHhe9ldTtSzKnkzz55rKtoyS1rLyJgnqD1gk68lw
+6v3UEM+MoBAFWxGknKRiilevtoG08pK818w25N/G+ksuAE1ifhyLzIDpfKiefZR4
+JLqpzwOJQt9V+0/9MIB3+FwkS5+GkfpA0GS0BIFfNTRuJBiUyxexEpIxAoGAfVT/
+H894LlByzPgvaEs451A0AQQjd2AYaBiRjw+3UYNT3xD/XVmiP/D6VgtF7Mm6wV5z
+XlA6t4Ce/XIOM9a+uMNNsnxRgrzR3QwaLX1Aqk1WayrwQpjLMcYV1oQcsixB9Yx5
+ckVvVU8BItUsxm4SmgQptv+JOqxyxnBwXMo4kHECgYEAoA/4mF7jFbN/a2XFluVn
+MmrH1P4Q3z0IBtWntj0mwBlw5KAh8SsJO4FeyQFctMqvM2W3Qunlity3llbw3Ox6
+ZjGIgGs3ScsmuQ3jJ9khQPWZbwvMteYhlG17x+BhN3upx5DWrCckk6dCPOSmsG6w
+1sptk4f+ma4aAmpMEwANsA4=
 -----END PRIVATE KEY-----
diff --git a/grpc/server/src/test/resources/ssl/keys.sh b/grpc/server/src/test/resources/ssl/keys.sh
new file mode 100644
index 000000000..5faf6749d
--- /dev/null
+++ b/grpc/server/src/test/resources/ssl/keys.sh
@@ -0,0 +1,49 @@
+#!/bin/bash
+#
+# Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     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.
+#
+
+# ------------------------------------------------------------------------
+# This file was used to generate the keys and certs used for SSL testing.
+# ------------------------------------------------------------------------
+
+# Generate CA key:
+openssl genrsa -des3 -passout pass:1111 -out ca.key 2048
+
+# Generate CA certificate:
+openssl req -passin pass:1111 -new -x509 -days 99999 -key ca.key -out ca.pem -subj "/CN=localhost"
+
+# Generate server key:
+openssl genpkey -out serverKey.pem -algorithm RSA -pkeyopt rsa_keygen_bits:2048
+
+# Generate server signing request
+openssl req -passin pass:1111 -new -key serverKey.pem -out server.csr -subj "/CN=localhost"
+
+# Self-signed server certificate:
+openssl x509 -req -passin pass:1111 -days 99999 -in server.csr -CA ca.pem -CAkey ca.key -set_serial 01 -out serverCert.pem
+
+# Generate client key
+openssl genpkey -out clientKey.pem -algorithm RSA -pkeyopt rsa_keygen_bits:2048
+
+# Generate client signing request:
+openssl req -passin pass:1111 -new -key clientKey.pem -out client.csr -subj "/CN=test"
+
+# Self-signed client certificate:
+openssl x509 -passin pass:1111 -req -days 99999 -in client.csr -CA ca.pem -CAkey ca.key -set_serial 01  -out clientCert.pem
+
+rm ca.key
+rm server.csr
+rm rm client.csr
+
diff --git a/grpc/server/src/test/resources/ssl/serverCert.pem b/grpc/server/src/test/resources/ssl/serverCert.pem
index c81d2dee4..b81ca090d 100644
--- a/grpc/server/src/test/resources/ssl/serverCert.pem
+++ b/grpc/server/src/test/resources/ssl/serverCert.pem
@@ -1,29 +1,17 @@
 -----BEGIN CERTIFICATE-----
-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
+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
+3wI=
 -----END CERTIFICATE-----
diff --git a/grpc/server/src/test/resources/ssl/serverKey.pem b/grpc/server/src/test/resources/ssl/serverKey.pem
index 28b09fc23..7ea4708d0 100644
--- a/grpc/server/src/test/resources/ssl/serverKey.pem
+++ b/grpc/server/src/test/resources/ssl/serverKey.pem
@@ -1,52 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-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
-U2AVsEYJOGQvHr0rVQF4Gwp5/GF8xUXW
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCnj3HgZ8zlbQ1k
+DTJS/xC9XE4b6f7uXlyPtZtcEDc+U1oGSKdWW1vQJep52IMwnnGfFwJtNBaSai2G
+hKucxLYCyV3RHsg3Y6WrfDVaba5fX0BldPXGcQEYJfhGHuK7fVtX61KF/DbUSL4/
+kOKxdUcexxVujnrcNXCM9QsX4XhVIJYH20r3OXx69VdjL8dYITDasamAfpgTDNwE
+wlhZSHOMvdLkvzj7PY10mRpdhRkcZSXPG6nAkLUOjcqcdhtrCTUY+qeinutgqhxj
+J+3J2/FhTc+3ZeU1UvPXRcwe2P2mGpLjcG8NZqoWta8PUn72AgbmbUrvDCTiJW0Q
+IxPMAyGdAgMBAAECggEBAJRrCNFe4Czv9YaD8el2KJuyYTV0hO0bBB3/HMflTSmV
+pw4d2KszbRXoH9MhpsKv9bCXLv0PwFacWgrnBSNtUlMRjlonS+1UBHDrKk8ZC/VK
+Z732ZaUKf4+mQk3KGcc8+GXd+VDY4LAUZv/jFAlf+kkWyrMM3WKkqzcP7m2Ot4me
+TZ6FZ4uLmfHzomhSZ2P29OxyyaXtuI1zNmoesmhcL9p1e+xaDZFM89bkGxj4qilP
+MAKUeftDm+AtwLv/HXItNdfHOMYhfeFwyb/KprvOSq8+d1Ped1CVyheXHrSGa7JI
+hsOotlSjsWrMzzVzshnT0yJX79Az/5sx0z6Gn/JUcAECgYEA3vPqPoFSGgQduhsE
+SDscL1p7ALUais+NuAoqLH8mYuqm1RLUWNbDmlw6n/YPrS9TrdAGzYQW6SD5NoXm
+IWrzd9oehiDORAvVbAWr2zVfDeq3vY+TzhsDwq1x4LxB3ipCbIG/GtANr7i9NEih
+I1oGJpyvRJx3C5uR2QqmeptfYgECgYEAwGWgtQhfS2blxxa9OLgt3WvAnwBLvee1
+Rze4h4x89nhiDoIUQB2V7iyg+Ne4cIw+znNuu8MfmTJKKQYCCf58UMgn5qL1mboS
+jAq72zuNKwWUW3l+nxxwXGtYmyI3lX31zE+mOYkccjp8oR2OjB8O1/qYigEar+Fl
+aZiEMvrWB50CgYAbOqbtI1Ynn0ESLaKEP9PdZKuJFpU7RsYEKBmmfZDum8HsW/Rb
+NT+GZqUyTBb2C8WogLOT/gHeTwygwBGvGyTJCnaX4wHOBbP3EWo/x3DofjYajKJ8
+lYgMCqrRy6wvufGK1v3EBIznXSSechBcBO6jYJd3RbS0UjepzkcuyjMIAQKBgBxk
+ItX0GVPgKFI7ucqP6zy8dN1BxuuMMMUEpPdjtOEOHLI1YdWgSAqwjUSLWM1K9M20
+XQfaIGST9judhlmBM0kccD7pl0KLIceGofgVDpzlouHoyNWj9bS9poKmBvvJbacr
+rcTZxdfZZ6DC4tEsmB0o/q+GwDBqG3P8rK11NHZFAoGAMVf8KSYKWjHOI/o1ZE+B
+BnHMe1BNpnZ9jSoF1ymk4hETjqtWFlqDP5Bwj8dd4WHFDdG8VoPAjOD9j8T8KVHL
+0BHW4p0SEQcH8ol/aLwNm0isVvNPRQ5sPLp/J+27T9QlD7/1F5hJgoqZIMSh2TBM
+y7HOd+cgV9GS74IZo8cgBJg=
 -----END PRIVATE KEY-----