From 3d487a538188d11980da01c62295e67080c68ad1 Mon Sep 17 00:00:00 2001
From: Aldrin Piri <aldrin@apache.org>
Date: Wed, 6 Jan 2016 14:07:41 -0500
Subject: [PATCH] NIFI-1354 Using the newly generated keystore and truststore
 throughout the code base and updating an associated test to utilize the
 specified properties.

---
 .../src/test/resources/localhost-ks.jks       | Bin 1298 -> 3512 bytes
 .../src/test/resources/localhost-ts.jks       | Bin 891 -> 1816 bytes
 .../resources/dummy-certs/localhost-ks.jks    | Bin 1298 -> 3512 bytes
 .../resources/dummy-certs/localhost-ts.jks    | Bin 891 -> 1816 bytes
 .../util/NiFiTestAuthorizationProvider.java   |   2 +-
 .../resources/access-control/localhost-ks.jks | Bin 2246 -> 3512 bytes
 .../resources/access-control/localhost-ts.jks | Bin 957 -> 1816 bytes
 .../src/test/resources/localhost-ks.jks       | Bin 1298 -> 3512 bytes
 .../src/test/resources/localhost-ts.jks       | Bin 891 -> 1816 bytes
 .../src/test/resources/localhost-ks.jks       | Bin 1298 -> 3512 bytes
 .../src/test/resources/localhost-ts.jks       | Bin 891 -> 1816 bytes
 11 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/test/resources/localhost-ks.jks b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/test/resources/localhost-ks.jks
index 81be31d710fdf503eb62dbdd742bb01532cf550a..df36197d92ab8e9870f42666d74c47646fd56f26 100755
GIT binary patch
delta 2243
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

delta 43
ycmdlXJ&B9w-`jt085kItfS7UfCXP=mBKq13|JoP7yBU4PzKY@OS#!Cz{O15~k`d?t

diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/test/resources/localhost-ts.jks b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/test/resources/localhost-ts.jks
index 820e1e19fe11fb0506574e81509791220b52276a..7824378a3266565cff3d71b7c508ab2d60e06e34 100755
GIT binary patch
delta 974
zcmey(HiNJJ-`jt085kIt;FvQfKRGccBfq$Wfq^kdcvt2}2G$5YQv*u|2IgvmCgyU3
zCZ_lW%uI|-Of2zM6VnWM**LY@JlekVGBR?rG8p6-avN~6F^96S2{VNT!#EtmOwNvm
zq6Wes8Fpcw;KaO=L<Qgc`n=5KL_>a{AwY31VK&Et#N>=rLlFZZkN~$ZH$*_eFVij4
zP{=?4B+4v|aHD~oIIp3ZfuVt^k)g4Lp-B{oYiML_0Ob;LPCc4?D0NN~qY`p}FtRc*
zH!<=v7&I|*F*PwVGR!y-b78_&{p;J_RLYcZ=UG+1SDa__v{x0*-ad<3zZA~8xOkoQ
z<*YbswP<b${R`iw>o#n+30-hgTkQYkjI}#o^gj*LJL+C-Tl4qY8QIn9(z_X?HdxO)
z`L*cWq9U!vzn26;Ui5|CohwwiBk}AzzW-~s{5-}Tmnr;k@ARwXFTbt)72xsSV#h}#
zO`|V)$;ZnrKgQJ0tlkjt!;WS1K~DGNWN!KBcdYdqv1PJ5E25X2{TLaS9k^1lcA})0
z)&1nQ4)bL?40FQd-EVrmY>&D#H~0P?v2KRooCj8?y3D_<$@#-1p3$_`x*=uWi^RV3
zOs$hRem6DbOu8v+T=jPS<##DNKdyXS=*+~-$iTQ*(Lmln78v&RvV1IJEF#WRHs%Ok
zikINL$oqL(?z*+vuQv80ha)gy0mG4zAwgVf@uyi;DI6`{;%8s<^4bSG?+u;SoTblJ
zp1e3ILd{q$;E17W-jQ1iU%b-bu<140mh(|3Ag_>lQj4RFqH58p>abG*;q_~d?>F*x
zoc?uEQ~mL;%FBXhhg$BE)mrGec+=_HyIZ~2N63j@S++^!pVu+hok__neRM8;>wUN*
zb>^*j51vd`gXZ}Tj=d=!Z5Q2p8)B?EgtP6!|DK($dm-WAwXXk9U+SN8m>b$H+55Tn
z^-f3Qi)|}kFy(38X`WLzb<rUy*8;}>3tscaO}@TH^6ni~gHNk6O6sE@9b{T@Y4f2E
z9Z9RMCYGF-D3bku*DPTc=>=LX&s7$s^*`d*ejn9%aIY2bMxJP9k<cG|ytO{>IT!n1
P`p4puaMn}*zC8l~;k|7`

delta 43
ycmbQi_nVF9-`jt085kItfS7UfO6F*0ky~ZFX|^jL-k)tdC)D`-1N-PhcHRJNdl6Rv

diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/test/resources/dummy-certs/localhost-ks.jks b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/test/resources/dummy-certs/localhost-ks.jks
index 81be31d710fdf503eb62dbdd742bb01532cf550a..df36197d92ab8e9870f42666d74c47646fd56f26 100755
GIT binary patch
delta 2243
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

delta 43
ycmdlXJ&B9w-`jt085kItfS7UfCXP=mBKq13|JoP7yBU4PzKY@OS#!Cz{O15~k`d?t

diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/test/resources/dummy-certs/localhost-ts.jks b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/test/resources/dummy-certs/localhost-ts.jks
index 820e1e19fe11fb0506574e81509791220b52276a..7824378a3266565cff3d71b7c508ab2d60e06e34 100755
GIT binary patch
delta 974
zcmey(HiNJJ-`jt085kIt;FvQfKRGccBfq$Wfq^kdcvt2}2G$5YQv*u|2IgvmCgyU3
zCZ_lW%uI|-Of2zM6VnWM**LY@JlekVGBR?rG8p6-avN~6F^96S2{VNT!#EtmOwNvm
zq6Wes8Fpcw;KaO=L<Qgc`n=5KL_>a{AwY31VK&Et#N>=rLlFZZkN~$ZH$*_eFVij4
zP{=?4B+4v|aHD~oIIp3ZfuVt^k)g4Lp-B{oYiML_0Ob;LPCc4?D0NN~qY`p}FtRc*
zH!<=v7&I|*F*PwVGR!y-b78_&{p;J_RLYcZ=UG+1SDa__v{x0*-ad<3zZA~8xOkoQ
z<*YbswP<b${R`iw>o#n+30-hgTkQYkjI}#o^gj*LJL+C-Tl4qY8QIn9(z_X?HdxO)
z`L*cWq9U!vzn26;Ui5|CohwwiBk}AzzW-~s{5-}Tmnr;k@ARwXFTbt)72xsSV#h}#
zO`|V)$;ZnrKgQJ0tlkjt!;WS1K~DGNWN!KBcdYdqv1PJ5E25X2{TLaS9k^1lcA})0
z)&1nQ4)bL?40FQd-EVrmY>&D#H~0P?v2KRooCj8?y3D_<$@#-1p3$_`x*=uWi^RV3
zOs$hRem6DbOu8v+T=jPS<##DNKdyXS=*+~-$iTQ*(Lmln78v&RvV1IJEF#WRHs%Ok
zikINL$oqL(?z*+vuQv80ha)gy0mG4zAwgVf@uyi;DI6`{;%8s<^4bSG?+u;SoTblJ
zp1e3ILd{q$;E17W-jQ1iU%b-bu<140mh(|3Ag_>lQj4RFqH58p>abG*;q_~d?>F*x
zoc?uEQ~mL;%FBXhhg$BE)mrGec+=_HyIZ~2N63j@S++^!pVu+hok__neRM8;>wUN*
zb>^*j51vd`gXZ}Tj=d=!Z5Q2p8)B?EgtP6!|DK($dm-WAwXXk9U+SN8m>b$H+55Tn
z^-f3Qi)|}kFy(38X`WLzb<rUy*8;}>3tscaO}@TH^6ni~gHNk6O6sE@9b{T@Y4f2E
z9Z9RMCYGF-D3bku*DPTc=>=LX&s7$s^*`d*ejn9%aIY2bMxJP9k<cG|ytO{>IT!n1
P`p4puaMn}*zC8l~;k|7`

delta 43
ycmbQi_nVF9-`jt085kItfS7UfO6F*0ky~ZFX|^jL-k)tdC)D`-1N-PhcHRJNdl6Rv

diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/NiFiTestAuthorizationProvider.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/NiFiTestAuthorizationProvider.java
index d29be9233b..aa8a51827c 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/NiFiTestAuthorizationProvider.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/NiFiTestAuthorizationProvider.java
@@ -44,7 +44,7 @@ public class NiFiTestAuthorizationProvider implements AuthorityProvider {
      */
     public NiFiTestAuthorizationProvider() {
         users = new HashMap<>();
-        users.put("CN=localhost, OU=Testing, O=Research, L=Metropolis, ST=New York, C=US", EnumSet.of(Authority.ROLE_PROXY));
+        users.put("CN=localhost, OU=Apache NiFi, O=Apache, L=Santa Monica, ST=CA, C=US", EnumSet.of(Authority.ROLE_PROXY));
         users.put("CN=Lastname Firstname Middlename monitor, OU=Unknown, OU=Unknown, OU=Unknown, O=Unknown, C=Unknown", EnumSet.of(Authority.ROLE_MONITOR));
         users.put("CN=Lastname Firstname Middlename dfm, OU=Unknown, OU=Unknown, OU=Unknown, O=Unknown, C=Unknown", EnumSet.of(Authority.ROLE_DFM));
         users.put("CN=Lastname Firstname Middlename admin, OU=Unknown, OU=Unknown, OU=Unknown, O=Unknown, C=Unknown", EnumSet.of(Authority.ROLE_ADMIN));
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/localhost-ks.jks b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/localhost-ks.jks
index 97df54fbf3f81e0cbabc733d8abd8536142b140e..df36197d92ab8e9870f42666d74c47646fd56f26 100755
GIT binary patch
literal 3512
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
WG@HmQT{aQ-vhd|k(E@Xot^Et@(b**c

delta 2012
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

diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/localhost-ts.jks b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/localhost-ts.jks
index af722c908add699e22892420366195dc641d84bb..7824378a3266565cff3d71b7c508ab2d60e06e34 100755
GIT binary patch
literal 1816
zcmezO_TO6u1_mZL=FG`YPRz;3FD_wVU<?x8mHCl@HA2tSz><N1x!RzKx!j<MDSiPn
z6C)E7OT5*@Gy`5XPOUbNw(q=*jNGgY204b@2Apinp)72|OrgOr4u>$4v!kJ?fiOsh
zU6?00F|Q<1!8boIGda<aA7}<pm`j+=u^=%yBh^sEKnNtjEzAuOQ1Hui%QO@+5CDlX
z3nQFpAScdiXl7t&U}|J&Y++~;1>zbS85=;kbaqV>qY`p(FtRc*H!<=v7&I|*F*PwV
zGR!y-b78_&{p;J_RLYcZ=UKH^oM-d2R~63QK8sqv6wbQ1c%Aj-tT=16Xl@Dp3*V;e
zHf*;EU2s!d?EmGAwL4$*KMm76>RxSI^Y_{r+12XOyBVZ5SkF88wdmZUBCW>1mjpsy
z^o8A>D^$57@$5Uk|7*7VJjNZDDg1En^sD7BzpeZg;PKvK$44Vgqc3^M$IC50#>}kV
z5b(o}W%EH!_vB=5`RI47^%}8dvO6oHmz@0=8J8WnQn7ZTq?gtG<hBm;WjYLV!sOj=
zdcACqx-&QT{vNSzhTxnBR;RkmzpTmm!z7;3wAH#HW!{U#zVl42lQ@1iHRMdXDQjHy
zcKzjdDLX%|d|c?v#LURRxLDCZ-ar-@ld^m)Vk{!gQ#R%ZUW%9CyvX}`TJE~F*{?SC
zBL^ZdO#uUuks(1`YVoI8RVf@T-r{Fp^zzyVJMRsh)|{o!R-U{#DMHOyE#QcuYTl7s
z3tzm_;IQd6+LrTCCm^qoc~Xm`jiPGNsp_y(0pay)j_)_}cAWloQq%FT%FBXhhg$BE
z)mrGec+=_HyIZ~2N63j@S++^!pVu+hok__neRM8;>wUN*b>^*j51vd`gXZ}Tj=d=!
zZ5Q2p8)B?EgtP6!|DK($dm-WAwXXk9U+SN8m>b$H+55Tn^-f3Qi)|}kFy(38X`WLz
zb<rUy*8;}>3tscaO}@TH^6nkgPpdLY>Z2bWWLj})^PvwNNvp0VmYkR<lKp?zEMXSu
z1zIi7RTic7KjPPZAJuqpuN5yigR<sUW~WvHGo~AB^P^%!#<T@yOiN(K{0_~SVJ=*+
z4Y=9Zff@6h1q(AUTjs%XA|zW18t{Yi5{EE{UuwBRWPVY$p|F7<NQhmS%Qv;8D8C>-
zC$rcPs*X#TBPg{vHL)l;!%)D052TJ;m^~!5xFj<#9cRWgF)#(@MiUbYLkm#GG%*0?
zP$-w~?rCD&0nCOvupnUsa^#sB8yWuA2RF)=3TX!2_nM>k=E?JKg4=^^-n%dyma}iz
z7O0l#8tb4G_&d_JH{#d+qhEI!d^<fmH0OGwb%U%){-?Br?b$N}mM)n;{{>66fYKrV
z-7ByE+kQ;?hjsY#V=I=4^0WMI{&xAO++ilu5aB4XiALW_Kd;kHysq{BlM=J!+>0KJ
z$C*SKrY8jSiz;)U*)(Zq)1ucc+#e!jzJi?g{o#VvYqM?do!+xL#%xFU&dMq4cmJ|_
z)$}vmhufCDDLpVUyl>Z)NdISr>;jDqTRg=Im0$R1hzV~$&uP?iV%b9*v8wKnnqG|u
zi`U6%Z(de9F>i4__b)}$q>sOosu)$Q&n)@4Z$;pQ&K1q~A4WZ$&o-$$Ev}(DR5gXs
z$NJxSPc7!gRtAte7ABjPohmimJL!w=83*1S57xEkb0m5`p0y|T%0y91?Xr*$k!KcN
z@qQxIFmK}r4~|)iTkLXzMLu+2k#TdI871R(<Nu#4J#&<vbTIB!SncypXKq9FDh|VY
z4J*rz9J{Elp8e~U(8lt`428V&wKrumNeQdR%wNHzYZWy^*70k1*^fPF1xChYpRIZC
zxGhT#Mjw(m<ME`YSV0CQtuyO080avGq-|MkzgdSvGxpt^UF?^PEJ9kZRWpf{-1NJu
rdU*8;mWdbpUVjjtm1Fy1Vd#%N-ddmcoQwT0{bO-SIP0l@-<|;gF7cdb

delta 713
zcmV;)0yh1a4!s9T{_Xzl00002000010000200nJ%Yh`%=00BqUSJTh{1z0XMFgXAK
z1Aj1r1A8!n0%M>90s#U71OZl3%`goH2`Yw2hW8Bt0SlAm19=!YF*GqYGBz_XS{Ds5
zHZV9bGch(YHZw4jb_8^jPXQi(pU^>MGCc2K`xji*04pFp<V$WMg}kO3M)@7;Qdfj<
zaTmQwR#HbT!F?)!)UH<9q`To+^!C6kBjry)T_HVbpPgZeBj!V4nsud&X&NMOH^StM
z=H|#dPjWTgjf*RSmWR*me19i>wHL~9nwXdVTPWY5Zi6mo1*SLVjU5AjpnR5d!LORQ
zqnN1k6Cv91#9&p3<wm-qODoqIoCupf)gazVw7>w#a~OFD&b73Ar42?H@~n2}3J3*s
zd|EtOMTV!hHTh@w&OWkeMD{6LSg|iIM<H<EF_NI*o{UqHO&<)3BzRa={+3sD7RIHf
z>v^ds)aG^#KB!-dvWnw>lZ^rc0RRD`Aut~>9R>qc9S#H*1Qd-@%?1aAp>f>8a9;V{
z8^~?n#9J^81_>&LNQU<f0RamI00V*n0RRP~jLtydlE@H+ysbTEqDeslzhQ2U4m7x`
zJ8HBU$L!ermB3CJZr7wsogOW)sZ=wi?E{y&Ha*b&a^yw#2ZzLe&J&WJ%`f;*{^b``
zwJfUn>dH-6TCs#})Yms%q|3Q&puWwN6_SYS`g*q=)t-cHvZ`+qX2;8}Z!6+1yY@y9
z_C32(HAKYmd&WBc5I-hrDM^5U7sm-LxF5m5`nIx)DrI^?&Y!pV1~W>S6TPVti)mJ-
z>V~KOT!^eOnq@##%?R{;D^|(Ys>8Gbi3`1jlPR`I6sZ^pkZzfyt+tKVHhK#Qa|p}c
vFx{+mFO(OnRt8$4S|{Xx8|zyF-rtyh-LQJ=u<3Y|es?oA$5^=8NT)OGU7k6B

diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/src/test/resources/localhost-ks.jks b/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/src/test/resources/localhost-ks.jks
index 81be31d710fdf503eb62dbdd742bb01532cf550a..df36197d92ab8e9870f42666d74c47646fd56f26 100755
GIT binary patch
delta 2243
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

delta 43
ycmdlXJ&B9w-`jt085kItfS7UfCXP=mBKq13|JoP7yBU4PzKY@OS#!Cz{O15~k`d?t

diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/src/test/resources/localhost-ts.jks b/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/src/test/resources/localhost-ts.jks
index 820e1e19fe11fb0506574e81509791220b52276a..7824378a3266565cff3d71b7c508ab2d60e06e34 100755
GIT binary patch
delta 974
zcmey(HiNJJ-`jt085kIt;FvQfKRGccBfq$Wfq^kdcvt2}2G$5YQv*u|2IgvmCgyU3
zCZ_lW%uI|-Of2zM6VnWM**LY@JlekVGBR?rG8p6-avN~6F^96S2{VNT!#EtmOwNvm
zq6Wes8Fpcw;KaO=L<Qgc`n=5KL_>a{AwY31VK&Et#N>=rLlFZZkN~$ZH$*_eFVij4
zP{=?4B+4v|aHD~oIIp3ZfuVt^k)g4Lp-B{oYiML_0Ob;LPCc4?D0NN~qY`p}FtRc*
zH!<=v7&I|*F*PwVGR!y-b78_&{p;J_RLYcZ=UG+1SDa__v{x0*-ad<3zZA~8xOkoQ
z<*YbswP<b${R`iw>o#n+30-hgTkQYkjI}#o^gj*LJL+C-Tl4qY8QIn9(z_X?HdxO)
z`L*cWq9U!vzn26;Ui5|CohwwiBk}AzzW-~s{5-}Tmnr;k@ARwXFTbt)72xsSV#h}#
zO`|V)$;ZnrKgQJ0tlkjt!;WS1K~DGNWN!KBcdYdqv1PJ5E25X2{TLaS9k^1lcA})0
z)&1nQ4)bL?40FQd-EVrmY>&D#H~0P?v2KRooCj8?y3D_<$@#-1p3$_`x*=uWi^RV3
zOs$hRem6DbOu8v+T=jPS<##DNKdyXS=*+~-$iTQ*(Lmln78v&RvV1IJEF#WRHs%Ok
zikINL$oqL(?z*+vuQv80ha)gy0mG4zAwgVf@uyi;DI6`{;%8s<^4bSG?+u;SoTblJ
zp1e3ILd{q$;E17W-jQ1iU%b-bu<140mh(|3Ag_>lQj4RFqH58p>abG*;q_~d?>F*x
zoc?uEQ~mL;%FBXhhg$BE)mrGec+=_HyIZ~2N63j@S++^!pVu+hok__neRM8;>wUN*
zb>^*j51vd`gXZ}Tj=d=!Z5Q2p8)B?EgtP6!|DK($dm-WAwXXk9U+SN8m>b$H+55Tn
z^-f3Qi)|}kFy(38X`WLzb<rUy*8;}>3tscaO}@TH^6ni~gHNk6O6sE@9b{T@Y4f2E
z9Z9RMCYGF-D3bku*DPTc=>=LX&s7$s^*`d*ejn9%aIY2bMxJP9k<cG|ytO{>IT!n1
P`p4puaMn}*zC8l~;k|7`

delta 43
ycmbQi_nVF9-`jt085kItfS7UfO6F*0ky~ZFX|^jL-k)tdC)D`-1N-PhcHRJNdl6Rv

diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/src/test/resources/localhost-ks.jks b/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/src/test/resources/localhost-ks.jks
index 81be31d710fdf503eb62dbdd742bb01532cf550a..df36197d92ab8e9870f42666d74c47646fd56f26 100755
GIT binary patch
delta 2243
zcmbtVX*3iJ7oN?8F}4v>Bg<=TFf(K~S+W#rvQ>5sGK?)W6`Dn48~YZ@)?4-lCBkP5
zQFf9og<i%^wiG^{@BPkse|>+xANR-e+;i@8?{n_CH;J?6B;{cFU>N`afc_33fP>^q
za3Oj41_S~CKnq0ew-x|^4Tz>g_R-u>&NEOT1Sk*U0|MCq5ITgV-J0Yy(8Jri89sQS
z+h8y54A`Mr!+*oK<b$Z^4R|C^vJ+^=tZ8d9rc_*w-0AGWEwDolO|x~HdD7HK3!oZM
zvQouCCfJ1Uf1*XZRHE5S$}bNZB>RrlMQt={3ZsbXM9`>CMu7j}-1~zC)=-v;(#=id
zS;#T;V$h2paS7EsW+-*mKxO{H@|c`f5`s%quO*F{kQh=J#PKO=^3F)Ir%@$4O}9f~
zqquoFc+Ed3tE?04I+7E*nj%sVq<%=jteh8*B><dscdaa^mFtv#0);cqXYIw^3lijz
zkmYNlPxezQgBl7xwVryYS(D#OoeptCCepIoU|P)HAy$6?LabBvV^1BFgWEPU%9pP~
z#&D&0YNtK6xv5c%#-u$+RNE#-NbyT){Pp8ip?9FocZF)^_f|O<TGN{PZV4q^R*1&H
zd&(cPZaaTVfxZRZJ7LAppMAtpTLyQhZmWo;^S_KtoyV6h->dJpd#N<bvKzW=;*hSn
z+NF;Q+mTbK;_}2cp1D4%5&97qf1mYPN_XaquA%Xu;`kcl+v_Q-(TP0x0!)D<F2uL#
zt0yb38sy2<nZKSAQ{sCUGe&WRKWD{K2U2;Z3aN@$xhp5V+83Wm-X4qV&~bp>uE?`R
zWfenPj=^Qn@q{XG=f;K_`ojh+WRu*2?@`swP^8z(T+m#s?m&5I<nad@@)kXgpYdBC
zeHX&)6=)$^NaPJzJ%2J2U%6B_XWNzQC8IIgojGgRUD|*!yEjo1LQx2!`6DkW`I~LR
zMQXoV^zm1=@T$Mll=J7h`O#dU!tvettv^3`iIr?jO?O&MRqZWfQk|9*)$Oz>!Ph6T
zW-+*W)?H}MzIXxeI@7mSgyx4^rs@zSb<2#dxOzA%MMkf2w#1`Ugw7u*yl)~+%(i0%
zFSRGA8L!61>J!60QBK7h9%!3D%|&_||InvBy>1`z{LZk_#jHtG?xD1P?i)AX;Zcvn
zS(_4O+lT)418L9MEgQL~SU<5tyfoOZFKuY4r|2S+Cg#GsWL^UI6jpofkd3X6frVQ|
zA}jE_?1rj)$jiBSmJyHK2g@NH3uQm?bE_zF_|RC0t)?WB@~tDuxqsfAw)^=`oRAuG
z9Cn?QZph)H0+7^)BialHq>Vl5+l`7Mhb6f)S8K`UPpR5k@=;l#RzA?}3RWoR#{Q$}
z>GJH)&W+<U*<ZFg-QaobdgTZ1J^N+J?c-tnW{e!zS+*31-jPl@y*b>uw^@8n&z?9B
zt>of!u^(WR8t<U(=FGgjUn|o>yY2}T_tLYvkA4Nt5_%Z+0q;yQ+^(D~BJq!1z5=c%
zj<_j4<(YG1Fp`J&1L3k6qG0D!zJ1-8DJU}8j5ODGK*QnE)6`N5ijL<e7VJa;Gfhsf
zk|f%no1YYZ5Z)|6ZmsouDbqctj;o5!8O}17a2=!6vrn2z{;F#Jar*31E7u71^-q;0
zQcSySitbx%T+?T5F`#%+bj}to9yPsqsV-d9Syb|JT$FQAcA<B1)L+bIi-cb}=v%J}
zuV$8wuV`(k<D#hB!I`ziKp^>z>2rihYqYG4A)i?8{gKqSszwOe+Z10Y6fYdg4idR}
zbI^}6fRsO6nD#0gx98ejR9k2Wc$wAENE(?U*l4=-CE(EJ|I*KH#Yl`<VG?=|>|!h1
zs*f%u5Wsd#@hn;c000N0>0mON4syx`gMc6q#7Q&J9Sw(a$VZq&?7)FQ7#jdh!obiR
zP_Q)wiU3(#{ui(#Kn8j^%yBg0cj_2|%hJUs&_&GL*M~@O!SEavIificP(42vf`=PM
z0L}lKfFWT2A;c~bjflxQpc52TGzNVZi&0j`sMrd@F{&7>GWu`$zoh>^Weh)>_jf;F
zMDhp-PLcTM%tyZgOb7A+&~zXthz<k-GMeoB5{8vVs+aDbBERM;ZV=+CN?W*NU}}~h
zzUiOYUr??!=;^2>Z3h!p>f26NpuX0&&K*4?csS@$Ry!a6%|@}!I9MlS|KkT_iOk75
zfCy9TN$1wBp8Q+#wEY2It9eSC&E#YLyEQJ|E8K^rFMqVd9Epgp4e7&V)^^bz-egt1
zW*sYs-Si=JkTurr9|be<yEsTyGlwyO06T5B!bXvGxQ(p6WB0Us{ko&ql_K%b#1j`a
zrw9>|YR^!BY@5@@qZe5ZZ6_XkPt^;?04zygG`phJHcLsrKtdk$R}?L(>yvqxxL#0r
z68ld&m6SA!RKB<TVsOQ^cD-oE-v9&#0)PeL=+kKAk!wh9h#*A3Af<xDH{c}9(GUNg
z=3QRqwNMfNPaBU`=g3ANz*$J7U?cOMEBgaeq3(GG{G6phgLPV%rxKJ*D7bM=T3H%T
zd5e+qc{`RjzaY!5&A?WZ)=_vLe{j+RJ#BHRTV266UHGe%(vC)~sb2b461`(f@|k6p
zwZ<EyeBOnE%J-p@uS{QD6FolktWx0MV!L7O4MLF_YG9l3wZ`qyn3D+?kqsS|qpQbo
zHHqjqW>D?5*b!d1tNY#Q3VqJaAEOT)zp<2hbRS#CoM3zpU98np?vE&%2l>cPgk|4P
z&2JGg^aCE|F2Ws?M@mmjPDpJOdjwMKrkg>9163_+kvEEmT>{@F3V0p9$wWX-=E^^q
s`y<~yewydZsx7U#K@(oVwE+>ZHkH3Jm0iAkN!HuaUo=e*BFJ3(H(8G3Pyhe`

delta 43
ycmdlXJ&B9w-`jt085kItfS7UfCXP=mBKq13|JoP7yBU4PzKY@OS#!Cz{O15~k`d?t

diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/src/test/resources/localhost-ts.jks b/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/src/test/resources/localhost-ts.jks
index 820e1e19fe11fb0506574e81509791220b52276a..7824378a3266565cff3d71b7c508ab2d60e06e34 100755
GIT binary patch
delta 974
zcmey(HiNJJ-`jt085kIt;FvQfKRGccBfq$Wfq^kdcvt2}2G$5YQv*u|2IgvmCgyU3
zCZ_lW%uI|-Of2zM6VnWM**LY@JlekVGBR?rG8p6-avN~6F^96S2{VNT!#EtmOwNvm
zq6Wes8Fpcw;KaO=L<Qgc`n=5KL_>a{AwY31VK&Et#N>=rLlFZZkN~$ZH$*_eFVij4
zP{=?4B+4v|aHD~oIIp3ZfuVt^k)g4Lp-B{oYiML_0Ob;LPCc4?D0NN~qY`p}FtRc*
zH!<=v7&I|*F*PwVGR!y-b78_&{p;J_RLYcZ=UG+1SDa__v{x0*-ad<3zZA~8xOkoQ
z<*YbswP<b${R`iw>o#n+30-hgTkQYkjI}#o^gj*LJL+C-Tl4qY8QIn9(z_X?HdxO)
z`L*cWq9U!vzn26;Ui5|CohwwiBk}AzzW-~s{5-}Tmnr;k@ARwXFTbt)72xsSV#h}#
zO`|V)$;ZnrKgQJ0tlkjt!;WS1K~DGNWN!KBcdYdqv1PJ5E25X2{TLaS9k^1lcA})0
z)&1nQ4)bL?40FQd-EVrmY>&D#H~0P?v2KRooCj8?y3D_<$@#-1p3$_`x*=uWi^RV3
zOs$hRem6DbOu8v+T=jPS<##DNKdyXS=*+~-$iTQ*(Lmln78v&RvV1IJEF#WRHs%Ok
zikINL$oqL(?z*+vuQv80ha)gy0mG4zAwgVf@uyi;DI6`{;%8s<^4bSG?+u;SoTblJ
zp1e3ILd{q$;E17W-jQ1iU%b-bu<140mh(|3Ag_>lQj4RFqH58p>abG*;q_~d?>F*x
zoc?uEQ~mL;%FBXhhg$BE)mrGec+=_HyIZ~2N63j@S++^!pVu+hok__neRM8;>wUN*
zb>^*j51vd`gXZ}Tj=d=!Z5Q2p8)B?EgtP6!|DK($dm-WAwXXk9U+SN8m>b$H+55Tn
z^-f3Qi)|}kFy(38X`WLzb<rUy*8;}>3tscaO}@TH^6ni~gHNk6O6sE@9b{T@Y4f2E
z9Z9RMCYGF-D3bku*DPTc=>=LX&s7$s^*`d*ejn9%aIY2bMxJP9k<cG|ytO{>IT!n1
P`p4puaMn}*zC8l~;k|7`

delta 43
ycmbQi_nVF9-`jt085kItfS7UfO6F*0ky~ZFX|^jL-k)tdC)D`-1N-PhcHRJNdl6Rv