Merge pull request #742 from bakaid/MINIFICPP-1165
Signed-off-by: Daniel Bakai <bakaid@apache.org>
Approved by aboda and szaszm on GH
This closes #742
diff --git a/extensions/standard-processors/tests/integration/SecureSocketGetTCPTest.cpp b/extensions/standard-processors/tests/integration/SecureSocketGetTCPTest.cpp
index cb70147..96982ae 100644
--- a/extensions/standard-processors/tests/integration/SecureSocketGetTCPTest.cpp
+++ b/extensions/standard-processors/tests/integration/SecureSocketGetTCPTest.cpp
@@ -110,7 +110,7 @@
host = org::apache::nifi::minifi::io::Socket::getMyHostName();
}
server_socket_ = std::make_shared<org::apache::nifi::minifi::io::TLSServerSocket>(socket_context, host, std::stoi(hostAndPort.at(1)), 3);
- server_socket_->initialize();
+ assert(0 == server_socket_->initialize());
isRunning_ = true;
check = [this]() -> bool {
diff --git a/libminifi/src/io/tls/TLSSocket.cpp b/libminifi/src/io/tls/TLSSocket.cpp
index fa781a6..a1a1926 100644
--- a/libminifi/src/io/tls/TLSSocket.cpp
+++ b/libminifi/src/io/tls/TLSSocket.cpp
@@ -343,6 +343,10 @@
int TLSSocket::writeData(std::vector<uint8_t>& buf, int buflen) {
int16_t fd = select_descriptor(1000);
+ if (fd < 0) {
+ closeStream();
+ return -1;
+ }
return writeData(buf.data(), buflen, fd);
}
@@ -358,7 +362,14 @@
int status = 0;
int loc = 0;
int16_t fd = select_descriptor(1000);
+ if (fd < 0) {
+ closeStream();
+ return -1;
+ }
auto fd_ssl = get_ssl(fd);
+ if (IsNullOrEmpty(fd_ssl)) {
+ return -1;
+ }
if (!SSL_pending(fd_ssl)) {
return 0;
}
@@ -391,11 +402,15 @@
int loc = 0;
while (buflen) {
int16_t fd = select_descriptor(1000);
- if (fd <= 0) {
+ if (fd < 0) {
+ closeStream();
return -1;
}
auto fd_ssl = get_ssl(fd);
+ if (IsNullOrEmpty(fd_ssl)) {
+ return -1;
+ }
int sslStatus;
do {
status = SSL_read(fd_ssl, buf.data() + loc, buflen);
@@ -437,9 +452,14 @@
int bytes = 0;
int sent = 0;
int fd = select_descriptor(1000);
- auto fd_ssl = get_ssl(fd);
- if (IsNullOrEmpty(fd_ssl))
+ if (fd < 0) {
+ closeStream();
return -1;
+ }
+ auto fd_ssl = get_ssl(fd);
+ if (IsNullOrEmpty(fd_ssl)) {
+ return -1;
+ }
while (bytes < size) {
sent = SSL_write(fd_ssl, value + bytes, size - bytes);
// check for errors
@@ -459,7 +479,7 @@
int status = 0;
while (buflen) {
int16_t fd = select_descriptor(1000);
- if (fd <= 0) {
+ if (fd < 0) {
closeStream();
return -1;
}
@@ -467,8 +487,9 @@
int sslStatus;
do {
auto fd_ssl = get_ssl(fd);
- if (IsNullOrEmpty(fd_ssl))
+ if (IsNullOrEmpty(fd_ssl)) {
return -1;
+ }
status = SSL_read(fd_ssl, buf, buflen);
sslStatus = SSL_get_error(fd_ssl, status);
} while (status < 0 && sslStatus == SSL_ERROR_WANT_READ);
diff --git a/libminifi/test/resources/TestGetTCPSecureWithPass.yml b/libminifi/test/resources/TestGetTCPSecureWithPass.yml
index d0a34f2..660ba35 100644
--- a/libminifi/test/resources/TestGetTCPSecureWithPass.yml
+++ b/libminifi/test/resources/TestGetTCPSecureWithPass.yml
@@ -66,7 +66,7 @@
source name: LogAttribute
source id: 2438e3c8-015a-1000-79ca-83af40ec1992
destination name: LogAttribute
- destination id: 2438e3c8-015a-1000-79ca-83af40ec1992
+ destination id: 2438e3c8-015a-1000-79ca-83af40ec1992
source relationship name: success
max work queue size: 0
max work queue data size: 1 MB
@@ -82,9 +82,8 @@
Private Key:
- value: encrypted.key.pem
Passphrase:
- - value: despiteallmyrageimstillanicholascage
+ - value: VsVTmHBzixyA9UfTCttRYXus1oMpIxO6jmDXrNrOp5w
CA Certificate:
- value: nifi-cert.pem
Remote Processing Groups:
-
diff --git a/libminifi/test/resources/cn.ckey.pem b/libminifi/test/resources/cn.ckey.pem
index fc42f06..550824c 100644
--- a/libminifi/test/resources/cn.ckey.pem
+++ b/libminifi/test/resources/cn.ckey.pem
@@ -1,30 +1,32 @@
Bag Attributes
- localKeyID: 73 E6 90 32 31 08 F5 87 C2 CE 8D 17 10 32 05 F2 95 6A 9E 9C
+ friendlyName: nifi-key
+ localKeyID: CE AD 06 8D A8 47 FD B4 2D FA 62 B0 99 5D 78 FF 56 94 31 48
Key Attributes: <No Attributes>
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAn9zCw5/EDWKe/jZWIou8aohC0wDhe8azYAORb45kEEqB2Q1p
-JJDHIIoNgDukXhrcPWFz2FxdZ56so7kkrjkN507t11dJn+wuFwfVot0us35NvOcl
-t3rHNy38nid4gV4+F01mXksrNWCnvTNSmp4XIWlRHxFkiZyKVTRxyo5U3fr2zmtm
-80LtopoBEf5Lr29WYZrjgA+A8iDMKvVlgmpriau44Vie9L3DIot4eAO7eN3o5UG+
-oYE7RQ6BdXSo9+D/tbma0rZvS9WHw3Qin7gDygaGKbwWEFuwhSYO+lcsywsB5hT3
-uxGTRnskafE29/vvzmsygMlNoRXk5NaRlnf/NQIDAQABAoIBAD0Z6tNMiGm5TR3K
-9OclU7HAPRJbHtPpYXwMQRVLblGPuMuWRZ61O3bjbT+bDDrvt0g6rEWBIC5PxpqZ
-VDzHD9peH6gT888NPZyN4Qjr00LFvr659n+HjQc5K3njijqgI8lSSxM1VeGD/Pji
-2erBDAQ4NcpTIoM6cuEYN3n9JtDk1B/nJ4vWD+1Ak/sS91hmaIy/1hOUofgaqp4W
-8+pnur/lEn4d9yCfEbDOfkfep49si8kDw8SdBH6uFpr1s71E2q9PfGv5WN4LGxc+
-fX3zHHnxFRB9XRivo42bIxCRyf/U/GNeD0ldlXzmfUkVKw/V1CLioRKP+KaJ7aT6
-FYZE1GECgYEA6Wk4t7kkNGszWiFJpGlUmB50CmmH0zdb+qeiBhxuAAgcPveglXJX
-qNAJOxDY29nSQqhtuRe/vhQEk88axNVfTIHBFF+29P8ODQPkQsOn5pyCeii+MTmJ
-R1Kq8/5F08CPCJ2n/Rfd1xYKsiB6QJDeRCxbUHuqlOwwkuASNnHVPI0CgYEAr1Vd
-SXToxlNOesCuvfK+IV+7qanAag49MSoHKYuzii4YhaS/9yC8HGNUNU4ZOr3gyOCo
-rlPGsJx+7HGAIylg7M+w0xrAOlwcBIfD6DHSoFSCbpxKQGOdav5PpKvKmXDbnCeq
-hvlJRSRepC9raZePRqHMeO+y0SCMCW/3kCvBZ0kCgYBPVEXEm5YkgrLHVTz0NiBc
-Oy1xRIC3Vr9aJ5M3xH3WYOtIs1zOrjgA1gPtIUKzJgsCQMBaAipW7fLIUcFlWKe1
-FvyKciV6ix05azMvRdRQ2qy13BcYH9f6d6xGlQsidvWmFf88U9o/+evUspkaTKJe
-RT0b04wcZVH0+Vb3TiUNGQKBgQCBmpxGfEDEuTe9zUhd6F1a1iUmGPC+dKAPA34f
-28BvV/uQbmPoDS5/3XyVmpFTtp++XTLTCeJJEqVPqeaKF0AqTKvsoE2P1h5vytup
-e4qyMUXo9WZ9iiUGvc2pb8NnAOGU4E1RUFw029mJi/PeLcYe8+LtUmHf7CsXnshk
-rbNc4QKBgFAIoRZonaHDU4AYXx/6Xem2EneJ3tXyxMZ8WEjNQKaWmA5rkGbbSijk
-0EaJ3bMexlyp1qgv86f4LrfLbZLdqTDSzhqlTV0x0b6D7MRBLuzcQUqsKmDmxkxq
-CkJUqnNhVWM0SMG8cy9K1WMBecdot8I2OH8L00uwKkkM4pQ1En+o
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCidvuaXXPpd3E3
+IyGrkq4p5fkoeD55OChxXQcQSvQL3yohOeqOPbYVCkvEJbXjhqsb20h2phWpAlkD
+pouzKzQpy1Ko/kyT3Jk9WJpeidihVAg3BFl6uV707ZUObHSRVCRMRF3g74WTUuzG
+yQKA7q9i7J3oDLpCJ34x51cZatRnjrxiMs5B2GDmQomjQwitByCWCwW96hRaTdDP
+1wRr+S/Rn+CrUCWxCxQjUZGRTzJoEcBL60MG2nDoVxUHK93Y5gZd+He6c2993QVb
+ttbDcZqaXxRCcGoQLGninTwvHjl6G70q62Q8FUnhPUak8RCzFBSHGB7Fjj/6tdl0
+n2nOcwWdAgMBAAECggEAMgiAjdaP9uuA42EfYm5m0qJvbCYz3zMLSXZD0aGzrOBK
+Yjcq5ClfJPWpxbtzW6HCmm6az2dwrj752OT2ivQYOXLTfxXp0XOTgdAConDDVVPC
+v+bIA8KI2tc8G1gNQiBumUpIuxgow+k64DFRYxGe09FZA/i/d9YfyBCdw0ciKM3M
+ykGrKQ1qWFQFzKqH1B5B95NQJWilQ9EuvCgsXP1KimBBrGYwKsStANvL5SGvi0Yv
+U8VBqk3eAYbdsDk/U3/Qk/wxJ+rq4lOmnma7yzcZ63fdx6jPiqLlg6/6/3XArtf6
+VAaXPR38zXvPf5B0GM91/cpgGaaMj+MtIVA21YHv4QKBgQD+QbHdqFZ01Ie9e/KS
+OYKi6n0nHmTFt+UHf2Hg6wktC0zGN2kvK/3eF+OnBKjaVfsW/7GiT6KZnVSB6WOV
+fjoHMAQeP66WiaDFITt4QHJLiiLgT1/l52Q41hve1TbOuSFNK/glr4oNAznj0Hnf
+RVvv2x29dZ8BFa2LPkmcd11h1QKBgQCjlCmoBpHFo+HPyP4JQne3kw7UrrS/zq7r
+7KlW1WEBXvp64WRJKznWC7k/z9EK03IrF9VBFZezySDMOyJBa1Y23VNZuBuINHkF
+NZtXyjTO2M8eLVo4V3qNIHnsVOjftHNqLIZMcQ4Pmt6NV33HxJwjvh/GFfkv7AzL
+n/ZxPt+wqQKBgE/8SMEreO9OANnaSUg48WDhFbgdtqQAovtF1nvUVNGn0WI2AlAF
+rdqVd1eOfrQZAmGM1Mvz83oR5Yjs7BgWWpjyQQlnDTxsVXhOaQ/+bjZXYXthXRDN
+R1kd+iyStKg500EcyPbKD0rire5+Iijb//0n2GZGv1uu/yZj1PJ1Fpp1AoGADde5
+9rgnmdwWfej6Znoze1t8g88NCLZK4zgx1GFWRjFtbPyp6e84g76WPKovfIUMQk1Q
+BKP5JIO+vMm8SmD0+MueBBeqbMpT+3bf4HwCIAcE7/7ShbYRbuPyrWc6FcRFiBSg
+gNOIZxWqA7gFsuQWeofaVH8DiWSmaIzu5AJ4F5ECgYB+dnp69um0z/8M4akN+OM6
+oDgRdf4xwrKuqbuVXwJNYkEWB8pYgTqCdMi/G22fDFKQ6EmxWqxV8HMzHODj77j5
+7SmfFsXCTRbYZc3d55gdTeimy+J9K/z+3FbK0Ac3AXPn60ulHfMBxE7sLJM0unv5
+mNd4hoiQUXGCHvoo8EgSHQ==
+-----END PRIVATE KEY-----
diff --git a/libminifi/test/resources/cn.crt.key.pem b/libminifi/test/resources/cn.crt.key.pem
deleted file mode 100644
index 9f10139..0000000
--- a/libminifi/test/resources/cn.crt.key.pem
+++ /dev/null
@@ -1,52 +0,0 @@
-Bag Attributes
- friendlyName: nifi-key
- localKeyID: 73 E6 90 32 31 08 F5 87 C2 CE 8D 17 10 32 05 F2 95 6A 9E 9C
-subject=/OU=NIFI/CN=test
-issuer=/OU=NIFI/CN=localhost
------BEGIN CERTIFICATE-----
-MIIDQTCCAimgAwIBAgIKAVpnU2lhAAAAADANBgkqhkiG9w0BAQsFADAjMQ0wCwYD
-VQQLDAROSUZJMRIwEAYDVQQDDAlsb2NhbGhvc3QwHhcNMTcwMjIyMTkzNjQ0WhcN
-MjAwMjIyMTkzNjQ0WjAeMQ0wCwYDVQQLDAROSUZJMQ0wCwYDVQQDDAR0ZXN0MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAn9zCw5/EDWKe/jZWIou8aohC
-0wDhe8azYAORb45kEEqB2Q1pJJDHIIoNgDukXhrcPWFz2FxdZ56so7kkrjkN507t
-11dJn+wuFwfVot0us35NvOclt3rHNy38nid4gV4+F01mXksrNWCnvTNSmp4XIWlR
-HxFkiZyKVTRxyo5U3fr2zmtm80LtopoBEf5Lr29WYZrjgA+A8iDMKvVlgmpriau4
-4Vie9L3DIot4eAO7eN3o5UG+oYE7RQ6BdXSo9+D/tbma0rZvS9WHw3Qin7gDygaG
-KbwWEFuwhSYO+lcsywsB5hT3uxGTRnskafE29/vvzmsygMlNoRXk5NaRlnf/NQID
-AQABo3wwejAdBgNVHQ4EFgQUc+aQMjEI9YfCzo0XEDIF8pVqnpwwHwYDVR0jBBgw
-FoAUtz2ps5YYKDRnj1ixtUA8NOjmo2IwDgYDVR0PAQH/BAQDAgP4MAkGA1UdEwQC
-MAAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUA
-A4IBAQBbpGba97qG7eXIQm3hiMKsuGpMNoybKxUlazOEeqG5QemMxSDOy2TDMBgM
-2oQU3RImrNMLbfWCxnQ1biWclis9exR5IkUintb8hEE8Vbq/nTLCi7IvpEg+2oDc
-kvSs8UTrI17EQAzh/vc9ljbgtvJD0L8khO8oPPSEpweD+vk/ZragQJOzeA7ohYMM
-kJDJ/a9HNNe6nPx+NOCWQH2hJS8Ok2z57hBgy1oym/xJoT9z3vfjQcHtNK4qLNlx
-P+o2mWNC2ZYNe84ghUfMD+btlnA3MrPEEOJHXOoE9UgaeNZXjwuF6N1qI2RCWSVW
-IU4uwXjW1icAEYZbCK9f2l5cK+Vu
------END CERTIFICATE-----
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAn9zCw5/EDWKe/jZWIou8aohC0wDhe8azYAORb45kEEqB2Q1p
-JJDHIIoNgDukXhrcPWFz2FxdZ56so7kkrjkN507t11dJn+wuFwfVot0us35NvOcl
-t3rHNy38nid4gV4+F01mXksrNWCnvTNSmp4XIWlRHxFkiZyKVTRxyo5U3fr2zmtm
-80LtopoBEf5Lr29WYZrjgA+A8iDMKvVlgmpriau44Vie9L3DIot4eAO7eN3o5UG+
-oYE7RQ6BdXSo9+D/tbma0rZvS9WHw3Qin7gDygaGKbwWEFuwhSYO+lcsywsB5hT3
-uxGTRnskafE29/vvzmsygMlNoRXk5NaRlnf/NQIDAQABAoIBAD0Z6tNMiGm5TR3K
-9OclU7HAPRJbHtPpYXwMQRVLblGPuMuWRZ61O3bjbT+bDDrvt0g6rEWBIC5PxpqZ
-VDzHD9peH6gT888NPZyN4Qjr00LFvr659n+HjQc5K3njijqgI8lSSxM1VeGD/Pji
-2erBDAQ4NcpTIoM6cuEYN3n9JtDk1B/nJ4vWD+1Ak/sS91hmaIy/1hOUofgaqp4W
-8+pnur/lEn4d9yCfEbDOfkfep49si8kDw8SdBH6uFpr1s71E2q9PfGv5WN4LGxc+
-fX3zHHnxFRB9XRivo42bIxCRyf/U/GNeD0ldlXzmfUkVKw/V1CLioRKP+KaJ7aT6
-FYZE1GECgYEA6Wk4t7kkNGszWiFJpGlUmB50CmmH0zdb+qeiBhxuAAgcPveglXJX
-qNAJOxDY29nSQqhtuRe/vhQEk88axNVfTIHBFF+29P8ODQPkQsOn5pyCeii+MTmJ
-R1Kq8/5F08CPCJ2n/Rfd1xYKsiB6QJDeRCxbUHuqlOwwkuASNnHVPI0CgYEAr1Vd
-SXToxlNOesCuvfK+IV+7qanAag49MSoHKYuzii4YhaS/9yC8HGNUNU4ZOr3gyOCo
-rlPGsJx+7HGAIylg7M+w0xrAOlwcBIfD6DHSoFSCbpxKQGOdav5PpKvKmXDbnCeq
-hvlJRSRepC9raZePRqHMeO+y0SCMCW/3kCvBZ0kCgYBPVEXEm5YkgrLHVTz0NiBc
-Oy1xRIC3Vr9aJ5M3xH3WYOtIs1zOrjgA1gPtIUKzJgsCQMBaAipW7fLIUcFlWKe1
-FvyKciV6ix05azMvRdRQ2qy13BcYH9f6d6xGlQsidvWmFf88U9o/+evUspkaTKJe
-RT0b04wcZVH0+Vb3TiUNGQKBgQCBmpxGfEDEuTe9zUhd6F1a1iUmGPC+dKAPA34f
-28BvV/uQbmPoDS5/3XyVmpFTtp++XTLTCeJJEqVPqeaKF0AqTKvsoE2P1h5vytup
-e4qyMUXo9WZ9iiUGvc2pb8NnAOGU4E1RUFw029mJi/PeLcYe8+LtUmHf7CsXnshk
-rbNc4QKBgFAIoRZonaHDU4AYXx/6Xem2EneJ3tXyxMZ8WEjNQKaWmA5rkGbbSijk
-0EaJ3bMexlyp1qgv86f4LrfLbZLdqTDSzhqlTV0x0b6D7MRBLuzcQUqsKmDmxkxq
-CkJUqnNhVWM0SMG8cy9K1WMBecdot8I2OH8L00uwKkkM4pQ1En+o
------END RSA PRIVATE KEY-----
diff --git a/libminifi/test/resources/cn.crt.pem b/libminifi/test/resources/cn.crt.pem
index 60a38ac..3619294 100644
--- a/libminifi/test/resources/cn.crt.pem
+++ b/libminifi/test/resources/cn.crt.pem
@@ -1,24 +1,25 @@
Bag Attributes
- localKeyID: 73 E6 90 32 31 08 F5 87 C2 CE 8D 17 10 32 05 F2 95 6A 9E 9C
+ friendlyName: nifi-key
+ localKeyID: CE AD 06 8D A8 47 FD B4 2D FA 62 B0 99 5D 78 FF 56 94 31 48
subject=/OU=NIFI/CN=test
issuer=/OU=NIFI/CN=localhost
-----BEGIN CERTIFICATE-----
-MIIDQTCCAimgAwIBAgIKAVpnU2lhAAAAADANBgkqhkiG9w0BAQsFADAjMQ0wCwYD
-VQQLDAROSUZJMRIwEAYDVQQDDAlsb2NhbGhvc3QwHhcNMTcwMjIyMTkzNjQ0WhcN
-MjAwMjIyMTkzNjQ0WjAeMQ0wCwYDVQQLDAROSUZJMQ0wCwYDVQQDDAR0ZXN0MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAn9zCw5/EDWKe/jZWIou8aohC
-0wDhe8azYAORb45kEEqB2Q1pJJDHIIoNgDukXhrcPWFz2FxdZ56so7kkrjkN507t
-11dJn+wuFwfVot0us35NvOclt3rHNy38nid4gV4+F01mXksrNWCnvTNSmp4XIWlR
-HxFkiZyKVTRxyo5U3fr2zmtm80LtopoBEf5Lr29WYZrjgA+A8iDMKvVlgmpriau4
-4Vie9L3DIot4eAO7eN3o5UG+oYE7RQ6BdXSo9+D/tbma0rZvS9WHw3Qin7gDygaG
-KbwWEFuwhSYO+lcsywsB5hT3uxGTRnskafE29/vvzmsygMlNoRXk5NaRlnf/NQID
-AQABo3wwejAdBgNVHQ4EFgQUc+aQMjEI9YfCzo0XEDIF8pVqnpwwHwYDVR0jBBgw
-FoAUtz2ps5YYKDRnj1ixtUA8NOjmo2IwDgYDVR0PAQH/BAQDAgP4MAkGA1UdEwQC
+MIIDQTCCAimgAwIBAgIKAXB3hvHOAAAAADANBgkqhkiG9w0BAQsFADAjMQ0wCwYD
+VQQLDAROSUZJMRIwEAYDVQQDDAlsb2NhbGhvc3QwHhcNMjAwMjI0MTQwODE3WhcN
+MzAwMjI0MTQwODE3WjAeMQ0wCwYDVQQLDAROSUZJMQ0wCwYDVQQDDAR0ZXN0MIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAonb7ml1z6XdxNyMhq5KuKeX5
+KHg+eTgocV0HEEr0C98qITnqjj22FQpLxCW144arG9tIdqYVqQJZA6aLsys0KctS
+qP5Mk9yZPViaXonYoVQINwRZerle9O2VDmx0kVQkTERd4O+Fk1LsxskCgO6vYuyd
+6Ay6Qid+MedXGWrUZ468YjLOQdhg5kKJo0MIrQcglgsFveoUWk3Qz9cEa/kv0Z/g
+q1AlsQsUI1GRkU8yaBHAS+tDBtpw6FcVByvd2OYGXfh3unNvfd0FW7bWw3Gaml8U
+QnBqECxp4p08Lx45ehu9KutkPBVJ4T1GpPEQsxQUhxgexY4/+rXZdJ9pznMFnQID
+AQABo3wwejAdBgNVHQ4EFgQUzq0GjahH/bQt+mKwmV14/1aUMUgwHwYDVR0jBBgw
+FoAUrZKBonxn1AHSUEdAj24LEVdHdQkwDgYDVR0PAQH/BAQDAgP4MAkGA1UdEwQC
MAAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUA
-A4IBAQBbpGba97qG7eXIQm3hiMKsuGpMNoybKxUlazOEeqG5QemMxSDOy2TDMBgM
-2oQU3RImrNMLbfWCxnQ1biWclis9exR5IkUintb8hEE8Vbq/nTLCi7IvpEg+2oDc
-kvSs8UTrI17EQAzh/vc9ljbgtvJD0L8khO8oPPSEpweD+vk/ZragQJOzeA7ohYMM
-kJDJ/a9HNNe6nPx+NOCWQH2hJS8Ok2z57hBgy1oym/xJoT9z3vfjQcHtNK4qLNlx
-P+o2mWNC2ZYNe84ghUfMD+btlnA3MrPEEOJHXOoE9UgaeNZXjwuF6N1qI2RCWSVW
-IU4uwXjW1icAEYZbCK9f2l5cK+Vu
+A4IBAQBJvD4azQoy86azkFqpuN2lUVYG9R/fay0sBX02rx8sbwucn+oH+vmFmQ0h
+NjWL8bLrK+4cFkZw8+jLB2rxE5ekm3/dT6B9xpqP7Xz3ilyhGLXnSCXP1VoGDUeQ
+zmwnXrkHtHeUA2ooEkIi1DgR7UEh/eETBh5rnJzrO8/+eHq3qpRr2eOc2CTRC2KQ
+/9owd9wSVmDhjTTaNgnAjgknMmWKw2xpbb8g4cfS8RfpgpyPrcSJpmZnJSfO7Te9
+6/Nn+3ZWiPXdtiL63g7bcyda7db7hdqi4bgHse29suW/Z4vvXQGhK3Vp8NvB7yNV
+BQq2FKL8ndRHQ0/wVFjL3Ex1qmvU
-----END CERTIFICATE-----
diff --git a/libminifi/test/resources/cn.p12 b/libminifi/test/resources/cn.p12
index 56d0bd3..0b08aea 100644
--- a/libminifi/test/resources/cn.p12
+++ b/libminifi/test/resources/cn.p12
Binary files differ
diff --git a/libminifi/test/resources/cn.pass b/libminifi/test/resources/cn.pass
index 3f2ff2d..cdbe4f5 100644
--- a/libminifi/test/resources/cn.pass
+++ b/libminifi/test/resources/cn.pass
@@ -1,5 +1 @@
-
-
-
-
-
+VsVTmHBzixyA9UfTCttRYXus1oMpIxO6jmDXrNrOp5w
\ No newline at end of file
diff --git a/libminifi/test/resources/encrypted.cn.pass b/libminifi/test/resources/encrypted.cn.pass
index 2518fb4..9dd74da 100644
--- a/libminifi/test/resources/encrypted.cn.pass
+++ b/libminifi/test/resources/encrypted.cn.pass
@@ -1,5 +1 @@
-despiteallmyrageimstillanicholascage
-
-
-
-
+VsVTmHBzixyA9UfTCttRYXus1oMpIxO6jmDXrNrOp5w
diff --git a/libminifi/test/resources/encrypted.key.pem b/libminifi/test/resources/encrypted.key.pem
index edaf576..ccfaca8 100644
--- a/libminifi/test/resources/encrypted.key.pem
+++ b/libminifi/test/resources/encrypted.key.pem
@@ -1,30 +1,34 @@
------BEGIN RSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: AES-256-CBC,A01078B17BCADA9FE6011085CC131A20
-
-80HsK6Gj2thdPlyybMuaenM2acgl1yHdIkCSX1Hi0Nr6juTSVNKH/UTpeKeRnBio
-A+0zf/d4kAKVtTPhufPKVwx/bLXzTXy7jbQb8/P7fzLVv3+aDtHCcQ5K9QSvK5I7
-NJeOaugZ1PCZoY/67fkOQGK75M/8fByJQiPyOnqY4Ck0nJ/KboyT0tHvC7U1vZT1
-3N3HkQ+2RFNR9oFq6R8tnU6XB3rxa2TxzwNiPLhYzh4eQSg4SLlCkWFsJjiopboF
-AcoQixdLkgLnvJGE7IXhYqpymjaLdLo08T+bfbLHgWXeIn2CLCCwDIh+axiq/DGO
-Sg49J45qnn/WXwAQuYYqXNE7/SZdkHHlYjgM7e7TH31L96I/9z/tBJe38mrxjn6A
-ef5V34FF3gz+TIN+TzG2vFTovo4/vK+W6kwtAMZ/DLvhxQntOwuYGZJ/OMrK5E6k
-vChKzkqplmR1qqD2AFbXhET06BC58C+npQsaSw3fpITrhhg3gx7OXycYhs3YC023
-piiRnggbDxRwZzYjkWPhbxn+cf4dUvXRfAU5z/YtfsYlqz6odQ95DNvgM010IWf+
-YdO3D0UrxTPNbOEE7ROsUYnVkQ4foo1frJY81PwUYtS7WeAvsn0cq08y811pDk+E
-ICkSSj55WfryIwY4Xv0UyiejhnvD/MPb7PCPs6myZ4Wrm79OtQVLmV+P7MKudTpS
-yzFo1BOA2IWzcuVGHR/5r2hLpRr7iWNiHLyxpmuBjw7ABDFXlKjersz3pjNbXF9J
-rkAolGMl77BV8n0YsIIrpWTY7kcuZiXl3p05AnOnCqgUQVaTozvyu4Ur2WhRVl77
-VEVczenZXbIBjTFUh2oSZA9xzaqeVojc2mAAyu4OvBN/R6RWEWVb7eI22ZHNCdsy
-ZXuDmo1+1ArpINkhehERZgrI0fd+Q55Q41e8F7RKf/WvtjX0D8RO9Y+ZBwEWISpv
-Aye8tBa6whRXwDoO+gbqJ4usvcgPS9xN7KUuwxIu3GtM2aBHbObBDqE/DDiKzjK4
-gXZK8Q2qYYFwGYmEss+c75Veux5WPxi7A4gGDubCBO+c5mc8gJQ24u4QnYCRyvLq
-WKg2QDdoN7HN23vWB0rwk7UymfNDJL2jlOnm93JbVnGNWZpaVpRCAR37PEdTdyp6
-arKW9MACOUOjWt0019AkYkOjcnbY5LN/iw0UnN+nO0KEdUZEoYv5UPV6tMRs110b
-BQM50aMoB5rJyPmDt++GKx8TFff9WLchEnlu1XLTOVF/1h8/JwpMxkpIRyQ1a6sN
-Gx1MLikExUH09PzbUh1biqpyQUYCzrVp2uPvEhlH+AZKrpNXdtc0cn33FIKDRCQ1
-b1JBJOp7wdOcJrqgYLUOsxD5CB+BE6i1s5IvMT5u7LWsH+cxSVrgX4DBtjFFhlzz
-A7yYQtpF7O350PLQmsOCnPKyQ5R0CfRfKJGWajcZgrzxwEMddB1qGyu3tz6yFOw/
-J2qBgfKcAWcBxgkcqiryca6UYAM48gQAa7G7cYAxG4OaLOWEUppw+oU2euuvDMdq
-bNZu0d3zxNvyyl/PVK+QwphPyidcTRzsasZkugZ3LxNplAZHuEAyy9IQJ1EBfvhA
------END RSA PRIVATE KEY-----
+Bag Attributes
+ friendlyName: nifi-key
+ localKeyID: CE AD 06 8D A8 47 FD B4 2D FA 62 B0 99 5D 78 FF 56 94 31 48
+Key Attributes: <No Attributes>
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIFDjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQI2peWKpku/dQCAggA
+MBQGCCqGSIb3DQMHBAhwqOaJIiNKoQSCBMgRTOFTAlo3U9ZvTYcmh9Kx+cKRuLws
+xPKiuI0z442ZtQVr/Ak5gwDhoz2aQJv3HysQzga4m0oAGjjPdO63b7iKNWif+lVb
+mHUqwGOdC4hDWdj2lPIsgG9FnGdG8hcPEyhCHA2rSAureGFgEiqk7z5+BJP/WbAK
+PdUsC23lTPcsOK/RsmezcdLrWSFXvex6ANzLeMQC92pPxT9LPu1QHt79vp0CNNmG
+O6w8bUjo6JiHM4tFWZEkmsneLDoBqWD9ixV605sADWkoUqmRO1yfn90haIECJ4Yc
+Z5dzNOZoeeTD6aAF64sLUrIiiPrApEvU6aQntOhKor7pGcSNsyMufW1o/9uuuFmh
++CtCCqu5b0hGLbD/B60BciorhNaLltRrVKv3WZgRaMKEi9G7/lb01cw2aN8FUzjn
+a9mwcXm+qwN6BxexC+LvEMsV9Fm0wCixedLkMDU3j9wwcYU+N7L4n8EctIaUHkKf
+1GsSew6ViRGaDZNWpa/VOikbmeXHzyRsSXrEN2i6Nucu2P5ldHoWS8vGz3RC7yLx
+wXRmTElFZ7+8+XRM4fZqlvrqc4mUBfKdVltHqt/Gup9bTL8fMv3gI3mbxfi8V8+k
+F8JpckmYKL1nzvye9dtB06bMa9e9xIKppD3o1078lgZIEwyN0fniby8nKJ/aFMLx
+6Gb+KI5ezbCE8SXhqsCtyjFKW52R4y4/AoJv6yMBRJhDn8k4otzXDgvd7xfBW7gq
+JRHLMExXc5xMWANRL1VFUF5Bo6ttzqRcnuYVCLJQw0m/JC5eRYH6B+8B6zpMS/6L
+JqpDMpI1HI/pofdpBmlMHPa0qnU4HAVOpSwg1tOF//+I2vt7xRmnTqfBmTnKhkuK
+acNPh+RILHWV76t3yU9o2kBU+IdqhAC29ntMHkieSO4LMp4gKKMV/h0FD31xky34
+QtYq5uIP67GR4yYpSElHrOoI5FF+jSv0ukgtUbeHMPtM/UdpytrykPT55Itl3QJF
+FxkXpl5bBAZWjYCsLkq6c7tZvNDmS2Te0ZdSu9PTJn+kSVKZxbA3cYZ9nZoHW1jx
+3PV5qoEwtqysTE0O5HiGJk1hBYbcVdD+7WvvsYbjDWvvfYW8Sc3B4nK4tTSgfnvC
+rVGgWPnUNkYSYoOBAvnKQSww/RmuTnJJ7r50XPWNOfv/QRY/ZbCd4Wi6hgmIxKwg
+qa0QU3YHlTQF+tRmIQyrHhLFtzX2eTf5LsUAA0k4hatwKfFGJu1alOSaz31al09T
+wfq4glY+NLtmq9hqkR+kWTubqC3D57eEJ53he44CELjzPgOPrGepFbWtzcxrn69O
+MrKX0IwyDM/tzF1z5QlYDpFFcstV+dE6R5e8oy+KfnJm7ZC7/xMd7tt/XeRvN8Ih
+JasJG7vikUs2IJa4ElPtRYQxIy126mOVJnp3JB6ewOY1wYOf2ENJJ8/4QbwSBILp
+K/bacAVk9EeuDv93HWG+yA8Tg3gE879HmiSaqs4hQJYGsKo+kU0tI9zlWGcJzhW2
+G3N86BWPq/Y6Yn22xieckIQdW6S7aPPJMxsqhTBLp+Mb8wRA0lB15eC+s2XPwULU
+pBjIfLpx7yXLrLPThlFMi/Y0eznQW24CUNvUoXHXbFgph1oVWAv1Wk7eQk2zg1vf
+g7Q=
+-----END ENCRYPTED PRIVATE KEY-----
diff --git a/libminifi/test/resources/nifi-cert-key.pem b/libminifi/test/resources/nifi-cert-key.pem
deleted file mode 100644
index 0c3b7da..0000000
--- a/libminifi/test/resources/nifi-cert-key.pem
+++ /dev/null
@@ -1,47 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDSTCCAjGgAwIBAgIKAVpnU2gBAAAAADANBgkqhkiG9w0BAQsFADAjMQ0wCwYD
-VQQLDAROSUZJMRIwEAYDVQQDDAlsb2NhbGhvc3QwHhcNMTcwMjIyMTkzNjQzWhcN
-MjAwMjIyMTkzNjQzWjAjMQ0wCwYDVQQLDAROSUZJMRIwEAYDVQQDDAlsb2NhbGhv
-c3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAIXpNyG57u1HroE+D
-zzpY5g0+BLA1qrUolBK4ZwQcrbCUAS5h+JjP0tuMUtlEtFjYIX2YgZvrzdvKue84
-xyrpr5h1cNo4dmeQoFKwj/FPNJxdO/cQpK55nSwy4PsvTL/YKzaV/yF4FQRSqY17
-Xkn3K8RDUaknSPuIIKd4piON7MVaCVFK//2y6+pULEjGviP2Bc4ODJTfB3AjGRBQ
-EleTga0OnTdHFzHoKHRUHCNwaRgeFywYdHODp1yvv3m0t85A0D9WWN7T5G0f8pT9
-ZeDOX2cq3EPtdTBnKGgSXM1x6E3RaYoOACYBKdy/Lv5hjMpTr0fXhD7af9ql2irH
-+RNBAgMBAAGjfzB9MA4GA1UdDwEB/wQEAwIB/jAMBgNVHRMEBTADAQH/MB0GA1Ud
-DgQWBBS3PamzlhgoNGePWLG1QDw06OajYjAfBgNVHSMEGDAWgBS3PamzlhgoNGeP
-WLG1QDw06OajYjAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDQYJKoZI
-hvcNAQELBQADggEBAKcXKG4rPnEuYS/AJfHs5RlGsg2h/VnbCT50A4OsUNcv5KSe
-WFeP2ctp793MsIsUKA3FgGi+23aaUTtlAclQQs/xlBiDq6XmkED/DjLVzt5dTHrl
-gS6aFtDHffMn5tLaUKOkNETOG/Fnc+XPAENB8GyqBd2Q/1L0SWSHXSTecX+aA9P6
-lvrRtWOqyGHiRoaRE5+VUjyO+0ToEgj9E+3rV8JL66BT7SWQusLGqbX1OoANCMTj
-BRYeqB0g0PrXU+6chh6StpNSnYzkQdoxLUIDYYZx2XGsbkjDh/k6ni6bgJEKEOCu
-T3Z2tyvGpc+PjLRXW/WyXCpg/xfr3+GSVKI6ark=
------END CERTIFICATE-----
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAwCF6Tchue7tR66BPg886WOYNPgSwNaq1KJQSuGcEHK2wlAEu
-YfiYz9LbjFLZRLRY2CF9mIGb683byrnvOMcq6a+YdXDaOHZnkKBSsI/xTzScXTv3
-EKSueZ0sMuD7L0y/2Cs2lf8heBUEUqmNe15J9yvEQ1GpJ0j7iCCneKYjjezFWglR
-Sv/9suvqVCxIxr4j9gXODgyU3wdwIxkQUBJXk4GtDp03Rxcx6Ch0VBwjcGkYHhcs
-GHRzg6dcr795tLfOQNA/Vlje0+RtH/KU/WXgzl9nKtxD7XUwZyhoElzNcehN0WmK
-DgAmASncvy7+YYzKU69H14Q+2n/apdoqx/kTQQIDAQABAoIBAQCz7eY69+y4BXo3
-nz84Ipby8CcQoJVg/QiBAwLxHNCWBvdp9B069PQvFLo1FNWSaQ8XAW48p4yc7YHb
-vftRgfwnMyIlQdWrsP9WSz6FSZhkY9HX4rODK6aWD+J3l4jFCCxVxkpteKwgaBZP
-T6hHE8tTJfK8VLqEJu4g0uvjqjt7ydJT69lThdyf3VE0v6ZeSjsya5qqw+9RK+uC
-q5T/8FxeFZgpfR6UXXnoLAmAkfcMZNIBo6cOJWi/BQHjZdpCOVXUBtu0/lC8bffa
-4/ESaxRS8kOp+WEb64pT7u6F7yhD/kve6ZnJj/SX1EvN+RzB3zoVG42WUs/+/SwN
-dU1ERz+tAoGBAPbgZPDnWuKxW7Cam/Aqmvux624C1lNfhfXEGURhyc+wHWjjhWRe
-2vEPJOVxG5pN/FAo+lFoGiLe3QsLRLPlQrGfT/92W28QEcRrRSutjRZOL3wKezQA
-DkAPU9HX3lACR5yQD6+a0HHgMr1MqeNFPi9MPPjywGywTyWzHd4WQqvTAoGBAMc7
-J4fpr5uPVq9mKemK67i7meJ8AxjjU7oNe8EN+2XfCYcQUmgIo+dLzV9+DTrYkoTz
-iqjA6Ph2DNs6YHI/JNwsdSbAz6KVDteimt3t+uyNpiMGuyLmfOgpYEMJcHp+q6I6
-7PGKVS4c5iPFiYuIo23Is9ZMxOVQp76+UOy09rwbAoGBAOM5Za7VQjGkTGAf7ab/
-j+ZZu/dlZR8XrJSoCRmHZ9hgoLEJuJzJMXruFWeY028SmEivbrW+u0+dEJY5qOJr
-ARe7KkZXCZEPmUrP8Lpi4pjFHa9tdjhGVNdhRCTAKz442vCfJ9DZDUHCuPDCvxsP
-gEzIPtZjl/hxzmdElRj0JClBAoGAaXmfzAyjs6+HLQThW4r4kKyBI66T1TFEulM5
-GVPVrHEQEjlJ51nrrCAtckjBqE3QBCMLXZwDusaEt+uH8/QKB6Zhv0qEooZXfUHQ
-y32aQnIbap+9oxRzPFXraJIuwisdop2fo6Cgx/D0xitmTkDghNaknue1tdGlfQ40
-uZx0o9ECgYBeKeNbMnWoO46ZOrhaz8On+fIY7xtboV2bALy7lvUbWd9B41ntqYUm
-NHlYXDDU+Izs5wnNJnNnx4vECuUzYbpeY82dvMewlQwfl5aiyKrjo7VxLm//2U/K
-hlID6DU5wi9O+TAQ319DhxT7Ja+AQxO/OFS/mfrtwJEevxXqJLu55Q==
------END RSA PRIVATE KEY-----
diff --git a/libminifi/test/resources/nifi-cert.pem b/libminifi/test/resources/nifi-cert.pem
index 0c3b7da..a827fef 100644
--- a/libminifi/test/resources/nifi-cert.pem
+++ b/libminifi/test/resources/nifi-cert.pem
@@ -1,47 +1,47 @@
-----BEGIN CERTIFICATE-----
-MIIDSTCCAjGgAwIBAgIKAVpnU2gBAAAAADANBgkqhkiG9w0BAQsFADAjMQ0wCwYD
-VQQLDAROSUZJMRIwEAYDVQQDDAlsb2NhbGhvc3QwHhcNMTcwMjIyMTkzNjQzWhcN
-MjAwMjIyMTkzNjQzWjAjMQ0wCwYDVQQLDAROSUZJMRIwEAYDVQQDDAlsb2NhbGhv
-c3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAIXpNyG57u1HroE+D
-zzpY5g0+BLA1qrUolBK4ZwQcrbCUAS5h+JjP0tuMUtlEtFjYIX2YgZvrzdvKue84
-xyrpr5h1cNo4dmeQoFKwj/FPNJxdO/cQpK55nSwy4PsvTL/YKzaV/yF4FQRSqY17
-Xkn3K8RDUaknSPuIIKd4piON7MVaCVFK//2y6+pULEjGviP2Bc4ODJTfB3AjGRBQ
-EleTga0OnTdHFzHoKHRUHCNwaRgeFywYdHODp1yvv3m0t85A0D9WWN7T5G0f8pT9
-ZeDOX2cq3EPtdTBnKGgSXM1x6E3RaYoOACYBKdy/Lv5hjMpTr0fXhD7af9ql2irH
-+RNBAgMBAAGjfzB9MA4GA1UdDwEB/wQEAwIB/jAMBgNVHRMEBTADAQH/MB0GA1Ud
-DgQWBBS3PamzlhgoNGePWLG1QDw06OajYjAfBgNVHSMEGDAWgBS3PamzlhgoNGeP
-WLG1QDw06OajYjAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDQYJKoZI
-hvcNAQELBQADggEBAKcXKG4rPnEuYS/AJfHs5RlGsg2h/VnbCT50A4OsUNcv5KSe
-WFeP2ctp793MsIsUKA3FgGi+23aaUTtlAclQQs/xlBiDq6XmkED/DjLVzt5dTHrl
-gS6aFtDHffMn5tLaUKOkNETOG/Fnc+XPAENB8GyqBd2Q/1L0SWSHXSTecX+aA9P6
-lvrRtWOqyGHiRoaRE5+VUjyO+0ToEgj9E+3rV8JL66BT7SWQusLGqbX1OoANCMTj
-BRYeqB0g0PrXU+6chh6StpNSnYzkQdoxLUIDYYZx2XGsbkjDh/k6ni6bgJEKEOCu
-T3Z2tyvGpc+PjLRXW/WyXCpg/xfr3+GSVKI6ark=
+MIIDSTCCAjGgAwIBAgIKAXB3hvC+AAAAADANBgkqhkiG9w0BAQsFADAjMQ0wCwYD
+VQQLDAROSUZJMRIwEAYDVQQDDAlsb2NhbGhvc3QwHhcNMjAwMjI0MTQwODE3WhcN
+MzAwMjI0MTQwODE3WjAjMQ0wCwYDVQQLDAROSUZJMRIwEAYDVQQDDAlsb2NhbGhv
+c3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwdL2PnSuLBZIT9Tgy
+0I/0Bry/KDeXrz5Kwdo8Z00MJT4aIEATdBezfZ9MCZvDQyV/ArCZBNedyD3zwaJR
+qnx7qsJ9nRC6ic9WyXYuuzwm1acxdaMarAuGLrzQRHKTuQt3+pa7fvBiedoZi9hk
+2npRYH37pJFRJ0RTLVF1t+Xy58SDN7ayUYxWi03ijJbDqPUFBOUJv3UNAlAiJ8fh
+whZN+qYZe2xRSiPBRAw2lR/q3+hs0svSv+NFzeDOC1GsJrnFHMxFCHKYR8fBwInz
+qSVKOMLfGyQ0IkpSbuhMoEV5OblieFy812s2JYXemm3JNN/yWm6P9QOoidY8t9ae
+iznbAgMBAAGjfzB9MA4GA1UdDwEB/wQEAwIB/jAMBgNVHRMEBTADAQH/MB0GA1Ud
+DgQWBBStkoGifGfUAdJQR0CPbgsRV0d1CTAfBgNVHSMEGDAWgBStkoGifGfUAdJQ
+R0CPbgsRV0d1CTAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDQYJKoZI
+hvcNAQELBQADggEBACXYgkrDvlrqKhYU9pFiiDaD35PDFMJ6Ah8XLp30+11Z2ORd
+86LLj2iUmi91NF6rPr/yt14hDjkh4bu3FSAsLQ0p/PdhAmaGW2rbi+nA3Iy62t5E
+7ahbxeyNrE1e6zBv54WRmRwAdPu91FUH8ESBDR02rwO2dda+Bf4MoJINPRNIiWgV
+ifMpOjrOuXEIn5UNjsKm6FHHKMjkNKJc11W88I35PP1mwBawAWh34g50gTf5mz6t
+FW70pNZjUYwsUZVz3yCAVm6/VM2GG1KKm+8H6VZMxZb4gqroGEqpiky70SrDFjpk
+KlDuPQ0aj1NCxXtPCn2QWJc4iA7B3T997Td8GKM=
-----END CERTIFICATE-----
-----BEGIN RSA PRIVATE KEY-----
-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
+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
-----END RSA PRIVATE KEY-----
diff --git a/libminifi/test/resources/nifi-key.pem b/libminifi/test/resources/nifi-key.pem
index 0fd6eb0..9dfc916 100644
--- a/libminifi/test/resources/nifi-key.pem
+++ b/libminifi/test/resources/nifi-key.pem
@@ -1,27 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
-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
+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
-----END RSA PRIVATE KEY-----
