You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by sz...@apache.org on 2022/08/22 20:13:07 UTC
[nifi-minifi-cpp] 05/05: MINIFICPP-1913 Fix ConsumeKafka SSL tests with newer OpenSSL versions
This is an automated email from the ASF dual-hosted git repository.
szaszm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 519f80b2ddea27043a8d5d54b7b0721d211f35ed
Author: Gabor Gyimesi <ga...@gmail.com>
AuthorDate: Mon Aug 22 22:02:56 2022 +0200
MINIFICPP-1913 Fix ConsumeKafka SSL tests with newer OpenSSL versions
Closes #1396
Signed-off-by: Marton Szasz <sz...@apache.org>
---
docker/test/integration/features/kafka.feature | 8 +++---
.../conf/certs/broker_kafka-broker_cert-file | 18 -------------
.../conf/certs/broker_kafka-broker_cert-signed | 20 --------------
.../certs/broker_kafka-broker_server.keystore.jks | Bin 3981 -> 0 bytes
.../broker_kafka-broker_server.truststore.jks | Bin 933 -> 0 bytes
.../conf/certs/broker_localhost_cert-file | 17 ------------
.../conf/certs/broker_localhost_cert-signed | 20 --------------
.../certs/broker_localhost_server.keystore.jks | Bin 3978 -> 0 bytes
.../certs/broker_localhost_server.truststore.jks | Bin 933 -> 0 bytes
.../kafka_broker/conf/certs/client_LMN_cert-file | 17 ------------
.../kafka_broker/conf/certs/client_LMN_cert-signed | 20 --------------
.../kafka_broker/conf/certs/client_LMN_client.key | 30 ---------------------
.../conf/certs/client_LMN_client.keystore.jks | Bin 3971 -> 0 bytes
.../kafka_broker/conf/certs/client_LMN_client.pem | 20 --------------
.../kafka_broker/conf/certs/client_LMN_client.req | 17 ------------
.../conf/certs/client_LMN_client.truststore.jks | Bin 933 -> 0 bytes
.../kafka_broker/conf/certs/client_cert.key | 28 +++++++++++++++++++
.../kafka_broker/conf/certs/client_cert.pem | 19 +++++++++++++
.../kafka_broker/conf/certs/server_cert.key | 28 +++++++++++++++++++
.../kafka_broker/conf/certs/server_cert.pem | 19 +++++++++++++
.../kafka_broker/conf/certs/server_keystore.jks | Bin 0 -> 2643 bytes
.../kafka_broker/conf/certs/server_truststore.jks | Bin 0 -> 2135 bytes
.../kafka_broker/conf/client-ssl-java.properties | 7 -----
.../kafka_broker/conf/client-ssl.properties | 14 ----------
.../resources/kafka_broker/conf/server.properties | 6 ++---
docker/test/integration/steps/steps.py | 6 ++---
26 files changed, 103 insertions(+), 211 deletions(-)
diff --git a/docker/test/integration/features/kafka.feature b/docker/test/integration/features/kafka.feature
index 9825b55f0..fb512c88c 100644
--- a/docker/test/integration/features/kafka.feature
+++ b/docker/test/integration/features/kafka.feature
@@ -71,9 +71,9 @@ Feature: Sending data to using Kafka streaming platform using PublishKafka
| PublishKafka | Request Timeout | 10 sec |
| PublishKafka | Message Timeout | 12 sec |
| PublishKafka | Security CA | /tmp/resources/certs/ca-cert |
- | PublishKafka | Security Cert | /tmp/resources/certs/client_LMN_client.pem |
+ | PublishKafka | Security Cert | /tmp/resources/certs/client_cert.pem |
| PublishKafka | Security Pass Phrase | abcdefgh |
- | PublishKafka | Security Private Key | /tmp/resources/certs/client_LMN_client.key |
+ | PublishKafka | Security Private Key | /tmp/resources/certs/client_cert.key |
| PublishKafka | Security Protocol | ssl |
And a PutFile processor with the "Directory" property set to "/tmp/output"
And the "success" relationship of the GetFile processor is connected to the PublishKafka
@@ -126,9 +126,9 @@ Feature: Sending data to using Kafka streaming platform using PublishKafka
| PublishKafka | Request Timeout | 10 sec |
| PublishKafka | Message Timeout | 12 sec |
| PublishKafka | Security CA | /tmp/resources/certs/ca-cert |
- | PublishKafka | Security Cert | /tmp/resources/certs/client_LMN_client.pem |
+ | PublishKafka | Security Cert | /tmp/resources/certs/client_cert.pem |
| PublishKafka | Security Pass Phrase | abcdefgh |
- | PublishKafka | Security Private Key | /tmp/resources/certs/client_LMN_client.key |
+ | PublishKafka | Security Private Key | /tmp/resources/certs/client_cert.key |
| PublishKafka | Security Protocol | sasl_ssl |
| PublishKafka | SASL Mechanism | PLAIN |
| PublishKafka | Username | alice |
diff --git a/docker/test/integration/resources/kafka_broker/conf/certs/broker_kafka-broker_cert-file b/docker/test/integration/resources/kafka_broker/conf/certs/broker_kafka-broker_cert-file
deleted file mode 100644
index 663cca42f..000000000
--- a/docker/test/integration/resources/kafka_broker/conf/certs/broker_kafka-broker_cert-file
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN NEW CERTIFICATE REQUEST-----
-MIICzTCCAbUCAQAwWDELMAkGA1UEBhMCTk4xCzAJBgNVBAgTAk5OMQswCQYDVQQH
-EwJOTjELMAkGA1UEChMCTk4xCzAJBgNVBAsTAk5OMRUwEwYDVQQDEwxrYWZrYS1i
-cm9rZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCM90IcrcqdIAjO
-/MzZaE6unuZZz86XFWH4kZjW6yFpaSysWqN4tkWvpAsFgyiZaVsXj8jw9zU0eD57
-Qsbty+ex9gKvFa+Q7JqRiUb06H8/hgiFyypbV7PCFxCzvqTu4NePRFtvE5MAV/yh
-MNJ5dmvp1Aq2s+FR14rVDN768W3q8Fs30u1sMEU7IEy/43OQUcwQ8T03IheyESVQ
-8etOekJyXnM//p4WoITMH7QxN/AGNxSUZu1/rA+nBkACKW2b03SdHLn+3+CFeqfM
-ChY6LnHIYTjx+M9qAXaWSkt19vbcAtm2aiv/YgVvdvuBz9tNerO61+efMKUf/DDG
-wNwu5PuLAgMBAAGgMDAuBgkqhkiG9w0BCQ4xITAfMB0GA1UdDgQWBBQpWkZxaI+9
-pTExKjSCcG+WkRdo1jANBgkqhkiG9w0BAQsFAAOCAQEAhLmPORoF3olr94Le906R
-F1RAwYZPgc1H10zDPQruJq5ykp+zta15cUvhZ0g1ZeHEZyIcazobeC3dk4EBGwKh
-41l1pY/BM0gY/s55Clk7pzmxmOaDi1xz3cNA7EDxd0tgJZjR/SMFlRhAZfe5bEuU
-hg6VcePE6BVhNqyuvGj5XTkjL2l7iV9etICXZn/RGMgqCT6syK9qu2cpIOKQbva1
-xiaeO42x4DhHB74nagOZa04G8Ck/hhPGtVPkYcMNd4v4Tw0s99hKh9fMEZgjr11x
-RiDmiUbyGQ6tZjfFF77wJSyNVibizn0iRGtCXyoYe5lQzwg+cY4IPJEACfDKFSYM
-FA==
------END NEW CERTIFICATE REQUEST-----
diff --git a/docker/test/integration/resources/kafka_broker/conf/certs/broker_kafka-broker_cert-signed b/docker/test/integration/resources/kafka_broker/conf/certs/broker_kafka-broker_cert-signed
deleted file mode 100644
index 3ca47dd36..000000000
--- a/docker/test/integration/resources/kafka_broker/conf/certs/broker_kafka-broker_cert-signed
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDRzCCAi8CCQCwdBfFbVp5aTANBgkqhkiG9w0BAQUFADBzMQswCQYDVQQGEwJO
-TjELMAkGA1UECAwCTk4xCzAJBgNVBAcMAk5OMQswCQYDVQQKDAJOTjELMAkGA1UE
-CwwCTk4xDjAMBgNVBAMMBU5naGlhMSAwHgYJKoZIhvcNAQkBFhFsZW1pbmhuZ2hp
-YUBOZ2hpYTAeFw0xOTEyMTMxNTAzMzJaFw00NzA0MzAxNTAzMzJaMFgxCzAJBgNV
-BAYTAk5OMQswCQYDVQQIEwJOTjELMAkGA1UEBxMCTk4xCzAJBgNVBAoTAk5OMQsw
-CQYDVQQLEwJOTjEVMBMGA1UEAxMMa2Fma2EtYnJva2VyMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAjPdCHK3KnSAIzvzM2WhOrp7mWc/OlxVh+JGY1ush
-aWksrFqjeLZFr6QLBYMomWlbF4/I8Pc1NHg+e0LG7cvnsfYCrxWvkOyakYlG9Oh/
-P4YIhcsqW1ezwhcQs76k7uDXj0RbbxOTAFf8oTDSeXZr6dQKtrPhUdeK1Qze+vFt
-6vBbN9LtbDBFOyBMv+NzkFHMEPE9NyIXshElUPHrTnpCcl5zP/6eFqCEzB+0MTfw
-BjcUlGbtf6wPpwZAAiltm9N0nRy5/t/ghXqnzAoWOi5xyGE48fjPagF2lkpLdfb2
-3ALZtmor/2IFb3b7gc/bTXqzutfnnzClH/wwxsDcLuT7iwIDAQABMA0GCSqGSIb3
-DQEBBQUAA4IBAQCPqXvGrIlV4Rt+7X19IkSJGmnz7YtAFGCpdh4aA8l5zoo40TKW
-vPHhYJtFiE34pK8weciOzCXZelfhbIslbmJYohgHU8VX8cnYFRnKkiOksvUVKaMC
-msZSgsWvbPy+E/N9wm42KzOG7FzEz4jOQVlZKyvykFjw16m5biI/cIy7anHYjbqH
-Zbbhz36WYltmz0WQYhm0g2KH2uJCfm6pZpabZieCyuzgOkQycxZaQHNiYIsLh8LU
-djLD4bfBIRrj+HUS/eeB6CE3aM9mXIsRiXXd5ruA6wHUfTdkblAfVnUehgczLy1I
-HuMs3Zf/tt1E2B1Ok664q0NaAbKvLFd8EftS
------END CERTIFICATE-----
diff --git a/docker/test/integration/resources/kafka_broker/conf/certs/broker_kafka-broker_server.keystore.jks b/docker/test/integration/resources/kafka_broker/conf/certs/broker_kafka-broker_server.keystore.jks
deleted file mode 100644
index e7284930f..000000000
Binary files a/docker/test/integration/resources/kafka_broker/conf/certs/broker_kafka-broker_server.keystore.jks and /dev/null differ
diff --git a/docker/test/integration/resources/kafka_broker/conf/certs/broker_kafka-broker_server.truststore.jks b/docker/test/integration/resources/kafka_broker/conf/certs/broker_kafka-broker_server.truststore.jks
deleted file mode 100644
index 264500658..000000000
Binary files a/docker/test/integration/resources/kafka_broker/conf/certs/broker_kafka-broker_server.truststore.jks and /dev/null differ
diff --git a/docker/test/integration/resources/kafka_broker/conf/certs/broker_localhost_cert-file b/docker/test/integration/resources/kafka_broker/conf/certs/broker_localhost_cert-file
deleted file mode 100644
index e1baf62a0..000000000
--- a/docker/test/integration/resources/kafka_broker/conf/certs/broker_localhost_cert-file
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN NEW CERTIFICATE REQUEST-----
-MIICyjCCAbICAQAwVTELMAkGA1UEBhMCTk4xCzAJBgNVBAgTAk5OMQswCQYDVQQH
-EwJOTjELMAkGA1UEChMCTk4xCzAJBgNVBAsTAk5OMRIwEAYDVQQDEwlsb2NhbGhv
-c3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvT0NaJwg2M3UCIi1s
-xetBkFVKDjHnTd3bsUeOMPG31y0P7MTVxPjYkX7Jgk33IH3xyZStitiMm3of3lfr
-/Me0lbJ3OYwZB+pOBg4Ly7SQXGjXYIF3BI4VDvkYv5iTF4fOsTk5dN5Xsgss3XtY
-lONHCGk+NWbdwk9+/dFArVcXiE/fGm3qe2a4jijRm/75MKWpXSDmlyXj/EkxSPD0
-SN0mmR3irKdUxhvZeBk70DztLp/TQZZVYmSB7u8OJ+FRHji1kFAn9sFypf4ipDt7
-zMW/P9GzI7a18bNbfBXtBXajC1vrhHJapxOfen6cCNaahHJmb12bQDHc+xYKUkR6
-UU4fAgMBAAGgMDAuBgkqhkiG9w0BCQ4xITAfMB0GA1UdDgQWBBTtvxK6nA1N6cJs
-lbsi0j/m6eyMpzANBgkqhkiG9w0BAQsFAAOCAQEAJf506p6hsgH7sBVG7P6DYroH
-EaWB2e+ug2sHYeALvcYrUdT+Fn0p/ZxZHJdXa8l3k9R9qOxvspaG/G4tl6MJQJGa
-3tBtwJ2HveZF4LttWhcpZW1L1zpItSWs7y/wG2iw+AO6uShBIi6ndTP8jTmq6sbE
-UyktvBoAdinpxn3wGODVX1/UgNt70zSkTtdnFFAexVoTY2hQ1FNYiuztul7bYBN+
-DpMYFZ3xXK1Q9lhTkfBQp3zoxrDhOCBluovHzCsiXKzMEx9HXkIAoiTlkr+TuwxG
-agq2OIXJ0s/JVXpH5bX8F05n+Fg1Bk4Yddch645YcmZfGAUn49prup6YdNWEMw==
------END NEW CERTIFICATE REQUEST-----
diff --git a/docker/test/integration/resources/kafka_broker/conf/certs/broker_localhost_cert-signed b/docker/test/integration/resources/kafka_broker/conf/certs/broker_localhost_cert-signed
deleted file mode 100644
index 5fab447d9..000000000
--- a/docker/test/integration/resources/kafka_broker/conf/certs/broker_localhost_cert-signed
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDRDCCAiwCCQCwdBfFbVp5ZTANBgkqhkiG9w0BAQUFADBzMQswCQYDVQQGEwJO
-TjELMAkGA1UECAwCTk4xCzAJBgNVBAcMAk5OMQswCQYDVQQKDAJOTjELMAkGA1UE
-CwwCTk4xDjAMBgNVBAMMBU5naGlhMSAwHgYJKoZIhvcNAQkBFhFsZW1pbmhuZ2hp
-YUBOZ2hpYTAeFw0xOTExMjYxMjMwMTJaFw00NzA0MTMxMjMwMTJaMFUxCzAJBgNV
-BAYTAk5OMQswCQYDVQQIEwJOTjELMAkGA1UEBxMCTk4xCzAJBgNVBAoTAk5OMQsw
-CQYDVQQLEwJOTjESMBAGA1UEAxMJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAr09DWicINjN1AiItbMXrQZBVSg4x503d27FHjjDxt9ct
-D+zE1cT42JF+yYJN9yB98cmUrYrYjJt6H95X6/zHtJWydzmMGQfqTgYOC8u0kFxo
-12CBdwSOFQ75GL+YkxeHzrE5OXTeV7ILLN17WJTjRwhpPjVm3cJPfv3RQK1XF4hP
-3xpt6ntmuI4o0Zv++TClqV0g5pcl4/xJMUjw9EjdJpkd4qynVMYb2XgZO9A87S6f
-00GWVWJkge7vDifhUR44tZBQJ/bBcqX+IqQ7e8zFvz/RsyO2tfGzW3wV7QV2owtb
-64RyWqcTn3p+nAjWmoRyZm9dm0Ax3PsWClJEelFOHwIDAQABMA0GCSqGSIb3DQEB
-BQUAA4IBAQBP+Xf8gEC+jtDwRCnv8PutvJbeHM0x7usT7itTQbmZuSprHF55zk6b
-EDxpYc9ey2mssenRS7RCgm19+nAM/D3M47pD0QxTVkHgW0Wv0vZotjXp1jcENNW7
-GwyenDgrtrZqFnl0+b3xYtj1jcC4W/pCeQLXrag6LMHK7C5cX1f6vCONxipPwNRy
-HVaWFR6hULXTHYZ1zuGVbL4QQCUURUrytIRLL8Hns4Glya7L1Hxkl1oer/J7cm7w
-F+Q4fhPgmQtC8zLh4XZVQ4fclFk4EqHLdioh4fi5TRoWbcrHl144H1dTGEOKjHfo
-k/5yivmWTwNOAZryhKn+4M2BJOFHF8xz
------END CERTIFICATE-----
diff --git a/docker/test/integration/resources/kafka_broker/conf/certs/broker_localhost_server.keystore.jks b/docker/test/integration/resources/kafka_broker/conf/certs/broker_localhost_server.keystore.jks
deleted file mode 100644
index dc15f5def..000000000
Binary files a/docker/test/integration/resources/kafka_broker/conf/certs/broker_localhost_server.keystore.jks and /dev/null differ
diff --git a/docker/test/integration/resources/kafka_broker/conf/certs/broker_localhost_server.truststore.jks b/docker/test/integration/resources/kafka_broker/conf/certs/broker_localhost_server.truststore.jks
deleted file mode 100644
index b54a9e9e0..000000000
Binary files a/docker/test/integration/resources/kafka_broker/conf/certs/broker_localhost_server.truststore.jks and /dev/null differ
diff --git a/docker/test/integration/resources/kafka_broker/conf/certs/client_LMN_cert-file b/docker/test/integration/resources/kafka_broker/conf/certs/client_LMN_cert-file
deleted file mode 100644
index ba10df1d4..000000000
--- a/docker/test/integration/resources/kafka_broker/conf/certs/client_LMN_cert-file
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN NEW CERTIFICATE REQUEST-----
-MIICxDCCAawCAQAwTzELMAkGA1UEBhMCTk4xCzAJBgNVBAgTAk5OMQswCQYDVQQH
-EwJOTjELMAkGA1UEChMCTk4xCzAJBgNVBAsTAk5OMQwwCgYDVQQDEwNMTU4wggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCWgW4KeS/27ZZNBitvuid3lGoA
-3Solx4xdykmqe1hQGFkAt6hEdvEhFqfyMpC/uZeeZNaJNVFeT8kE6Hr6jyEqMUru
-7OA6mOwRAwB22W78YPhkWvYka1yhuyIB2xGePsbjTPNZHBIuDGJGjfzrzfmzveeX
-NOOwUTOyykgDWksJn05H6MmROI7qUxijg//gNfIuhYI+gaNuz1qgCka72/QTYLZx
-MxgjgNeS2bL/RGxmBBYaHBqPQ3MLyWG1MpLhG1kOBqbwmZPvceBZFHizeWe0vVbV
-/p4ztlUNd3txC4OnFp907AqwF2USqBNLkepdILlqZxJcMfseikOpR9+Q90xnAgMB
-AAGgMDAuBgkqhkiG9w0BCQ4xITAfMB0GA1UdDgQWBBT5IGAkhj6drjx2a1a1g+XZ
-snpX2zANBgkqhkiG9w0BAQsFAAOCAQEAKdudV5dk5IA62yZdUNhS8koI1qSncclw
-2Mh3zfRiT/bDnBGmomkGvNoyx+zFgI3JbA0SihWOy3RfNZRIX5YdRI+samWU0iu0
-Y4WImSVgJelhn75V6cZfAhIsfNpLSmiX3Katd9JON58FWEm9brdmV9TtLVqxhf4h
-26B+6lwVOpdJumpw+i5+3ODF9knClQEkg6t/AeijiXYZkYpqoHTS4ICPaPdn3uUw
-snvP0eQGvUfORugOoeXF9yIYbtMmDKPGwvg6OdffRWPp8l+SqLD3abUrbTIgqMX9
-fr4hixcmwIwuovSvVgX9hQBVc8vTuvNIpAmsnw9O02g89/0N17AheQ==
------END NEW CERTIFICATE REQUEST-----
diff --git a/docker/test/integration/resources/kafka_broker/conf/certs/client_LMN_cert-signed b/docker/test/integration/resources/kafka_broker/conf/certs/client_LMN_cert-signed
deleted file mode 100644
index 1fad2c680..000000000
--- a/docker/test/integration/resources/kafka_broker/conf/certs/client_LMN_cert-signed
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDPjCCAiYCCQCwdBfFbVp5YzANBgkqhkiG9w0BAQUFADBzMQswCQYDVQQGEwJO
-TjELMAkGA1UECAwCTk4xCzAJBgNVBAcMAk5OMQswCQYDVQQKDAJOTjELMAkGA1UE
-CwwCTk4xDjAMBgNVBAMMBU5naGlhMSAwHgYJKoZIhvcNAQkBFhFsZW1pbmhuZ2hp
-YUBOZ2hpYTAeFw0xOTExMjAxMzExMTNaFw00NzA0MDcxMzExMTNaME8xCzAJBgNV
-BAYTAk5OMQswCQYDVQQIEwJOTjELMAkGA1UEBxMCTk4xCzAJBgNVBAoTAk5OMQsw
-CQYDVQQLEwJOTjEMMAoGA1UEAxMDTE1OMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAloFuCnkv9u2WTQYrb7ond5RqAN0qJceMXcpJqntYUBhZALeoRHbx
-IRan8jKQv7mXnmTWiTVRXk/JBOh6+o8hKjFK7uzgOpjsEQMAdtlu/GD4ZFr2JGtc
-obsiAdsRnj7G40zzWRwSLgxiRo386835s73nlzTjsFEzsspIA1pLCZ9OR+jJkTiO
-6lMYo4P/4DXyLoWCPoGjbs9aoApGu9v0E2C2cTMYI4DXktmy/0RsZgQWGhwaj0Nz
-C8lhtTKS4RtZDgam8JmT73HgWRR4s3lntL1W1f6eM7ZVDXd7cQuDpxafdOwKsBdl
-EqgTS5HqXSC5amcSXDH7HopDqUffkPdMZwIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQAyHq8xcPyfW+WACdWLjCHzJf9D92JwTNdQotMJMqxHw86OoSGvTnc7KeoeWdbt
-xlDaBWvLsV2M6DAjAvYgYHk0KG+EFU1xVTAe8+lOWWR+8a9CMDKq6IuwRywHnnEJ
-n9+YTI9cuJcGhYj9HFqXM4imR6rM1++tHjrLkiWqvtP9KWEK431xj27lhhcuOd2J
-RAn3xvapn55A2awAzDYzpq8VvG02JGetevDEwAQYfyZ+9i97+5GobGjfhVbt32TE
-R/yrVOzYACYhaZeUz5l0E9cChj+XDQxFIAtNYJpIzgxVCCr0ZMIyM66CD8Ii8h2B
-BRN6vYHUHccMh+B+7B7iZD4m
------END CERTIFICATE-----
diff --git a/docker/test/integration/resources/kafka_broker/conf/certs/client_LMN_client.key b/docker/test/integration/resources/kafka_broker/conf/certs/client_LMN_client.key
deleted file mode 100644
index ed0b49033..000000000
--- a/docker/test/integration/resources/kafka_broker/conf/certs/client_LMN_client.key
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,F0F92F59DA33CB2A
-
-Ytg3vlVSrBnqhz/x5HymCPeEpPY3fXQ56aw6wDjE71SKOoDLJWWbt3WVIEr9VOBQ
-1AcPBzJCJZJ2+qWV45/QoYnOWf+RO3WvVwcKBlCcCksSb1oCVZ+7fMlkEGFuppWi
-/EWBft71Uv0bCP3B6VAknOaKT5IYWW3aW6l5varYKaFL3+fK4U9ohK5ZbvEHQ7eg
-IfEt+jSlRwSxsfRLA45fLjlTSZqErg01rbiLdKZfOwOSvKXAYxTWTneWO57uQYS+
-VPwrkmKW4cn3IY73MskSpYpsqP7Hl7DhpMQCE0MeRw+x0rgeN7El9HtpXquqsOj1
-zYaju5WfmkkzY7VVZYsgJJABzCh179tTLBI/UxlOZuHKhYJPGndy3txkTvetD4go
-x0XJhujxZ0dAgysUwgCFKR+452WJafm8c5iTrwPIzQ4Zm3/KzTk65++06dq9EvY/
-4XydnElYw2qBuVYT6L293N+TfJ448k3jukkOznJyKHXf1VovPestpeGy5XYv9wWC
-dpzurMB8elpjVJ9aH8N7OV1+uOgMpnVMK6GSgFpxGM1sRWiC/svjmpXmQpkgw9/H
-RN1gJA6zkflutjUmnzVHUY3TOErrwTBeMMRP0hiSC3X1NdyL+8hB6cZumD/B2KQs
-tJTlV2Eld41iDcwvzqkLS6jOH3AR6pA3HFg1Gse3IqwBqfiEP6cm/VE4OF5YKuSS
-gxakGN8zibx+Hwtk7st7CoB8UxxVnsWZY90gY0kuXCXVIbqGmJAQMGwcGqm7q71x
-gOdifWd+j7LBtNbOizd4M9jfK+OHzPIr0RPAFN75jclh+IYNMQK30mGWZtnb4Elj
-kaj2t8AhTodwSxQU+cI8yML72ewIamtcl/4FiB4jg6KkEqOY8Asxiat4SD+tXKzk
-8GXJoa/qZ2Br4+zNOqmT8T7CfrP08l+WtCcRW1W2vhbhYzksU38eVWKoLpfytRgC
-t8Pthwcb5uS/rN/wzqIZ67uQFb/FMRe487MgMhJ0bHxfV1UslLKUr/q1CBUoi+Tw
-V9zWLGX4fy9SmmT9S1a1INMIphw9YZS1oiQk544tROF9WbxL6d+iMdO3lxzNdpGY
-8Dzj2rr7wLYSU2LM87JJhNvz5diQNvrikYadSXVOMPQ8AWSCZb8YrRnRkLMar5TB
-gH1+2cR2oN1nhbXeUPpybdeQwththikRD2mZ3kAZ7vbMcnqJt9uM32TmI2UIapiR
-Vzt+TGEoOiLGrqMBHe1zUNtZKPCi1e72zd9kTInLgZoJPoJ37MU1mI4lW5qHOD7l
-J6dP+gYjSdXnxpr1ZbrJzqxDdMsvhh6cYUaXjfgfI7FrImfsdOMBOlH+5n15XMXr
-K9pqiS8UTz/a6UyX5z/LMiKIXKBkPYkhdE9FezSkZ5ieFr2smu2CgYDx8V7gmp42
-o0wT5DmAuj4gY2JEQnol6TwHQhUC99MZOC8e6F7dYTda2AfQpiEb66GCPSoKhzVn
-xLTwgYxfCgEro281kgOan80w0OqF1lMLvRRSMfvumM3wAyP8en5pu9X1giCNgjQV
-2X5sGkiLT0Ckw1UHr0932+5/3uCJCldEubAfsGYCN17pQQFiZzI7hA==
------END RSA PRIVATE KEY-----
diff --git a/docker/test/integration/resources/kafka_broker/conf/certs/client_LMN_client.keystore.jks b/docker/test/integration/resources/kafka_broker/conf/certs/client_LMN_client.keystore.jks
deleted file mode 100644
index f39edf4f0..000000000
Binary files a/docker/test/integration/resources/kafka_broker/conf/certs/client_LMN_client.keystore.jks and /dev/null differ
diff --git a/docker/test/integration/resources/kafka_broker/conf/certs/client_LMN_client.pem b/docker/test/integration/resources/kafka_broker/conf/certs/client_LMN_client.pem
deleted file mode 100644
index 92c6ae529..000000000
--- a/docker/test/integration/resources/kafka_broker/conf/certs/client_LMN_client.pem
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDPjCCAiYCCQCwdBfFbVp5YjANBgkqhkiG9w0BAQUFADBzMQswCQYDVQQGEwJO
-TjELMAkGA1UECAwCTk4xCzAJBgNVBAcMAk5OMQswCQYDVQQKDAJOTjELMAkGA1UE
-CwwCTk4xDjAMBgNVBAMMBU5naGlhMSAwHgYJKoZIhvcNAQkBFhFsZW1pbmhuZ2hp
-YUBOZ2hpYTAeFw0xOTExMjAxMjU0MzNaFw00NzA0MDcxMjU0MzNaME8xCzAJBgNV
-BAYTAk5OMQswCQYDVQQIDAJOTjELMAkGA1UEBwwCTk4xCzAJBgNVBAoMAk5OMQsw
-CQYDVQQLDAJOTjEMMAoGA1UEAwwDTE1OMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEA/EwAPj3UOb9gQDR+9/teK0+C27j0pfrd0G14kB24k+lQRl2cykjJ
-mbTkfWT8P9/8re0+EfM7IXNInqrTjwHFjZZihODqGz/5f9dLJyncsKBFjUYkz9so
-taL8xO5JT017DqS4KGilwF5aJuLzWCsJn4TQnqyeynG27toKqw8QQmQDRe/fN7Qj
-gSrpKIwHq/aD8BuJYKFCdcr1Jl+0GoT5Gobpm0Z5n6yp2MR+ElW7qUf3BvxRZ8uY
-JFWPaokYWDgXDjYWAT+xA8ZD5YBDOfF/DrsYxdEEotJUyc6A/S3o+liw7hwWffqh
-dx92RpJzU8IGCjh8SFk7vp9JRSWRsOIhgQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQB4I/7F6Wef3fL+a4gflayGJ1MZulXhWbxRqsKak2KPEQP+t3I5LOqmwl+d5dyz
-KoyHvlc4npIhuGTo0gY1M0iSAkID/+qJ9z7hSIwjCOzZFpZqqdKfZQneghQpo2dm
-3u1j6kG4xmDPbUcppEO10bqZRKJQghH6vcessws8Iq9E2Xwyb8cSUuSEOn2KX29A
-LDhsPHMufLu9SZTXLR09GbsdMDnotwY00UjsALbTiEoa+Zu090frRKT558s7TDGN
-5HW5Jap/sSI5J+PKgA0PWZmQgvZ3gwO3POvTA90NmfHLtW7SYM0WDpbJOC08Jm9+
-/bSUo6rjwrZqC7W3Uv83mryf
------END CERTIFICATE-----
diff --git a/docker/test/integration/resources/kafka_broker/conf/certs/client_LMN_client.req b/docker/test/integration/resources/kafka_broker/conf/certs/client_LMN_client.req
deleted file mode 100644
index 5ba3b9164..000000000
--- a/docker/test/integration/resources/kafka_broker/conf/certs/client_LMN_client.req
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIICrTCCAZUCAQAwTzELMAkGA1UEBhMCTk4xCzAJBgNVBAgMAk5OMQswCQYDVQQH
-DAJOTjELMAkGA1UECgwCTk4xCzAJBgNVBAsMAk5OMQwwCgYDVQQDDANMTU4wggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD8TAA+PdQ5v2BANH73+14rT4Lb
-uPSl+t3QbXiQHbiT6VBGXZzKSMmZtOR9ZPw/3/yt7T4R8zshc0ieqtOPAcWNlmKE
-4OobP/l/10snKdywoEWNRiTP2yi1ovzE7klPTXsOpLgoaKXAXlom4vNYKwmfhNCe
-rJ7Kcbbu2gqrDxBCZANF7983tCOBKukojAer9oPwG4lgoUJ1yvUmX7QahPkahumb
-RnmfrKnYxH4SVbupR/cG/FFny5gkVY9qiRhYOBcONhYBP7EDxkPlgEM58X8OuxjF
-0QSi0lTJzoD9Lej6WLDuHBZ9+qF3H3ZGknNTwgYKOHxIWTu+n0lFJZGw4iGBAgMB
-AAGgGTAXBgkqhkiG9w0BCQcxCgwIYWJjZGVmZ2gwDQYJKoZIhvcNAQELBQADggEB
-AAs5FzufAfDl5FcxJjcjcBSmB+yQzmHyWPJ6T8XNwjQ+PwTV1o8iM42TjRX2cjZw
-CQeRJh2FNEuxFDbzNQ1AZ1omsbaDewEvwthqEj8SMXGpC+VHxJXTjtGB5nrUlsm/
-tosLrKE4Xn8HTgiHtOLaziAdCsyK0kVbvmCYfB/gEZa7R48KST7DMVAX9mkmY4CB
-5E2Jn14tQlrgHzw/XH1fjRlJul+I6XLOeoY5LlKkA7dF0jgwbTZIlXAXjQIgPzz5
-o4rPawsozcHaJRisZeIRaJg6tCKMx2pNxldyQ5qct5AjGmy7D12xHY3upuzUPqwa
-qkvc2sqtEQaWWQrefTbAZuA=
------END CERTIFICATE REQUEST-----
diff --git a/docker/test/integration/resources/kafka_broker/conf/certs/client_LMN_client.truststore.jks b/docker/test/integration/resources/kafka_broker/conf/certs/client_LMN_client.truststore.jks
deleted file mode 100644
index bd71ba04f..000000000
Binary files a/docker/test/integration/resources/kafka_broker/conf/certs/client_LMN_client.truststore.jks and /dev/null differ
diff --git a/docker/test/integration/resources/kafka_broker/conf/certs/client_cert.key b/docker/test/integration/resources/kafka_broker/conf/certs/client_cert.key
new file mode 100644
index 000000000..cd2613613
--- /dev/null
+++ b/docker/test/integration/resources/kafka_broker/conf/certs/client_cert.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCvyFiPYJvayOq7
+Y2aFFyQIKNUTK7VFK15rzEATl5aSvQbLOmNK2jeD3qKlC2E5wc/EpggZOfo16n6l
+Nf4rBp9RSaVnnMVeAzqhhS7Wr2W/UUX+NKXs6r05ROLQMmQpIq6O4UZI51oXJIEL
+i8Nw8ZY5MpMesWBYPQjJK3GgtuFh/W/O1l51y4gmKyDO+TyPp16tVIgUvkm3dVAh
+VXKoNG4y53uvQ0u3S9vWaghg4eRD9ouRxOfvpzWht1XcgLABU0R1vCYDHYxW40to
+SD+hSI2gSLPiYEeYw88XzQcApl6DhSUBQ+No59Ieag6Fv5xPL6X43f1HMloosVOe
+Jbxv/w2VAgMBAAECggEAAUfe6VCFYi8zkqDzRsX3471UbBrV68aYngVzdBEXLkOF
+UKbAwXNcky/klHpEP5T7bA3fojtraMgoGxENJIgcUg3M0DfysjAo1bNwN204uw+f
+CG6exN6i+U9YrbaoRypzBiR7DB3vaJrB+/ENP/3qn8kQDFmzf4EWVszju42Jj9qz
+RKXKaUubRXSgH+mwb7F2jHi6WXOg1L8Tb6lnXYwH7UDHimi2RkM49sT9QuvRf4Sv
+R+iDnOkLK+BlQ685uBZiagp4sx9CtMXnD3vmwHuxqqyrA1d6Lei4AZ9Mii7rs25X
+JP6EXMs8K26Sl2LN7QprOoRcN1xIYcbJdNDbB34gUQKBgQDg3hjX4uiKWzDMGHA1
+WzbTZm8BgiFymiuZsq+Pr5pVovAw53IRF328sPYWLSF49yRSesjIsPB1NZGW3XRF
+//fEp5ak/wUEA0cmjJbQbzWhdWWsptU9rk6FIbNRRPa2avB+dBQPGDUlHYSG7t/n
+skXXWPlUGw3Daa/t+lA1cucGqQKBgQDIHowrp4SY98y3m4+K4wCh1EkSrFvRSMOV
+VUSQs8PthSIGUs5zMvkoiGSmY2yPCj5cJ/uTFrBGOoUZ06C0W+g7OKDzsluj60Zz
+/12sG5Xsxi8Ou66uB//sOX0TB00SVBGHAj5hr4o3xUG7FGIVvBeAYnWOyLExHlhk
+gzs0xlNfDQKBgQClILNhpZFaOIjm93M+21KxfuE5XFQvkiM+ZMcjXrKY/GQhpXRQ
+NM3yyIiN1GpmKCaWIvBa4ARULhhRjyIZXVSXJvIrC9KlFbskBc2iFmhtvoYBeSnS
+d7PVc9/4aAo7/t/IHHm2c/Ji5QAzDiuCO5mp//5n0s4SmAPHYC+ScGRSsQKBgDP+
+E8bnwACKKQrvBK096xUgdVe/ph9Ku13aCHVb7ySPuVZRP0gYzzkjrpq4LCVBsQ/6
+Z1dAxs2IOLqMDC2vzzdLsC2AgmSlJOnQSAMGK76XgvRd+LVIaMpz6TX/aJvBcchU
+4eY5WDzDKB+13QHum2CEtCxDoh2z151Npx1ABbslAoGBAL286PjyATiRtEvf+klS
+o7jMkO7ww1zmR0cYcK+SDDCkiD7eTPLOyFSfk01Yvm+xuDSIcaQVipB6l8oHk18i
+IMUbaIXdjxjv29EHffUsJTRmDk1w/6HQfAqGNNpj3oeZDady7HDqqkGWXWKxI7yo
+NOJXFARfQ8yC/z+YxF7wptYZ
+-----END PRIVATE KEY-----
diff --git a/docker/test/integration/resources/kafka_broker/conf/certs/client_cert.pem b/docker/test/integration/resources/kafka_broker/conf/certs/client_cert.pem
new file mode 100644
index 000000000..d7b438233
--- /dev/null
+++ b/docker/test/integration/resources/kafka_broker/conf/certs/client_cert.pem
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDEzCCAfsCFC1rL3aQfqwrv4UcotoV7y7UrfXNMA0GCSqGSIb3DQEBCwUAMHMx
+CzAJBgNVBAYTAk5OMQswCQYDVQQIDAJOTjELMAkGA1UEBwwCTk4xCzAJBgNVBAoM
+Ak5OMQswCQYDVQQLDAJOTjEOMAwGA1UEAwwFTmdoaWExIDAeBgkqhkiG9w0BCQEW
+EWxlbWluaG5naGlhQE5naGlhMCAXDTIyMDgxODE0MTA0NloYDzMwMjExMjE5MTQx
+MDQ2WjAXMRUwEwYDVQQDDAxrYWZrYS1jbGllbnQwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQCvyFiPYJvayOq7Y2aFFyQIKNUTK7VFK15rzEATl5aSvQbL
+OmNK2jeD3qKlC2E5wc/EpggZOfo16n6lNf4rBp9RSaVnnMVeAzqhhS7Wr2W/UUX+
+NKXs6r05ROLQMmQpIq6O4UZI51oXJIELi8Nw8ZY5MpMesWBYPQjJK3GgtuFh/W/O
+1l51y4gmKyDO+TyPp16tVIgUvkm3dVAhVXKoNG4y53uvQ0u3S9vWaghg4eRD9ouR
+xOfvpzWht1XcgLABU0R1vCYDHYxW40toSD+hSI2gSLPiYEeYw88XzQcApl6DhSUB
+Q+No59Ieag6Fv5xPL6X43f1HMloosVOeJbxv/w2VAgMBAAEwDQYJKoZIhvcNAQEL
+BQADggEBAB5XS9mMiZ3/JtdpdXnFparqdJ/6ZstNHCB6wIKRhtMA+Kmdab3gQb5w
+UTpBxSJjyBHZKbrytzwJ+Hvlj2daOEDWSar7oE5gdZdxRfFUTxLJucKLptrkDjI3
+GirYq7/q7bP/d4hl/WaDsAIlSB3B4pbAzwwLVbBZysIFLjVFGhTFDf7Ko7JjGIbF
+4ZRLkJ3y1HEI/1lL1L9zw4rFOIRoNOp6lLoLaVeyWTSNl2+pA9iXwxCd2OLM/yEI
+p/qE449uebbVlhEPt6cuvUyAzz4vxsVLDvocifeTbkOjYQHOFBWIjwpGVwH+kS1I
+O6WclYAq3N/uYLZ6J4YG9o/P8pCbs+o=
+-----END CERTIFICATE-----
diff --git a/docker/test/integration/resources/kafka_broker/conf/certs/server_cert.key b/docker/test/integration/resources/kafka_broker/conf/certs/server_cert.key
new file mode 100644
index 000000000..7fea0e83d
--- /dev/null
+++ b/docker/test/integration/resources/kafka_broker/conf/certs/server_cert.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDOYfl9K7m4cB+O
+fk/3XnofnN9rc50plLGz8PCB8WL50Lk6ur9whqJ98sJBqINzPYIVL+p1xyWsMW2C
+QRpn1uYMYcTvRUJ5afPBafow/wuekZVdL5LubkDzR+Cx/eSLe0kJ/cyp/YmkIWvh
+8VoVlMkQ1DvZNKFpyhSiQ8aOhDxqjK6HswmDjnpdz4nQ5SEIUtKaSrgZnEwMr8o5
+MXoEEyrHyBVEAU9JFeQcALP9bCLo4BCJ308pbXoK3JKVmTeRFGSt1yx2f+SgzWc8
+SdKaOns+toF9g+iufxxPNeCiUfK1ZOrluIB7W6/LbafXOpzOen9U0KQVJP6/vLrR
+2qHDSprNAgMBAAECggEALwaKB6hv8AO0XQ6RAAeKAiwHiH9Wf0P/XcX3t1QePlf9
+7NDikCxNWC95beaM1TRdsKAzZ1TSU7MLhdN5xdFkp8ubSP3aELpArYCNXp6ushnw
+E8SkUSnUKNrm6we0DMgxs1IeUVmRBFINN/V7llFJo0kIvgxM/0LpgrO4yX5+GbS9
+v1U4FhvWQrZEBXi+0bnYAHHehbW0qVe94R7GY+AdrxWH8DxJjxiYLy7HdTrjCgiL
+VXbWIMkq4FDsmwkAnlaFPsrowGuqkIjmzEZysbkqf/hzvGXDQHzhfuzhZjbGdW8N
+BX+A8lt3mZMdJqqr2aUDofhg88mhR1Lg7SR9h2NjIQKBgQDtBZfIlTNmWmSe61y0
+jJMHlJCAViyjEnkZWXQ2ZQw53XGH/AF6HxXC2W5Upq0tjsS0l0qrcaTnDFNBj9eT
+7JEkOZzojQ6hfXE1Q1T8SLNTljub9hQkwPQvoqJs0VCECUyWS2gAMS9nFWL2T0KM
+7iyo6JzQN73Hy9Sz3uoQF9/NhQKBgQDe6Flsy4WjdWTe3dbvUAFjRDvfahTqHvHX
+AL74P5T/XRvAC9/HQRtiA43IwKJBibQiKFbCaSjW2yf6gFH0+0FPEmNzfvEDkUqv
+rksaPK8lcb4WA0DvnylYcJo8ThRl+h9RLo9owSPVSPJ1KAnZC/P8MIJuQQebDYzJ
+WluVL6CWqQKBgEowAvc8hA8YYgBACQ9WJLstrCEPV/9ey9q8XhycejwubNe0cD3q
+NuR7LAaA+RmWY0lnRW7uLkBHYlPWExLw6+kbw1oitJ6lZebXAWXJ159lGZlSZ7Gt
+V4EFdbN7vKjnRDqStaXBv2WTkxsnadw0vHPOAy9FEzjTOutl7XtGDb4FAoGADV0O
+p2gYLfGGx5mzHgvE2Yeosz8v281ZIFOqH0Xoj9qsJDpSAycTFjAyWtu5noY752RV
+tzgIu8DNx8XTpAVAKBZpIe51UopuWNPxKrSCp5MHG1i8luEK4IN3q6/epzJ0mDBb
+ZqNVm57Q8lchKAMAcJkT6Lo7U39fdl7VaL8/OGkCgYBedkOtab0TyKU5AlFjP1Dq
+vfoRQD95S/cfCeLCdWo1XPI4hyQDC8oLY11bWB7mHHpWZEdWt98uJS9yEBKs3Jcu
+XPsNjqghfoF5I29eJkOoWR0nz0IZTMyRCxKdymcOPyVLvXg/j1MIRtuQso/MZpAg
+Sw5g5qAC27VPvf4KyRtphw==
+-----END PRIVATE KEY-----
diff --git a/docker/test/integration/resources/kafka_broker/conf/certs/server_cert.pem b/docker/test/integration/resources/kafka_broker/conf/certs/server_cert.pem
new file mode 100644
index 000000000..01d3b0474
--- /dev/null
+++ b/docker/test/integration/resources/kafka_broker/conf/certs/server_cert.pem
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDEzCCAfsCFBcC4R9vi7MHlWx6fjCZYLb407ukMA0GCSqGSIb3DQEBCwUAMHMx
+CzAJBgNVBAYTAk5OMQswCQYDVQQIDAJOTjELMAkGA1UEBwwCTk4xCzAJBgNVBAoM
+Ak5OMQswCQYDVQQLDAJOTjEOMAwGA1UEAwwFTmdoaWExIDAeBgkqhkiG9w0BCQEW
+EWxlbWluaG5naGlhQE5naGlhMCAXDTIyMDgxODE0MDgzMloYDzMwMjExMjE5MTQw
+ODMyWjAXMRUwEwYDVQQDDAxrYWZrYS1icm9rZXIwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQDOYfl9K7m4cB+Ofk/3XnofnN9rc50plLGz8PCB8WL50Lk6
+ur9whqJ98sJBqINzPYIVL+p1xyWsMW2CQRpn1uYMYcTvRUJ5afPBafow/wuekZVd
+L5LubkDzR+Cx/eSLe0kJ/cyp/YmkIWvh8VoVlMkQ1DvZNKFpyhSiQ8aOhDxqjK6H
+swmDjnpdz4nQ5SEIUtKaSrgZnEwMr8o5MXoEEyrHyBVEAU9JFeQcALP9bCLo4BCJ
+308pbXoK3JKVmTeRFGSt1yx2f+SgzWc8SdKaOns+toF9g+iufxxPNeCiUfK1ZOrl
+uIB7W6/LbafXOpzOen9U0KQVJP6/vLrR2qHDSprNAgMBAAEwDQYJKoZIhvcNAQEL
+BQADggEBAJbO7Pqnhcq0dXVXUVC7L6Smh52jhER3ICO8KUIV47V3i38qz7hdhOx9
+XOODdDITTB8kWM6RuRtHnjh8RHynFyJWB3Vt+/czaODY+deivy4bFqVfsSHj+vvY
+l1q0fz2p7rLcywCDVAK77v2sRWUn+TwJzon3WZTa16iYsi/UBVDnDp2jc9+y4CS1
+Q2IMXj+LLHPD9na57+LWsPSqOQ+dP3tS/klmm+ahbBJa8HpEsxtLfUPynS7PNbe9
+F7hmgauEjgQriGPFXxXAjDioEiWFEL/C1ostJXTBkhkzkpSjgnH94qyFIILytIP6
+l2MtQn0sPKpsYgpddpkxUSSduewHjB4=
+-----END CERTIFICATE-----
diff --git a/docker/test/integration/resources/kafka_broker/conf/certs/server_keystore.jks b/docker/test/integration/resources/kafka_broker/conf/certs/server_keystore.jks
new file mode 100644
index 000000000..ddc0c3a0a
Binary files /dev/null and b/docker/test/integration/resources/kafka_broker/conf/certs/server_keystore.jks differ
diff --git a/docker/test/integration/resources/kafka_broker/conf/certs/server_truststore.jks b/docker/test/integration/resources/kafka_broker/conf/certs/server_truststore.jks
new file mode 100644
index 000000000..93a013d7f
Binary files /dev/null and b/docker/test/integration/resources/kafka_broker/conf/certs/server_truststore.jks differ
diff --git a/docker/test/integration/resources/kafka_broker/conf/client-ssl-java.properties b/docker/test/integration/resources/kafka_broker/conf/client-ssl-java.properties
deleted file mode 100644
index e4940c62d..000000000
--- a/docker/test/integration/resources/kafka_broker/conf/client-ssl-java.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-bootstrap.servers=kafka-broker:9093
-security.protocol=SSL
-ssl.truststore.location=/usr/local/etc/kafka/certs/client_LMN_client.truststore.jks
-ssl.truststore.password=abcdefgh
-ssl.keystore.location=/usr/local/etc/kafka/certs/client_LMN_client.keystore.jks
-ssl.keystore.password=abcdefgh
-ssl.key.password=abcdefgh
\ No newline at end of file
diff --git a/docker/test/integration/resources/kafka_broker/conf/client-ssl.properties b/docker/test/integration/resources/kafka_broker/conf/client-ssl.properties
deleted file mode 100644
index f21dd914a..000000000
--- a/docker/test/integration/resources/kafka_broker/conf/client-ssl.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-bootstrap.servers=kafka-broker:9093
-security.protocol=SSL
-
-# CA certificate file for verifying the broker's certificate.
-ssl.ca.location=certs/ca-cert
-
-# Client's certificate
-ssl.certificate.location=certs/client_LMN_client.pem
-
-# Client's key
-ssl.key.location=certs/client_LMN_client.key
-
-# Key password, if any.
-ssl.key.password=abcdefgh
\ No newline at end of file
diff --git a/docker/test/integration/resources/kafka_broker/conf/server.properties b/docker/test/integration/resources/kafka_broker/conf/server.properties
index e752fcabc..167a1ef51 100644
--- a/docker/test/integration/resources/kafka_broker/conf/server.properties
+++ b/docker/test/integration/resources/kafka_broker/conf/server.properties
@@ -166,13 +166,11 @@ listener.name.sasl_ssl_host.plain.sasl.jaas.config=org.apache.kafka.common.secur
ssl.protocol = TLS
ssl.enabled.protocols=TLSv1.2
ssl.keystore.type = JKS
-ssl.keystore.location = /usr/local/etc/kafka/certs/broker_kafka-broker_server.keystore.jks
-# ssl.keystore.location = /usr/local/etc/kafka/certs/broker_localhost_server.keystore.jks
+ssl.keystore.location = /usr/local/etc/kafka/certs/server_keystore.jks
ssl.keystore.password = abcdefgh
ssl.key.password = abcdefgh
ssl.truststore.type = JKS
-ssl.truststore.location = /usr/local/etc/kafka/certs/broker_kafka-broker_server.truststore.jks
-# ssl.truststore.location = /usr/local/etc/kafka/certs/broker_localhost_server.truststore.jks
+ssl.truststore.location = /usr/local/etc/kafka/certs/server_truststore.jks
ssl.truststore.password = abcdefgh
# To require authentication of clients use "require", else "none" or "request"
ssl.client.auth = required
diff --git a/docker/test/integration/steps/steps.py b/docker/test/integration/steps/steps.py
index 8fad64466..a692bb432 100644
--- a/docker/test/integration/steps/steps.py
+++ b/docker/test/integration/steps/steps.py
@@ -343,7 +343,7 @@ def step_impl(context, producer_name, consumer_name):
@given("an ssl context service set up for {producer_name}")
def step_impl(context, producer_name):
- ssl_context_service = SSLContextService(cert="/tmp/resources/certs/client_LMN_client.pem", ca_cert="/tmp/resources/certs/ca-cert", key="/tmp/resources/certs/client_LMN_client.key", passphrase="abcdefgh")
+ ssl_context_service = SSLContextService(cert="/tmp/resources/certs/client_cert.pem", ca_cert="/tmp/resources/certs/ca-cert", key="/tmp/resources/certs/client_cert.key", passphrase="abcdefgh")
producer = context.test.get_node_by_name(producer_name)
producer.controller_services.append(ssl_context_service)
producer.set_property("SSL Context Service", ssl_context_service.name)
@@ -623,8 +623,8 @@ def step_impl(context, content, topic_name):
"bootstrap.servers": "localhost:29093",
"security.protocol": "ssl",
"ssl.ca.location": os.path.join(test_dir, "resources/kafka_broker/conf/certs/ca-cert"),
- "ssl.certificate.location": os.path.join(test_dir, "resources/kafka_broker/conf/certs/client_LMN_client.pem"),
- "ssl.key.location": os.path.join(test_dir, "resources/kafka_broker/conf/certs/client_LMN_client.key"),
+ "ssl.certificate.location": os.path.join(test_dir, "resources/kafka_broker/conf/certs/client_cert.pem"),
+ "ssl.key.location": os.path.join(test_dir, "resources/kafka_broker/conf/certs/client_cert.key"),
"ssl.key.password": "abcdefgh",
"client.id": socket.gethostname()})
producer.produce(topic_name, content.encode("utf-8"), callback=delivery_report)