diff --git a/tools/test_apps/protocols/mqtt/publish_connect_test/ca.crt b/tools/test_apps/protocols/mqtt/publish_connect_test/ca.crt
index 894f2959b0..08cde3c753 100644
--- a/tools/test_apps/protocols/mqtt/publish_connect_test/ca.crt
+++ b/tools/test_apps/protocols/mqtt/publish_connect_test/ca.crt
@@ -1,22 +1,19 @@
 -----BEGIN CERTIFICATE-----
-MIIDkzCCAnugAwIBAgIUNI5wldYysh6rtCzYmda6H414aRswDQYJKoZIhvcNAQEL
-BQAwWTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
-GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDESMBAGA1UEAwwJRXNwcmVzc2lmMB4X
-DTIwMDEyMTA5MDk0NloXDTI1MDEyMDA5MDk0NlowWTELMAkGA1UEBhMCQVUxEzAR
-BgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5
-IEx0ZDESMBAGA1UEAwwJRXNwcmVzc2lmMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAyadSpRnIQBVbEAsbpkrKrOMlBOMIUmA8AfNyOYPLfv0Oa5lBiMAV
-3OQDu5tYyFYKwkCUqq65iAm50fPbSH71w1tkja6nZ1yAIM+TvpMlM/WiFGrhY+Tc
-kAcLcKUJyPxrv/glzoVslbqUgIhuhCSKA8uk1+ILcn3nWzPcbcowLx31+AHeZj8h
-bIAdj6vjqxMCFStp4IcA+ikmCk75LCN4vkkifdkebb/ZDNYCZZhpCBnCHyFAjPc4
-7C+FDVGT3/UUeeTy+Mtn+MqUAhB+W0sPDm1n2h59D4Z/MFm0hl6GQCAKeMJPzssU
-BBsRm6zoyPQ4VTqG0uwfNNbORyIfKONMUwIDAQABo1MwUTAdBgNVHQ4EFgQUGYLV
-EkgWzxjpltE6texha7zZVxowHwYDVR0jBBgwFoAUGYLVEkgWzxjpltE6texha7zZ
-VxowDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAb2EF4Zg2XWNb
-eZHnzupCDd9jAhwPqkt7F1OXvxJa/RFUSB9+2izGvikGGhuKY4f0iLuqF+bhExD9
-sapDcdFO2Suh4J3onbwEvmKvsv56K3xhapYg8WwPofpkVirnkwFjpQXGzrYxPujg
-BPmSy3psQrhvOr/WH7SefJv2qr4ikaugfE+3enY4PL+C1dSQAuNo1QGgWsZIu0c8
-TZybNZ13vNVMA+tgj2CM8FR3Etaabwtu3TTcAnO7aoBTix/bLBTuZoczhN8/MhG3
-GylmDzFI8a6aKxQL3Fi4PsM82hRKWu3gfs39sR1Ci4V22v8uO5EWBPK0QZvDSc1a
-KwwxI4zA0w==
+MIIDCzCCAfOgAwIBAgIUAndDARsI5XIyIRRc64SttSSYDBgwDQYJKoZIhvcNAQEL
+BQAwFDESMBAGA1UEAwwJRXNwcmVzc2lmMCAXDTI1MDEyMzEzMzU1MVoYDzIyOTgx
+MTA3MTMzNTUxWjAUMRIwEAYDVQQDDAlFc3ByZXNzaWYwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCYL5KtnxfhwB/5OG/ILFS4+X59KmLyBvQ0rUz/H/ju
+VLHBUb6RVm7EwEifZ1ZTMEdFg2hbSTX1ofSp2XxHdJc5oraszItgjw9nL2j4XdzI
+4ox4084Ldcg6ZepH8j70qfInQqNGN8xwXz4Aov6szeM1wSidJpzAO0yYkxTRN77x
+CG7InH3Du174EdQfD+Ug8C3HNHzFXudWPAH+vX4gdNRik4H2sIBuD2OMy37BHebn
+8brr6KUoKBfIl0tRPYtbeYSCWXgqUFuGT4KJ3WZyr6ITW3bA+xweVFLwA0l9lo1Q
+hf4wC231PSitapDEo1hZ5YCCykiC99b8LiM1JBuwXRcxAgMBAAGjUzBRMB0GA1Ud
+DgQWBBTRHg79buxy/EuH5KGHz6oP1uo7nzAfBgNVHSMEGDAWgBTRHg79buxy/EuH
+5KGHz6oP1uo7nzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQB8
+cYzTD7sggGaboo+x7TZ/kv9XqxUfUkG/tlp/yz6xbL4CHNgN9/pXD+9BITmrw1iz
+66+8ptPZyuJys0iO9TRifJWrMv1ZfE1vbsBmuxYOY3MGHN1uJTVpoEIbY2iZ5cSU
+ZWzbxLh5QQqpU8GDjxnm4FQdB0F+lZR14yiL0hn+/Sdrc8dnwdD7odFXefae4eoR
+plAUu8ojJFOCNUSbJmIp9fyptxRoq8o/YPq1qRwOzPL9eL5NSzoys76oiV6iWH08
+pXIBtNvmBupqU1OJf4yk7eHzu9dcGVdcYUSFuaxcAr59RFvWuzsKOurzkX8oCNtr
+oUQpoeBEAoZL9OxoTwuY
 -----END CERTIFICATE-----
diff --git a/tools/test_apps/protocols/mqtt/publish_connect_test/ca.der b/tools/test_apps/protocols/mqtt/publish_connect_test/ca.der
index c5c3304e23..9a8f4f9a58 100644
Binary files a/tools/test_apps/protocols/mqtt/publish_connect_test/ca.der and b/tools/test_apps/protocols/mqtt/publish_connect_test/ca.der differ
diff --git a/tools/test_apps/protocols/mqtt/publish_connect_test/ca.key b/tools/test_apps/protocols/mqtt/publish_connect_test/ca.key
index d39ad7c88b..c87923da54 100644
--- a/tools/test_apps/protocols/mqtt/publish_connect_test/ca.key
+++ b/tools/test_apps/protocols/mqtt/publish_connect_test/ca.key
@@ -1,27 +1,28 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAyadSpRnIQBVbEAsbpkrKrOMlBOMIUmA8AfNyOYPLfv0Oa5lB
-iMAV3OQDu5tYyFYKwkCUqq65iAm50fPbSH71w1tkja6nZ1yAIM+TvpMlM/WiFGrh
-Y+TckAcLcKUJyPxrv/glzoVslbqUgIhuhCSKA8uk1+ILcn3nWzPcbcowLx31+AHe
-Zj8hbIAdj6vjqxMCFStp4IcA+ikmCk75LCN4vkkifdkebb/ZDNYCZZhpCBnCHyFA
-jPc47C+FDVGT3/UUeeTy+Mtn+MqUAhB+W0sPDm1n2h59D4Z/MFm0hl6GQCAKeMJP
-zssUBBsRm6zoyPQ4VTqG0uwfNNbORyIfKONMUwIDAQABAoIBAQDEKH7NWcohBGUj
-sxp/ZcvH5+FP4qVqtHBLGYyohBsE+Zb4dgl4xBnAWRGEgrYXkxM+KOI1MmgJ/CQF
-JujNmarqEVI8PIRdmG6O/D1lKfALnkq+/8Umji87745iUji1iU4rXHEydznMYMYq
-TgzrgDu9O3CsDBhElFLktgsbxY2flhRiQ9s/MJTXlfkHYVMbzB+WzbgwglZmzRRB
-V9P7GDc1RPs3iUuab2BC0ajWSVWPCIE+WRQ8OTxeSz/Trp0S1y1WtxdMUDhg6wIe
-xbTCYF6L6CRjdnnAiaFZuW+ECaeLOyy8sOTtzxIU/8in++x3+CJBaMLsvAG1e2K9
-7OLzz4KZAoGBAObHebhxfC9ue3hGC5IbE7BOaXBBdyHboXvajJKtyqpIDq7QLk2j
-ktTuatigrzyCA8GgJUZCuOeWe/JhuzpFAsXN/lVs7ugw/6vQ+RGtJZkxzsYQDQjw
-/3f4uWevsj3b28idxdMgstsw12a92pmH3TtKu7mMX2jJhYSu3wqbnCj/AoGBAN+w
-/6nH4jLhSobunV+JT3YxwsMdyffLcdwXTcwjJrwGLwNvhPfAGtCCXidneYELCwCF
-TbemR5VZadZrCdURWqwyHw8YMHBfN1hArD3MKqck+XK5Spxxr3pfNHvU3YIKWI1l
-2h5sKoaPNUTQerLsJh9XG/zyc2Nl88hlFZucTGitAoGAPnKf518eIZ+d3Y/mtaSK
-EV1Gfs/YMttBuUgMXeyVOLrC7l77CJtIskHJu9DPWmo8Jfr12ytW6aP46j+z8DKY
-a3owZmFRzJbluFKV80iNMgUeVM4nGNJN7uLpGLucWczSjljTHSxt+Y4f23doXb88
-CD1SywTHFI3jiWHgjPhKq3UCgYATBZUoFeRJWVkiEkZ1qlKEhYS/XNgg5z7+bUjj
-VBXmJUx4KVKQUti05HEnPqhZbdv4pl1OgahSrfDPF/kVEk24mOaFPRRZae9l5NIA
-y0zRO9auh80tcoluiYwH/7j6ZvDSzVd4ANC48pKgEG5uqqAvSBQMNX3UdQX/A4GL
-4wWoXQKBgBqtbOYpsoAbLTNV4e7AMZCCKlPYFvRDALbO2E/8MjdaIqBWQSiZBkQ6
-ALFYQaKJOwiLVXVv5B1FHz8MblqDOIaUpaujoA4NxdhYFLh2ui3fzuGTdGiPzOry
-QHcIGifGSef45KnrF1LGvGvLMzX7Jx3xnAFOblJikN10wt1MLdNG
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCYL5KtnxfhwB/5
+OG/ILFS4+X59KmLyBvQ0rUz/H/juVLHBUb6RVm7EwEifZ1ZTMEdFg2hbSTX1ofSp
+2XxHdJc5oraszItgjw9nL2j4XdzI4ox4084Ldcg6ZepH8j70qfInQqNGN8xwXz4A
+ov6szeM1wSidJpzAO0yYkxTRN77xCG7InH3Du174EdQfD+Ug8C3HNHzFXudWPAH+
+vX4gdNRik4H2sIBuD2OMy37BHebn8brr6KUoKBfIl0tRPYtbeYSCWXgqUFuGT4KJ
+3WZyr6ITW3bA+xweVFLwA0l9lo1Qhf4wC231PSitapDEo1hZ5YCCykiC99b8LiM1
+JBuwXRcxAgMBAAECggEABBCAswwAwvfq7rC2/Q5QirJoojqEoxzEDshaWiW6I/Dd
+gLmQfLCVk6IESoQTtFPxslnDqqz4UMWtG3BuWxjyPUEDDpdFqWv2tAl6TOhSWEfj
+KyqyegBAu00LolVmIKoNiGaFZm+g8Vcc2H7h7P7wcJgGn/hXF0P6LCjA9YO+8PBf
+cr8cQrXw9bIVaimqEeFw5QfgotjRAYbhPHQjdM5V4WkH9yD7DsY+zlVy+kvLwAvL
+VWlZLhmdkLO/6cjpOyTJ7fQ8woKRFlNGTtvph2s/zHcWgbtRdAdz7fekZ+e6qriq
+bQ2qC6FSLnRYfJmZbuIuvBA4Dp90OEY0F2P+srx9IQKBgQDW5qKdHBH2Q+49Kqs1
+wvrpzakztESYONZkRl2v+yxfmGv2Uh52/eG7ox979P9Qj/6LsDkT8BKCVql5QZpo
+uCDkwwg8DQUS7xZsr2yY4zFsV5mQgZYtQdH+zgXwyHrAl0MZNS/Y9l+Q63hpDSss
+4OZYWpm6UPjtt4LaNra8UvEnoQKBgQC1SnX6UCaVEHWD9bBeJlm0oqdMEaF5c9W0
+MgaU8FcQZGhD6BPAQLfuvuY9nNjE2+NL3rO7PVx8gcw8spPuXqNJuGaDAUiG52ln
+l8TWGtZ0cosszG6yPaX58FegIUskBT1/c+3gn6IxeQNlG6KwoFCBcJ9UWGfSFIPj
+SLI6wc+FkQKBgQC9nAEeXgX7IzSxA1TMupxobe08kXF0XbHMB8nh29vq/LFFRG9c
+zeS9ic/dru0WR/ZviazSyp+KIKynMBrtCoj7TpmVYmd3rTw76QwIWWziCuiTd8Lp
+a4m9KEpViI3GH7A0LZlp9PedBiXXiqbtkgGrM0Uv/wGjvKbXoi7ZOtVMAQKBgDaM
+I/lf+mvpmuJMn3eEpIMkWaAawfIwN0HTt4VC1394JqMgBilXj8BHMjGhqtt4qehf
+JscUzGouB8zPkpEraog48qdCUJc+s8lWsgQV6Sb6fAPLsxbwU6tjdIoa2mgJJ5rc
+v9tRTNUD61CVwxrP8ckwoNAZFYvxXkmZyv7A5/bxAoGAD/5J2ktSDgghGJCGsB6z
+mi/oSm83jzx2ql6R8eLefqsPcChVF+T/kNmPtU1DUmAMrYn320EJB1qzHzzOvJVv
+iw5czIBlp87R8HkqNyt81RU6SDi1QttcYKCyMaGXZ0UL8UwemAZOun3Za9v7g6O9
+k0QiaYa6YfhFOidpdmP3u5I=
+-----END PRIVATE KEY-----
diff --git a/tools/test_apps/protocols/mqtt/publish_connect_test/client_inv.crt b/tools/test_apps/protocols/mqtt/publish_connect_test/client_inv.crt
index e5042f3520..842ddabc09 100644
--- a/tools/test_apps/protocols/mqtt/publish_connect_test/client_inv.crt
+++ b/tools/test_apps/protocols/mqtt/publish_connect_test/client_inv.crt
@@ -1,19 +1,19 @@
 -----BEGIN CERTIFICATE-----
-MIIDGTCCAgECFBhepE4kbe+jKn9Qa4Fq7o73PL/AMA0GCSqGSIb3DQEBCwUAMIGD
-MQswCQYDVQQGEwJDWjEOMAwGA1UECAwFQ3plY2gxDTALBgNVBAcMBEJybm8xEjAQ
-BgNVBAoMCUVzcHJlc3NpZjELMAkGA1UECwwCU1cxFDASBgNVBAMMCzE5Mi4xNjgu
-Mi4xMR4wHAYJKoZIhvcNAQkBFg9kYXZpZEBjZXJtYWsuY3owHhcNMjAwMTIyMTAy
-MDM5WhcNMjkxMTMwMTAyMDM5WjAOMQwwCgYDVQQDDANlc3AwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCtphtVYl80g2ldpmNY0NKcmabqWKGRC5PmabDU
-wrqErvyOko68fpfw24bO2ndUyXdIgWtf4mbAFmIKajrNrACzMlDtfcZM2uYgJZdn
-CYu/NNfDaFEb/ZyHIgkmVskLNxtv8QFTfaNCKK5Fhzz0iaFJnFAuQVX3kXIgOEN2
-8EmNxP53Eb9FeauVX+PBHhwJcGBruvWLPz8bfybHl51b80lCfddbow3z1zqGLESh
-AzGc1j/5AEgEgL+iP3QX4qoLKYBgs/olv3rYor8I7oCYfsIpFCcvr/LEoaVYtCJP
-PxbGu6KPx3p+r3MjaDStevdhLmzrKr35KczzTpUdOU3wgJA/AgMBAAEwDQYJKoZI
-hvcNAQELBQADggEBABVwInNI7NPozIKXsshp6hfM0hchrAozYRT5sZSwusxQJ80t
-Xhva0+RnBn3uaYG2YWULu+4QSgzjJ9vdRsFysuNN+7YpihwZrFHwvoRWes5C4ERE
-Mzh5xeoZT1VNdz72KHvBytBUwb+h5FZQpfZ9O3yr2wBVHsi4d7/X5LVEmTxLte89
-sxoMGmSbqTKj7/UOfGZjBi2IuiHs1xOZxaZWW7RTgJiz9VGrhSpwb4j6G55HDhYA
-4YODy3+epyVXAHVuy4zosQ8CCgdZgN0exB7pEwVQ21zIuyzrcQgQFPGQFbkXH0ow
-1mgONA6PZ9YUZftJBmqBZoTVPLLQuE1aKbhBTAA=
+MIIC/zCCAeegAwIBAgIUCVMRehYWWgySD1ZEybb7PqXzymgwDQYJKoZIhvcNAQEL
+BQAwDjEMMAoGA1UEAwwDZXNwMCAXDTI1MDEyMzEzMzU1MVoYDzIyOTgxMTA3MTMz
+NTUxWjAOMQwwCgYDVQQDDANlc3AwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCwutiHYegFgY0SqnO9HbjeMDRyaDZNpUzwd2BXBaTDuW3eB39iz3Q9DfXJ
+YPnwk1BQG4ZA/rslxLnEQaJNmXWQuGxXhscbXogRVNUJPXChjm5f3izoYQVwcq9h
+5BM+3hQmojBMWUb0SMcTAU1OXqTKm83a8KnxROpSU2qb8X5SZvZ7OyjV3DBp0jBU
+LQXzv92hxEtQiRCcnOb8/JF9hyrHVwvMHyxLosEgNErIOYFo2qqG8wiGd0aErggV
+C8nAh95xgR7Dv8x7+/AkLNo5Fve6r4/ZHWkLPxVssLv4H4r6+UKKMMWHcbhw++uY
+jEvUxldMcP8QK7KCVrlmigLiGNbPAgMBAAGjUzBRMB0GA1UdDgQWBBQ00vOWljyf
+7m4oAq00nevWptMfTDAfBgNVHSMEGDAWgBQ00vOWljyf7m4oAq00nevWptMfTDAP
+BgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBLjeV1MFVbyiRrHpJw
+mvnQ/GdGBxCioMw9sPhMPhT8fbW6y3gFdKytZ/HAEyt6+zysoG9bA1DvFJZ+cCD9
+pfRg/lr+ifrPXU7mYDou1ofabOT5ItoSuFDFIGW+HkZbkS3II/S569BdvwfAHlyg
+I81rNfz0mp3Htz6Cn44nMbe/8Yn5OFwTynOReSlqxqRsxIFpL33MRQNA40RoK7hj
+Pe3En1KOtRe9rDliSm8jrtI6gQZMBjfl24AZq3ZZRSS7V0TOqKl3JNkZ9/S1ImPL
+/OaGdwRcQMvYv2YCm3wnbqce2drOOVmmuUNGWGgbrehCRxTjgGoES5nkfXSoGGzM
+EB/9
 -----END CERTIFICATE-----
diff --git a/tools/test_apps/protocols/mqtt/publish_connect_test/client_no_pwd.key b/tools/test_apps/protocols/mqtt/publish_connect_test/client_no_pwd.key
index 0d9d0163fc..ad3254f4b4 100644
--- a/tools/test_apps/protocols/mqtt/publish_connect_test/client_no_pwd.key
+++ b/tools/test_apps/protocols/mqtt/publish_connect_test/client_no_pwd.key
@@ -1,27 +1,28 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEogIBAAKCAQEAraYbVWJfNINpXaZjWNDSnJmm6lihkQuT5mmw1MK6hK78jpKO
-vH6X8NuGztp3VMl3SIFrX+JmwBZiCmo6zawAszJQ7X3GTNrmICWXZwmLvzTXw2hR
-G/2chyIJJlbJCzcbb/EBU32jQiiuRYc89ImhSZxQLkFV95FyIDhDdvBJjcT+dxG/
-RXmrlV/jwR4cCXBga7r1iz8/G38mx5edW/NJQn3XW6MN89c6hixEoQMxnNY/+QBI
-BIC/oj90F+KqCymAYLP6Jb962KK/CO6AmH7CKRQnL6/yxKGlWLQiTz8Wxruij8d6
-fq9zI2g0rXr3YS5s6yq9+SnM806VHTlN8ICQPwIDAQABAoIBAA4G8wJMtgAZ9XL5
-M+FCzSCVUORxUGvVEZd1RjGJoWOCdyhVMm6Lk16DfTpMb4NL2vTib3gJY990b2sD
-9cgTcuMG1363wEMJE7nZD4flP4KslBlW3eZy8CgCWdbc/9SGGRNL1p2V8pAvlRRM
-vmHKlFrL47Y41ObwutVbdievdWGcPBdF/sjpzskemVrEIPg7knHJ+MyxuIsjyaLV
-Xdf3RR8yqtRggl+EP6m7JP4mbdlb/key8JTOHhe135JbuIwjUKTvm7UI+r9HwrDF
-/4ysd6uEqAq4vD73VJ+7UR1LSWJ1hqoVyNP96QWPsReID/PB8TxbCPNOMX8WKz7U
-WXOVomECgYEA1+54rF8QT/cpuqxR3ChbPaRGfwform0/nXZY7Xna4SqifQ2/gd6S
-I97cktKCQzsnxqxrq8lV8kBlVBnqYWib+546WNjez32DUTsSu/0cIat649izbhw/
-a9piOttup3OSAmc6LZGgPtLB/Jhupl9F25SbwAxnYyUUSomqK4zSOvkCgYEAzd8O
-MNZUGHREjD43UuoM+qyMa1vanZk+0mcNt6cL4MTKVHNyEPdCOg01QcAGTH5pumbs
-mxU4yEPGn6RylQuXDi1UwFBsPLQTDRCnbjWkYBSNY3qKD0MlN+UIQ6/zUMaYHVL8
-xEfvJKxMiMdU4FhgDqoCTsK7BjnJ/bzgEdrHevcCgYAS7pOh+UvC1xbPiSA8P0WQ
-qACOTrE16do0AhZV6+Mm7sgEUtpBlrQVdQq9zLsjDeK05pUiIKrqbH712rfUBon2
-i67t70XJx2VmD9napZx7zz8dDvjcZJmi6SjHpEmVYOqiT06ohCYam/vqG6tH5v6G
-/AaT1gKSjMO0rVFAND6ScQKBgF459ZjMwHjg3m8CGvhMP9yMFUkeJZV0iphqqpCg
-WINsDt9QZ6j0Qs+nM/UAGuHwChxS94CT2gVvX/25mug1AdJvVRcguCmgkges07VR
-wAZp4bziXUZXCTXoEjxI0CjsfLsPPLnp4r76TZ1c/rAgQvbzQVMjNc7HrHgCdtw1
-MpBJAoGAEdeW0t5kHrHHYlFqwUHYnwD6DbNl4TzTumZrI+uEkrH1EAQ4BpIk5Gwx
-OOWw8m+x2AMtBk+XcElMGZbX98msB2KcHbQMuxLF3xbCB5ihm6sKxk0HLvf2kygP
-k+DYz710yKq9zRwoGOeM52oTrA4hIpQKBnpjCXg9QigD0yoWOjI=
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC0Xu8EHu21sQSv
+Z7qqg3Ae7Qt1LYwhOOv4U970gbUNH/1ZMDO3X4Fow2xiw2tk1YiMI0tdPot2IPMT
+wTpVGYbQWXIKPCocYhmdZNBbKYGNq8ScMBY9DzzPxaul3uRcY9PHU3XdD/GKWL3G
+Mc/ldMNbYTL3hZO6CJRxo+YMsLUkeFWqeYPS8v7TJr1EwgMJVXJVCsrqoP9uzmro
+GFt8pDBZxsgAjyrZVTgoAP2bN8H3uRYKMEuad/g/iggwrNgymMrSFvL859DqP1ri
+Y03UKFRr4FHw5WpYNn8KYR9GxDOPr9jwTdOUt7+8sqOmJ6LU25qVvZhb0dSPhOAS
+YWDe0J59AgMBAAECggEAB+7m/1zm4qdrB9X9oVNPoqSVbO14bNumkVELDOEJmA6w
+o3QZyjZyqCt0QHHM7u3vaA6DWZIPKz5uwo8spCKPyektOWMFDSOJceFFwsS0FIma
+B66bw8rAR3kvwAdqLuAbJ/i1RehWHNojWqzFMpfsob/IMJfY9AU9ljP5wdQh2302
+jEk4/8VrZPJX+3f4Lr8O7SlHgYMe/UIr0eRxse5nuYjbNfbL0Fh6YHM2+cFFu1dK
+RLya5vn05L++2wyTV6+0EvLpRSgwdyAHURKH929MacUl6fJsGK2gsJHGjPa5Dck+
+bQWlQ2wBZkCm3sZrP9JarxHkTDQOyZe3gPsxogHI0QKBgQDXGsDUy1svBnisvPdv
+ynRF29KYZWULrcscesOVHlkas/3rpBXJVqdo8PAJTzkYdFXtiJz2YVrD9CvMNzki
+quttabGYDdED3VlNPhyucXGcTWJkSSDGy8EUGmMCDqdd9XAo4qcDIFtlbLd2wz/2
+uDdODCM2EC3YyUUaXEGCPRUj6QKBgQDWqazB8naJePQktRbwnLAXAYcAwowmKlRX
+FKEOcz51nTUDAqPxBIpPMwRk3lWnjJ8vblvm6V+lpPeDno8pXJlyqimQv3H0lo62
+SU08Ua7IuIfQhEIJikNLkcQyvBtpbdECZxQpIIr+rh36iVtkVKDhFPyIYyTlBnWs
+KRLkm9VtdQKBgG+apuABXp8IeYYOSUdMQIWaZyrAuOuVUWPGYkG1TD/pkV44dUFQ
+X224TKJX42THv2mNzvqaSnCO+EZthIxzJ9FN3GHrET4zE0lbZ6AupeaV0+36bzIV
+t2jJxALmPXonhPkBl+usVx9Jh+rrpP1KWQ96hq5fOJpY2yyxHyAGtzg5AoGAAaTv
+E9U9nzPz+swATvuERcjXNeRHmos8diZMTYYIdnIr08gTZWc5f/3ODM+/LDdhiMV5
+or0q5GPtGW7/fbud2UkAZIFy6AK3OSI6mzms8xCmyawZrWUHuu506EaUlywmK7SK
+bP440laXGDIxJwWW7eJxRMItqCtyf00ZPfMLoXkCgYEAggEgT6w7FDDbbpbRdf7E
+SIB45KiKLiJ/DBDJcTD6/AfqdVFmwooWadoOl/faQ7cp7rp03pdugEo+uzrVHBLp
+373I05QZxNvyCwnb9YW5I4tZN9hZFh9nEG8NcbBaJvh0VmYEDEC3hjjpg3dJw0Lq
+0l1V14UAqjelaR3byPlJ84Y=
+-----END PRIVATE KEY-----
diff --git a/tools/test_apps/protocols/mqtt/publish_connect_test/client_pwd.crt b/tools/test_apps/protocols/mqtt/publish_connect_test/client_pwd.crt
index 50c291a10e..3cb8afe2eb 100644
--- a/tools/test_apps/protocols/mqtt/publish_connect_test/client_pwd.crt
+++ b/tools/test_apps/protocols/mqtt/publish_connect_test/client_pwd.crt
@@ -1,18 +1,18 @@
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
diff --git a/tools/test_apps/protocols/mqtt/publish_connect_test/client_pwd.key b/tools/test_apps/protocols/mqtt/publish_connect_test/client_pwd.key
index ce98682401..c24b0db7d1 100644
--- a/tools/test_apps/protocols/mqtt/publish_connect_test/client_pwd.key
+++ b/tools/test_apps/protocols/mqtt/publish_connect_test/client_pwd.key
@@ -1,30 +1,30 @@
------BEGIN RSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: AES-256-CBC,6FFF58C7A652F8E0D7E31F0CCAA27E98
-
-ZUeJ8iCLa7bDf8xQsL3NtDK/oR2z8EWapoqGru/zOvxAeHWoLdMko1bouMkEXn+h
-g4GigyXo9f3jdyFKeqf9TtXonL6vguWczFc+81ynE5w3iqqcmdP8SD8k3o07lBc/
-hfRIwsg4Ywda3luQBWT63LIx7GnQjHRjK/KkPkFkYG6LDwshWyf1L7NxRMCrkejA
-3B7KqlRTEia9xR0WH//ZGOdipp2MSyUGC46BgXJQ1rDJo1D+3NUTZ8RmMkqZNmJK
-z3HMMflB4khmh2HkdM10VaErpiphitP52aTbGu/aschDOvSHFYMNf916u8UlyGQJ
-4m/pgSz+aAfReGRDqCcojkAf/BR4+n7QYfFtxjJ5P4ul4ZnhB30synknet6+9bKU
-Ht1SkavyJmruW2sfIcvPadLVm+xROnGr3ZWs82BGdPPu4wIYRWBn4S7huELXSSC2
-qLCTWeLB+pV//+9E9EmrvwsTJBNMCkjAmmTdmofm8UisAGsZlvyIDJVlpUsUKOoU
-cHGc2x9hj5OhgK++0JOY2ftowFX69FNRYNYHB5Vw6/5Teo3eGxVYoMeosADo7pXa
-j17g7dywDLRBZuTfIkFcYyfRV4A/xcagZJ8m/rnSDphGHYkM1d+MoXAPhj6A+iAa
-2qZkPyYdd0OkWvCY42F2xsjxzYjmxvkkNLDiYa7zj3ofb/1mqdNc8/k2AbFObX4v
-LenDFyqmzeYfzHcJ2Z4edwx1TFFMlHb+knuYjSzcBceWoQ5nOi+uipgZVJEEKC8o
-vTUBeaDnRblNIGlvuWnZFN0OHV1BduF5TyKUh2YGBw/X4qgCgrnCR2I8HGZMkUNe
-UTDF9vpxnDke5BEhzkwb2R34Kvn7ac1p4NDdXOrCwEqZTt93FgQTgOuklPb39CcZ
-yQHfl1Vr0EgfOlcE+ngbUrU93/qsEADXyjM8D4ZGB5+tQZGWlz9nc8PqldC3txux
-Hce4bk98hOgZUy/fEozE6fODxBJCuIi2ab/6WU8j62UAIumw7fvgti+zor6eJdas
-QCS+UVj5fJtYc5E/7Urih7Ixkltu0atqR5p81xn8U94/6KGYUCcsaZ7UZnWfD4dF
-0qEkdHravD82Z38eBpt/kqIE7bHs3orvt7WSCBYZQtkdQysYy+lXEAwF3eIpCqAW
-EcdHZ10zENvSHfzot1yK2rk9uuD+KqyK80xCSh9auLBSdJHCNeMtaozpCg5jLhYu
-mW4zSQA4awuD58k/+xAnOzXtNCPg6TPQ7GNzX/33W9R2ceRtkbNmd68YEmkZ7tZo
-s/3DAuxjid5W+wbsJHBvnUQh9g5BMF18k0SYS3bFPy62eycQziGfEQIwcgaHqAt5
-SX4URYqDLN0k+68CAQfm2JAS8kOBdo9TAKsluThp/uRC1oh3DW/D0xctDAApDbdd
-oNnK44XSYfMsBaGjm+NFQYTndFDpSd4+eQcVWAaXTdyRGMC6jbc9XijdzJnnKbEP
-M38+5dUaZFPyONieb7VfciH1WKM0GfxHAFxpiEgXd0dwS8Jqq9sLY6drKZP5+b9a
-9KMXI3jBLVqPg9yvx8E7THjF9ihsheVhEcJ6Nywhopab9Et+wvFa9upl2TJ2xGIj
------END RSA PRIVATE KEY-----
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIFNTBfBgkqhkiG9w0BBQ0wUjAxBgkqhkiG9w0BBQwwJAQQfHxbCamtiRIZL9h4
+OAg27gICCAAwDAYIKoZIhvcNAgkFADAdBglghkgBZQMEASoEEP/5zadqi1x7zmHL
+iKcmesMEggTQyAi0Ef1gl3xAZN2++wPZYOLaiFoQUmvq+lujIL8rjuVKjlyYEnXJ
+WbR59x1SEqNPy99NsPqyvjdJP5hrA+HcGFfPJFhYj3D3h+0hCaGWNyhRUrC0nbdZ
+LvoOiLV+HWkHWkpq9tcnC4wVZXxrYxifVD22uOcLNKDFz5H3eli1yM/VBGoS2iJZ
+A/cBIbQ5/D3/1Q5/URf/6Cc/HE/y6wtRjnLcOXwK5ULjg2yMyOOrFSwmSkL8OPkf
+8L9iIYGHmO9njRqNrjEuUQN+oS+bHO8pGvvBQxiS3ePQIP3b4gviaDCLs77B9bKO
+9tSVYMGKSTh1ymBd6SF89uPdbDWpkljXw5pQ6kGix0CAR5oA3gvFKxR27+dSMJFD
+GJjHXihQHozhTpnkOpGdQqIDrcNsGewdAELprCFpjgBrcRhzqRhWiKF3gyhv2s0L
+YFWAb517Cf7ZYwsG90weuhD2emMmbxs9668MK0Gv+LSNs/WbbN/OQDVhhjfsZ235
+f3t5PZK+COrqG6LpaaGPTCFzWErLibQBVbnn+bfcjx9RneQeD65zv9Jw894xniYa
+lOYkZNEZUuWoI3C7Q3wzphS2dRnPD1+AT6yMkvJMbb93KwHkhEmH2EoNiVjaqBer
+ZsyTWkfP4W/OduGqGJrwAxCmcGq6xm9vomxzK/7Xdty190EEDMF0w5SsEtv7Zo4i
+ckzx+ndqyFnpSvg05vSzf+5Og/X7G5uMbVanCIJ1lN5/W43LqF7OqqROTqJlrxZi
+s6NFJuRyAdqQbldQi2UYXC+SR4px+ZAVOCkR6HfPIKvYWjHvoQlGF4bqtCB8eTML
+ZfoArc6urDQemXE8vchM6YXxXAHPjE2jM/yhpzQhj25rmyNjb5WwAr0lZRb813Fu
+IXiwQc6+UeXiBzm0KmJC4YcKlF49QR6M9UMuUJO7ceIjrCVummrq1/gvGPpzAVaP
+i9kU81yEhfZYyESPZgwuZa2TdPAn4CXHTO1CqftrUHeine0bTPKPtOdZrX+UZiGR
+njtw9DnZRmEmz2Ra4fwHrlB5RRSghaG5MaXvyERjo33q8nylECjG3jznyys4mxAc
+y+pMd0VXnDrtgRKx7PvCOCmtLKuGg+T4bDoOIf/DswjWTrtKtceGfel5hGEusiuA
+lsL0I6IJETFDDi9NeDzpnQTD4t6kjMIgs9b+TqN5ophjWEPjfn3IorM51loMemAs
+ceTxqua5HT+exWKs0NCurIjE3CUu3WMDCPZLJzUiRbR9p9se4KMkOKduDy7++RMo
+8yA+UlDwIVR2IcJBLs1I1i/Rh7qqNnvL/4YnNYOe2fi965l4FShPnw/Ghf6tUngz
+U5GvKvknGxIvnX0jhr67y+3zmsb+ErK+3id64fB5jXKGgENkp3J31Amni5SgoWI1
+mGbv64VYleWljr8iKBX5cgE2VH1HSTOcfgABJB21lIg3XwzwGZ+eWLSE9wdR34hM
+VtfNJQCcmEBm+ruoqw2OkddbiAZAgrW8NX5dIwm34lkCF9UG/eR85OkSqUF5JZlx
+mlc7SpmmlmcEU+l+BMFdKKDlwRNnJNLIyciF0cMGtWlYRZ9oSatOMDm5ev6pGRuQ
+tdL+gYAyro9s7wz7WCOz/JmUKJk8MWvYt9ECsIj8aVd/QXK8+M4f8ZE=
+-----END ENCRYPTED PRIVATE KEY-----