From 9d2144ef818436e7432235040d22b57c1c81319e Mon Sep 17 00:00:00 2001
From: Connel McGovern <100574906+mcgovc@users.noreply.github.com>
Date: Tue, 15 Mar 2022 14:57:11 +0000
Subject: [PATCH 1/3] INFRA-1735 Teams notification's for C4 (#7112)

* INFRA-1728 set correct java version for JDK 11 base image
---
 .ci/dev/regression/Jenkinsfile | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/.ci/dev/regression/Jenkinsfile b/.ci/dev/regression/Jenkinsfile
index 13ef2be4c2..1fc0d187ed 100644
--- a/.ci/dev/regression/Jenkinsfile
+++ b/.ci/dev/regression/Jenkinsfile
@@ -7,6 +7,7 @@
 /**
  * Sense environment
  */
+boolean isReleaseBranch = (env.BRANCH_NAME =~ /^release\/os\/.*/)
 boolean isReleaseTag = (env.TAG_NAME =~ /^release-.*(?<!_JDK11)$/)
 boolean isInternalRelease = (env.TAG_NAME =~ /^internal-release-.*$/)
 boolean isReleaseCandidate = (env.TAG_NAME =~ /^(release-.*(RC|HC).*(?<!_JDK11))$/)
@@ -39,6 +40,17 @@ def nexusIqStageChoices = [nexusDefaultIqStage].plus(
                         'operate'
                 ].minus([nexusDefaultIqStage]))
 
+/**
+ * define an empty teamsWebHookURL and if it is a Release Branch
+ * then set it for the Corda 4 Jenkins Connector
+ */
+def teamsWebHookURL = ""
+if (isReleaseBranch || isReleaseTag){
+    withCredentials([string(credentialsId: 'ms-teams-webhook', variable: 'webhook_url')]) {
+        teamsWebHookURL = "$webhook_url"
+    }
+}
+
 /**
  * Common Gradle arguments for all Gradle executions
  */
@@ -61,6 +73,18 @@ pipeline {
         parallelsAlwaysFailFast()
         timeout(time: 6, unit: 'HOURS')
         timestamps()
+        office365ConnectorWebhooks([[
+                                            name                 : "Corda 4 Jenkins Connector",
+                                            notifyBackToNormal   : true,
+                                            startNotification    : false,
+                                            notifyFailure        : true,
+                                            notifySuccess        : true,
+                                            notifyNotBuilt       : false,
+                                            notifyAborted        : false,
+                                            notifyRepeatedFailure: true,
+                                            notifyUnstable       : true,
+                                            url                  : "${teamsWebHookURL}"
+                                    ]])
     }
 
     parameters {

From a0aabe7b30b3407dbd70a37b4428b19dcb951c77 Mon Sep 17 00:00:00 2001
From: ConnelMcGovern <connel.mcgovern@r3.com>
Date: Tue, 22 Mar 2022 15:39:37 +0000
Subject: [PATCH 2/3] ENT-6716 Remove Corda OS image publishing to Docker hub
 for CE4.8.x patches and below

---
 .ci/dev/regression/Jenkinsfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.ci/dev/regression/Jenkinsfile b/.ci/dev/regression/Jenkinsfile
index 1fc0d187ed..f2e0df9d2d 100644
--- a/.ci/dev/regression/Jenkinsfile
+++ b/.ci/dev/regression/Jenkinsfile
@@ -11,6 +11,7 @@ boolean isReleaseBranch = (env.BRANCH_NAME =~ /^release\/os\/.*/)
 boolean isReleaseTag = (env.TAG_NAME =~ /^release-.*(?<!_JDK11)$/)
 boolean isInternalRelease = (env.TAG_NAME =~ /^internal-release-.*$/)
 boolean isReleaseCandidate = (env.TAG_NAME =~ /^(release-.*(RC|HC).*(?<!_JDK11))$/)
+boolean isReleasePatch = (env.TAG_NAME =~ /^release.*([1-9]\d*|0)(\.([1-9]\d*|0)){2}$/)
 
 /*
 ** calculate the stage for NexusIQ evaluation
@@ -307,7 +308,7 @@ pipeline {
 
         stage('Publish Release to Docker Hub') {
             when {
-                expression { isReleaseTag && !isInternalRelease && !isReleaseCandidate}
+                expression { isReleaseTag && !isInternalRelease && !isReleaseCandidate && !isReleasePatch}
             }
             steps {
                 withCredentials([

From 9e99af2355df53b8a69c20a099cc40ea7b7aad94 Mon Sep 17 00:00:00 2001
From: Adel El-Beik <adel.el-beik@r3.com>
Date: Wed, 30 Mar 2022 16:35:40 +0100
Subject: [PATCH 3/3] CORDA-4239: Regenerate test certificates with 10yr
 validity.

---
 .../internal/crypto/keystores/bridge_ec.jks   | Bin 1163 -> 1162 bytes
 .../internal/crypto/keystores/bridge_rsa.jks  | Bin 1803 -> 1804 bytes
 .../internal/crypto/keystores/float_ec.jks    | Bin 1161 -> 1160 bytes
 .../internal/crypto/keystores/float_rsa.jks   | Bin 1802 -> 1804 bytes
 .../internal/crypto/keystores/gencerts.sh     |  40 ++++++++++++++++++
 .../internal/crypto/keystores/trust.jks       | Bin 502 -> 502 bytes
 6 files changed, 40 insertions(+)
 create mode 100755 node-api/src/test/resources/net/corda/nodeapi/internal/crypto/keystores/gencerts.sh

diff --git a/node-api/src/test/resources/net/corda/nodeapi/internal/crypto/keystores/bridge_ec.jks b/node-api/src/test/resources/net/corda/nodeapi/internal/crypto/keystores/bridge_ec.jks
index 2e74e4d29301ae96e90d0149d50817f7667c816a..f0a6921cff2767ab695f478ef30aa1e96519db64 100644
GIT binary patch
delta 699
zcmeC??BbjtUtfPa<@ad@28McrS_3{dE^RhO7Dg>5K}JSa2A1qkjnP-mzm&GVDtX)F
zUgq38t9A)=tTLXt#js|Q@vSq}%v;V(cei^nN%EGC*rYYn&SgGLIw9CywC3oSb8FA-
z3vqlDrf_`yBGJYzg%Zz?v|IO|X)B+S%Ay{+*0rg0c}7~jSF)P6`7D=Gn;ij1q=9Z=
zVqlHXGc~YeU|{@X(8Txyi03X~W@2PwV&SiwojLg;Q;f8ck%6(XfuX6Psew_HIIl5~
zYh(`LPIh3-NL60px9QgUTiK5TB=?95^x2)<zr%vxdi&v{w=E^b9xz2qt6c1ub1lMS
z|M%W~iHln5pIfY3vqMnb<(7@}dF{u0KQAsc$TyH@V-A&7W|1%uYY=IQi90_1{6ksO
z%NY+??oH<Y6CK+(nU~3`UT3c8;nx|vmkL$BSdqE@^K}oA8~O%3Y#dr`9_MUXn3-4^
znB5r+T$mJMDwJ8(#aYYG?fh~;_|>Gp6BV<bEqK|yra#6}@0um^7bXR*oZmn55_uI3
zbzZGBS#aXI{FfiX`N}ubX60VKE`Rf79wJ<J0>fl05JxWHf&>g_de}x#z{tP@#>CVT
zIbcBC$@iJOCr@FPa`=!bcvWHg?Mdpd^w!*}iEV7(8!4s#TI9^_>Sb;7TYO(xUK2m{
zMMs~@zjLNktahhFEc+^znwbxcud>dYV*G2(iplSoW$Uqp2%5(|7z|vQ6d7KntY*5r
z?@v727yi$0l51qvWF@+H6y>vtc&;;>R1*7*Nx`A_m-I!uW6P>l1&ik%JyYVc(Ep*P
mw~#?@(am3>Mwg~Yy;)GC{><#!vhRzV4}6%@e%?cau^Rwg*%&nd

delta 682
zcmeC;?B<*xU!VDC!Hl^K3=H)KwFZ1_T-t1mER0%Af{cu;3@q8TAt}6y))zu%9q@kL
zvf9dH!cmF!QnR1RX#II{X5TAYM{{kydy6tNL>g_J#EivvzcrkESBItj^w$Y?mCTb@
zp4#s|ce;M_E`Bblsk>IJTDg+nfp_a>34R{YFKim(_i|p`n9{9Xc$vAUHP*+S4d@0Y
z2G$5YQv*u|2FAYzO^iQ*c<usbCPpSEmXwD3lP6zbijg+7G%ztRHn21`HMWcr=LK@j
z4U8b%$qtMesSA(Z(Vx$)&k*C=^5gVD!TX^zJpQqVzm>H;z9{X}kBO_TK210M*CKG`
z?uWTr-X>2D%(K|1Gw%Rf-7ifyu9HIQW{V3A@(twKm_uciStJa^8bmg0Nr*Ju_sWvF
z{l<P4&rY-YcXuC8=4G-HF}k!TpyWba^~^T^;*TC0e;emZn@pBt5lc9|dqY~sKbaS7
z602=Ol2uY?p15DP-1p&4dnTui%P$A0Fe!u{kK7!d@O0bPmE2#1%S@#go~-%jedB-P
z*8|D2b?H(jh;Y~m41=ve90?5viBk(jK;a+*4+j$iP&gPF8X6f{0K);qoqUhUd-7yv
zDThn{^XIO8+O=En_t!MWTU%NL_rAFDW%6W=`_Z+Ej|D_3U9Se^JBo7Z_ytO(#~%}W
zc4E%nU4PCPJiNAiM%}Tq^ZO>hWtOeS761l3Y#dr`9_MUXn3-4^m^~N_T$vQy^#Ybk
z%4eH4O_;>%FZtj#gPU<#mt^HH&Ob`JE?wR)m=qZ%FOLnn$W-cdEB)M=uL~qU?^$do
oGW*+^8~5(JS5+Ol`E|QOt50`j&*gJMLGyCl7bLIwW63BA0Gz)Nr2qf`

diff --git a/node-api/src/test/resources/net/corda/nodeapi/internal/crypto/keystores/bridge_rsa.jks b/node-api/src/test/resources/net/corda/nodeapi/internal/crypto/keystores/bridge_rsa.jks
index ed41a57d6a8d1167f61d9a668328947839b5ece4..87224d4727e13e635b4eb1d20c0a85eaa3d0e890 100644
GIT binary patch
delta 1351
zcmeC?>*1RqUtfPa<zFEK1Jf>pCZ=r$d~96WY>X_7T1<kBjI0bSO-zeQFC@=4G2&Z)
z-rS#)!Shv!_-^q#%x72r`}XLjsG^E*lAdqlk;1Rv?~2T_H}N?V`zd=t$$!^Bo>ptx
zjAT;EjtTbuui9+#<H{_(_)msrajaWvGVbT3?79`h<HervCbiyvrP*D7yX?@Zi-H5b
zEY_c0u{VXUQ2Jn|T4p$l@Ov%J?)1uK0*o)CrFYf*QViC1Puu_ZSfgA0vP{v%tH11T
zVw|k)lf2b)%i<}Xb!F<_n-0Fxi1xWz#qpxtsnD;vhGW6oso$it=D++>XS|8`>hIUB
zTTd-n{+*-H;bVfOqG}{-{azo9e`1eA`%ho4$^IL@>G-L&X>6>#1>BG1o^$i@iQ1L8
z?f(+FpzK0n*3KIrcVxSqc$U|2d)cK0)3@@b9Ld)T`PJs2t^1zyZnskBfvek86H>#4
z!`uBLH_AFTx>`K@`|9B5HO1u~Hb!^n8P-=_s@kO`xOLU~yE{0;&-wZ5?}@6f^qSUf
z?IgHr<-$Fz?-f^M-VHJMxoX<BlfjE!MPp(Os#q^}DJ=^9?y&hy;e(ck_P^}bH=T4`
zdg(-C&~~dsO<QJUcAS4#b18g9^pc`SR&5+FniX%eak`z^r@EyyRi)tg?(K}sAJxvb
zE_Vr*cX>ShaN>R!3#pmCs(bnu8tHE~K3#uGPj=BGrw<Az>y!82ymhC%_tvrn0dhIt
z7?K5ZOMNW%*ZCgu`C&3e>HS^D_PR;VN3Q%6DE=$Y#*#F<-Qq>Wa@EEy-;c2H?Ws6u
zR(sB9!O5B7zZ+k-I5(K8UEch@ZKZ=!h1(P!(~WE!XD!-uNZnx8yxLdO5Ak-&z4h-u
zBC)SADa)hJ+)umsOz(a^Cx%_0y(QnU{QcMZz|*XP!RAh~RPhV(^r?P{P7@bBS!Nkw
zAzg8P{$+E4SdHVC6dtW?mR-vB;(^k=I}VlI-3-7q%)lC<XKG*xWH|#<v%NtR<C6u<
zOpHuSENovD+$IOI#>g2N85kQI7@8WI8W=~3^BM!WM&?kif!E|jR+Gsan2qaaYMk>B
z`Bv1iQ?PRSmo0Lqy+byJezi@NPkw!0V^yuryXY5l)cJ4m&-`+W&uRYjn}U<y|GKy0
zq`LUizabO0-8+5D>p}6HOC|=U4u@lmx~A-E+r3GNLs_|Pr^$y8T2F$eDonm6#8R1=
zTphs@%Au#=c>ZX?Yu-ABH(M_Bdo2%mr?2hK#LURRxVX?D-$0&?IaF4eMZ!R=L8K`r
z?)dcc4`od+XFOoJH<|lSbZp<`UKXqR?+(fbA1k`%x4!7jU#_<8%;vUFdImgf99nH2
z=WJP+nOGT^-5CsAm=w}ami;xd%a2WrU$47#^|qiL-!d(CF4N`Px8wQaS+<MCnG`I~
zR5GfE*C`kUD2k>|V%oWQmD^s<okHg6iWeg9=5(%y2QuSMU;u9g;>ZPDkWl7K58DU|
zWf^!Vo0wW6hcbveS%BGlvIv`$!-q`4s|wR^Pf~xSx8_z&Y-9W0NGbi-B4=(_FKe6M
z;`_?-n)s<NI{IAxoin9kwL2wZ*;lF5%zS8km37_}<6mo5OwMDIt;ZH3Xdd@qFmPp3
zWO$Xbn(6YsKk;l|_&>i%u8~=jmFV74l+PyOxz21-N$fW!1&7{W(iiQHEvr@)ES`Jx
uOo_`v|A(61LI$}-H-Cj1U7GTB>E!M$-}BBEU%$TU#`BGz)f0LccLD$-c}zV3

delta 1334
zcmV-61<Cr14vP+uAAf1$p-8U)00Ou$f&#QK4h9M<1_1;CDgqG!0R;dAf&!rOM9)6F
zgRh&|4tIpNzUvyRg1y=LXvHuF<U)SOYOtTH5$4@FxwaGTos3nZLBPo`i+k5sQXtfA
zoB6G`NDAubdOXyFs;Ls8RXUw}@v^GJ^{}N6j8|MA9LGN!3V(CA7=l6*S{u-r6fp?U
zk;sO7+W%bz`Rs~!JD7P&Ou{5QSW@szN)0-#$58{|MxPFhI?8Wt3*=;+Fzc-t2Vy$Z
zv=FylgFm-etpxz~Q#n=l1MjN7ss%-)$9b56yXq=B;p!x}7aD72FyUJTPQ~EN)?T$C
za41E5<9l4Ig@4jBoo4q63qbiK5awieNs`kxV$ZDn1CPhnf2{?PwNU`707L>FY5{+=
zcoAM{K}#-<-d<S3G$-R)6l(bhlBkaVz|WjcT73Ym{u)>j4*Fw#Yi+0A?U1HMQ4SZF
zS*dYQ%><T8izL(byN$xQW~Fjw!2MW&kO;joQv{&T!GGTa`^1O?>{9R^H>eB&9N8?f
zpRE0e2W`3AsjeN{Mx<$N0Hv~26K`eGR2l^mc6zxyAbp1UPoyMhGc4MZBBe5TwvPpU
z#Bd<x5kPAqEyDu2@wiWp_s}_m5Iivntp8SsGn7OD`-Rlzc3olUg7{CUR!uo4U~kQ{
zGKLrD^?%~oQc(UDJkO|dBx$0qqJD<#Ih!)2CHANJ6QW&R?Et#@`m{9Ew5>qK;sBQP
zd@Ryo??9;=mGsm|;$h2*0Jt|w{zdocc&S5+ENkvBCkG5@Mw+9KoTM|qPL_@`AexY{
zMn#rqo!`u9gMFz9&jijX<vJrqnPk88G<7dqCx1!I7U<Jx^a>-7dO-aobXIGO$3eY~
zh!#x28Tsk}DM4Syp&dN=O9WLZxo*kaecT9Mjg76rkOA)1teQ7PR=zR4G{0Jc00002
z00mesH842<00KlXf&xG=f&t{90|Eg80t7*I5rr@e1_&yKNX|V30|EsAFi0^AFbM_&
zRg)V7MH?|WFf=eTFgZ0gGBjEj4KX<|H!w0VIW;yiG?RM+YJZ~@=@sV|Yu1&gK;lyd
zW<E^Zm@Vdi1L1DqGY8_?$sM2%YU*~vQU0q%fwsMdFI1h$T}K1|M+=U13cRXSxVJ?^
z^ws;#CtNmbo}?p9I`TwYi+<vo1i>KDVg<|!vZ4@O6t~oPTFrX~5RrutoVjpgU_}%^
zRBe@{^ldz_TPsNd0|5X5qj4~AFdqg3RUIP)7%&!q6tgNA6oB7KY8>0_Kbj1=Hh=Ej
z<CBjBIut!!ud>AYr#0aOs9wA7O9&hV4(yYl1{7i-87bIHU9`l_S!(64@`xYlMTXcw
zN~J|4fOtWPTU~_00wDm;TE}pznSe-D@t1t+yb&}vXqO4i#r~|sI1Y%gx_Iya1z0XM
zFgXAK0l6@O0ktrK0a>5}0s#U71Q^Pp6q5u4TpTeuFf=eTFgZ0eFgaQm4Kgt?GBP+Y
zIW;seIa-ro1xu3^1{y%p|8JeG<%+v5`}Jl4+O&ibz39~RlanalTYVwp5EOYu)lzRk
z6$va(Q5t7o#unztoV~jI%rN2Br<i`m&7Y2wZw4I{vnm)AfZs}L9NX+anhd!%f9~Dm
zlb{9^SRh9(P^B3kYc+z9k_}H8;OhWJGj@s@dHM<bA}vIUOXvb20F$R(Qqcl+LfU7}
s%=Mrd^Sq-z6r1+U*xuhqdV0dy^>U2AO`+LO*we)5%<9B2!Vx+y^35(uzyJUM

diff --git a/node-api/src/test/resources/net/corda/nodeapi/internal/crypto/keystores/float_ec.jks b/node-api/src/test/resources/net/corda/nodeapi/internal/crypto/keystores/float_ec.jks
index c08d825b2f397a3784f85f49c4cbe7e178f4006c..bd7f2632260038e51f81b52a96be20eb1b8d9505 100644
GIT binary patch
delta 677
zcmeC=?BJXrS6_cSmC=`hfuY`@)_{+VOPh_6g;9%1kdcv<fhAj&b!+{xqxMq2cKu|$
zx!A7ntbg$>t|Gp*^HR&0UBm5jWFo3%H22v%T|V4%`P!wkr&2T@?UxVTf0KFD@AoO~
zwH4cZr{}t8EQ{Lu=jz_1|3$ktC>k+sik9E*pk!gW=Z)|_OFnJOy}j4Z)E_e61at!v
z18anysevT}1LJRlCdThTJZAwj6C)E7i?OEOx5?+3Vx*0X42+Ep3{4G94UD72d5wWw
zBXbCMvOQyZ>VYuPx}N-7vLf&8Hs<l>b4aC3{}lEu(9nxdv8!Gz`h)6j@6|#4pY-|p
zd6l9KI&0K@G`+N?ZLbwJmlR2T?RHpPXpnCp&&C`otIQ%{Al4w#6ccxR`uT^lrk67w
zu-u!>{U<uMZ!$NNRrbPz6Msxs;gFVyIityJ{^P}FwT&AMc-T0!+C0wLvM@8TGBCR{
z7`QMg6rc9p6X>z=W7YJu)s`1u?egZ>ToUYdOmMPMm%}Z|xBr+FD!i_7@AtM^#<j2W
z<K8!CQp-vf>?>-n`^IR!sZ>gNTJPkIOj0bI>0ui|K_CMU0uxh9<RAcXC*NiAo;-<J
z%Hcz%;8lg`w<oE;(pz(@CbqGCZ={s|YmqaztCzLSZ}EL)c}@J(7ae^r|IV3GvD%#y
zvFxi<YGyt(zREgpit(>CD<;2TmaWI;cQh}0Fc`QpDKflDS<Q5L-=BE4FZ`e1B-hBS
z$x3wZD9UFO@myy%sU-FrlY&F<FX@YR$Cg#A3Kq{jdZxr>q5nfoZy|%+qMN@$jV?`*
auz2KqeUtPTGn>4VZ?3K>G1#rZm<RwV*9Qv#

delta 678
zcmeC+?BtvvSD*Q4;jSVE28McrS_3{dE^RhO7Dg>5K}JSa29|7fZm09V8v1npPE*~n
z^y#r9R&Q@Kd)?>0u*y-y<ECHVzLSd%U!Jz=?UqaX%72$Ued9Jq`@tSjZvMK)eUscQ
zFU|k0K7n__qG>O-xVo&U^qjS3s^Nl`HyS@xo}Zt+{e@VNTn~e|c9eTtZ{?&7(Pw~e
zU}9j6&@(l#WME+YW6;F-1BmA=U}j=uVq!^pd}`w4b4)SPhL#2<2F3=Krsf9bQR2Kn
zuDO8`gge=uF+Fub*st3k1U}7MQZp}Gt$5Pc)X42;{BJ9~`6U%H<KtS><g<26;R<a`
zmCSk{Pqr)Ezr(m_{Vmt``b8Vwn<}ea`WwBt&>-JHo{c$FR+&Y@K&(MzvzCNN!+ozT
zncHvdXYuSbtABU*@nmi$s~n-enh!+`oAq6iMJ1M%F#GlYJ;Q9k!^WZ2=5fxJg_((!
zf!Tw>z?DgnVF!cL#>p#hpGdlVl-+-R<BsD8kIL+NE*3Jky6-dNL8gUF3QX#qNBoKd
zJTECTh4wA~JN<)4d_YvDXL4M7#Z#rFiWetuV3J~yIJHm&6b3TzFfcK&1crf;p`nqH
z1uzUi+{t&CyeCg&mU6iCKY#Apr(L`Cet%74ytSo8aPNyNUnWo1xF21s_*g)s()DUk
zzN09oj$fcudi*i5XD8<D-Sy{;!NY6IXVe`#JHK!8Yi8McY@WyFM+JAifTfc1*``es
zCh_`9K6uUGW?a@KS^10ekCLuSm-h=`C`?`+8+4JW)ah3GxieoENPgb4*iK~jw=*~H
h-FL65I&|}EYx}ZhPw}IUe-k7`QXJj9oI|@93jhHN7773W

diff --git a/node-api/src/test/resources/net/corda/nodeapi/internal/crypto/keystores/float_rsa.jks b/node-api/src/test/resources/net/corda/nodeapi/internal/crypto/keystores/float_rsa.jks
index c00779ae7e8d7c425fb60fa6b8b1120b4afad1eb..737826a534623079e5a01d88267505c85d564754 100644
GIT binary patch
delta 1353
zcmZwFdpMH|90&02-NiM_{W_dhI!3$=Ig$~{b|iIBGdAl;(UQt7C#Tn3LtAWab6g*n
zJW@S7ok%8WArg%^X{F>+$EGH?jGUwA>FGIt^vCace&0X8pXZyUaY-Y`6oMpSh*=m6
zXaSRfCQt*dYK4X);dnq34oAU|$v~CQ`K0i&MstOxyFx0iuIQ)aALXgXtX`+=dQp>H
zSLL5a&r;d#MyZxJU(Zb2w0rcF$q4EiPaw2TvJMqX=&tz!CLS|c&%&H(L7cPr>-Ptf
zQ$cfarPg~-WA<D-2o<h{k2V}E<a(a;UBQJU8qifW1BucD26dJd?ZJClAD0H7;crNv
zIp=TT9f2^`#J0igWp<!=r7OL|KcI6>Hu!#XS_*D3sPdVMtscHf>_#bSH53T{89!N0
z?cV1e&#0?_{5(kI3ArSt=N_t#dLDFYR{A^e)p16)ZlfV&>b{hduiz!IkEKqQWS+*l
z%$7zvP<3%1%??d-SIJj?*-4Pg#UBcnHauaZ`2G|`Eo#{DIjf;#(H8#1v8=yExrzN&
zmkTZ3bgmcnD&LCy6V|-=2mv?F9mh>FF2@&8=H?~jg;S3Vv2im2i^iUweYJr-zjal=
zv8Xz+NumzL3YDfJoBX%kMs`iq6OHQp%Huh<bkuEzB8+du(oT4ye$3M#OgYa8^O#s8
zYLjkU&Gstv|0H>rP!h!KBHrutMvQSPa6K%2avWIWc-rLikh$f4c*4HJV*#>`f|q^;
zHO&!L_Bb=e&0(pIs!j?CW<kf>5KCTd*<BXw1_hUx^0V5s<qbov?wqxW5wS47GF1G~
ztBC8}7B-qIv<Cjjb1PCS&SthNi)CrhOBtGPRmm>0x-eA~wbF4VR<!6rjYQphb#3M;
zgl^mJ>y_Lxul~L^gN=z$LJn7^vbjKf@x<_*-hx8Z!j<06%h8-3`R7l9OH)GuVb7Vp
zu^+lkYi;n@p*uPxXZh6(d0S<K8kWB=WRab+(5)+M*WGXV<MK9c+Co3Mjo3KTNQ=jW
z&TDgWTl<tCAE8D}Ye%(@mR~PyeZ(*n#l``2TK_!O=j;k5!^bNS02~026uxU5?*J;;
zlt2LO?7-~~+Z{lAs{RJM^+<618bLCTfwJcb5Co`n+@;*Ob|6^AIowN@Q!LaU*z_ju
zZ1lWV^!=6QT^BfmN9(j_*d;G|p8m?0N%8v$$1U)BhRFhDrq}(V09CV|7kwMW-M+x2
zv8?;v-${I0NVd5Kb748c=kVQ=+9FO3)h6ccES(#xg{DO#bJ|VqT&C?r1sTK}%&Y&x
zA6o?h2sjL0bq0(A&CrMdEDmV^>LuwU2h+O>`^T^jgW<1{qdc|MAR33qM(%`Ovo2<w
z8#o55Umj=&8LW<T-6mF`I$9Z@PU>?(A^;Q&L4tvvzz?tq*QWp{?`64!Ua&22m!%>r
z{3D-XZTXHCMA(}j<*EXhZ<Ic~p#H|sgiIPe91I)D6>*D6{k)%{wH*)U5V!UyzA3|-
z*M)DbU!dAoW|iZI1Yej<zA@W7IQ^gbOXO)Hym{JaBR6@3=8$=zgu8Xxrr~)ajg`?F
zXk;tZ>6M(XO)pRNnRXi1@0qu@RrSr}8_}#X4QNXBn-lqCc0;JLJUc~09WN4%g}z7f
z{pQn0uL6U2S3}VAm^oQ!qDjMvBVHHJMxk}c*LQGZXp4Zk8(U#4CU(}I-=Y~^+R+=c
or_y)K(pw9RJUgNYAPnSD37&X`(}vouvm%jchPuGG(gsfa4~lwLZU6uP

delta 1349
zcmZwFc{r2_90%}u=VD?88OMZiu4N2fgB+DgCKYRp;|Y@_MX7dn))6D7#;u6nT$5uc
z%dSvFm`deXxkjiQ4IvYeoE<i5_UU<go_(JE<M%wj@1Nh#^Sy*i!KD*9Cnt){x58lX
zMvx1y199k0MrZ&Dkl+dcfPx{p@Zx6uEX7uGT)=O%#HXy;H{nG^xf!aNrlLri-7n?#
zGMXXrNNVB|DuAl1NGD3|-4lLMO8)ZmJzl9f4RK`K>*}Y*fz<_s0Tbu@g!HMs)8r*j
z2vLWEu!6)+8nl;V!_&{r&0y=w#^Wyc2l{%5mnIvfGs}p`e&><{NAvd+N<CZSqN<bg
zICGE9aGMx<5hc{)b7$X9$^4vJ!DFS@efYg$g3*}}ET;?@9?V%(F=sA)-4giIpaV^)
zh_q%zi91{g;~{rNF~uhDvrzVxgH}DUPT8*)ectLWXrJaRsVd5vo{J8|3YgQp&8Kx;
zz1auUM#B<kyxqKR`PaQ~EF!1Z_ok^RoYKX-A)nb6<3i`ZbYEoD8OeLKhnm6fm10Dd
zGOwOsXO0R-+%YX)>;%lkin&4egU2HLJ~h9%+rL;KlhpU%S-w2#T?EXnY_z_KMPCl6
z*Ho?xJxk#f5{&$V%=c&h?U%Fir>8zU_0by#<c31s=YR}A7|SIFdu|L1AG$e1+R@lc
z0*71D?^<cbh;n7?$G3^SBR7)5?`HWpk;7(FW_nv3L;|Vl+IeYV(qWnP<AF8v20IJ8
z`~Vuqd#p`5BwBtOEi>5cj5{@UjWMU6Rhh&pJi&1#wxR;N!)q@5RlU9MBsPt<sD-k-
z<{Nsh&*=igm{y;?yG?aEXEOD0g~kzX#4<Z4Bb2pSY77`gsZeWM=I2cdWa+F9nH3}d
z?2A-V{fPcmx*pXhXXwd5ye-3JWo}|Xj+h@g+F50PUwx-%qyZ9oI7W6-z+Y)XMUU2w
zaA=nwF-6<EX$V8c1$67c`>HUx+1$ZYW9o}|o*plmEN@S5ENXfur`^3QVDq}!A+L+a
zT^73G&4!ulr8kxMd^VqaV&Z8vOtN7Z%FDzOw2^%Fk~Q0bTws!qfCF$i@{k5b2+E?R
zNeTOUb|4XO6b#&FCIe#75CP$+W@ZCgfaai$rIoq0j|x^2tw7562t^@Ia_-=&@E_xh
ztqP7C->!9B8_2dcOjt~95$$6bweJ|L?7u`jQNT~wV<k?0P!JTRs^D!g<u6!RSNl@9
z!S5_&OP80Nb8e>e7QM=#*M7F*d$k64@iw%t#2S6j!Ot}fy&M#4>G@bK)Lf<fu})A4
z%d?os=m9+DE!7suf~g~?jV9p;00vxVflN>njqudaMXG|z=kYZpRs8v}1HtMeb31vm
z4O=<$qDd$XY0G&ywsuU6i=3I~RqK!qBHex^RVV+qJ;D(NI>5EU<jbSCcgQJ0rcp?t
zt@y?<6oru2e1lF@7jYxX-)_LQly_A!NxWn=k7q1#mKN0GW9)p!z>kgWMoY7}WsL<t
z$bkk4cdg{S`J29*t9BIOAtd6E`VU?U&_=>bF*Bo3tR=kvM(7C22~t9D+12-znO`xL
zA~5-9H4qrS6Q^*0dSC^D48|DI+LQA5Na`~;=58en*@eC($gfRV+@5#8@k<vt{=76N
zrmed$4Pv4-{$GTT#(QZwnz)t_G*4M_)30D@gjch$z2@O5gvd3_7ae1V6sKvpHVi8D
zb$bdAvmXxX>00FzmhWA+!(aQ*H8?uv$YwttTJ2K`?YMb#yzFZRRwt(FqlYG`aP}MA
C<xDOB

diff --git a/node-api/src/test/resources/net/corda/nodeapi/internal/crypto/keystores/gencerts.sh b/node-api/src/test/resources/net/corda/nodeapi/internal/crypto/keystores/gencerts.sh
new file mode 100755
index 0000000000..f676de80d9
--- /dev/null
+++ b/node-api/src/test/resources/net/corda/nodeapi/internal/crypto/keystores/gencerts.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+# These jks files have been produced with KeyTool using commands from V3 Float/Bridge setup here:
+# https://docs.corda.r3.com/bridge-configuration-file.html#complete-example
+
+# More specifically the following script can be run on mac to generate the files needed. 
+# Trust Root with EC algo
+keytool -genkeypair -keyalg EC -keysize 256 -alias floatroot -validity 3650 -dname "CN=Float Root,O=Local Only,L=London,C=GB" -ext bc:ca:true,pathlen:1 -keystore floatca.jks -storepass capass -keypass cakeypass
+
+# Bridge and Float with EC
+keytool -genkeypair -keyalg EC -keysize 256 -alias bridgecert -validity 3650 -dname "CN=Bridge Local,O=Local Only,L=London,C=GB" -ext bc:ca:false -keystore bridge_ec.jks -storepass bridgepass -keypass bridgepass
+keytool -genkeypair -keyalg EC -keysize 256 -alias floatcert -validity 3650 -dname "CN=Float Local,O=Local Only,L=London,C=GB" -ext bc:ca:false -keystore float_ec.jks -storepass floatpass -keypass floatpass
+
+# Bridge and Float with RSA
+keytool -genkeypair -keyalg RSA -keysize 1024 -alias bridgecert -validity 3650 -dname "CN=Bridge Local,O=Local Only,L=London,C=GB" -ext bc:ca:false -keystore bridge_rsa.jks -storepass bridgepass -keypass bridgepass
+keytool -genkeypair -keyalg RSA -keysize 1024 -alias floatcert -validity 3650 -dname "CN=Float Local,O=Local Only,L=London,C=GB" -ext bc:ca:false -keystore float_rsa.jks -storepass floatpass -keypass floatpass
+
+# Export Trust root for subsequent chaining
+keytool -exportcert -rfc -alias floatroot -keystore floatca.jks -storepass capass -keypass cakeypass > root.pem
+keytool -importcert -noprompt -file root.pem -alias root -keystore trust.jks -storepass trustpass
+
+# Create a chain for EC Bridge
+keytool -certreq -alias bridgecert -keystore bridge_ec.jks -storepass bridgepass -keypass bridgepass |keytool -gencert -validity 3650 -ext ku:c=dig,keyEncipherment -ext: eku:true=serverAuth,clientAuth -rfc -keystore floatca.jks -alias floatroot -storepass capass -keypass cakeypass > bridge_ec.pem
+cat root.pem bridge_ec.pem >> bridgechain_ec.pem
+keytool -importcert -noprompt -file bridgechain_ec.pem -alias bridgecert -keystore bridge_ec.jks -storepass bridgepass -keypass bridgepass
+
+# Create a chain for RSA Bridge
+keytool -certreq -alias bridgecert -keystore bridge_rsa.jks -storepass bridgepass -keypass bridgepass |keytool -gencert -validity 3650 -ext ku:c=dig,keyEncipherment -ext: eku:true=serverAuth,clientAuth -rfc -keystore floatca.jks -alias floatroot -storepass capass -keypass cakeypass > bridge_rsa.pem
+cat root.pem bridge_rsa.pem >> bridgechain_rsa.pem
+keytool -importcert -noprompt -file bridgechain_rsa.pem -alias bridgecert -keystore bridge_rsa.jks -storepass bridgepass -keypass bridgepass
+
+# Create a chain for EC Float
+keytool -certreq -alias floatcert -keystore float_ec.jks -storepass floatpass -keypass floatpass |keytool -gencert -validity 3650 -ext ku:c=dig,keyEncipherment -ext: eku::true=serverAuth,clientAuth -rfc -keystore floatca.jks -alias floatroot -storepass capass -keypass cakeypass > float_ec.pem
+cat root.pem float_ec.pem >> floatchain_ec.pem
+keytool -importcert -noprompt -file floatchain_ec.pem -alias floatcert -keystore float_ec.jks -storepass floatpass -keypass floatpass
+
+# Create a chain for RSA Float
+keytool -certreq -alias floatcert -keystore float_rsa.jks -storepass floatpass -keypass floatpass |keytool -gencert -validity 3650 -ext ku:c=dig,keyEncipherment -ext: eku::true=serverAuth,clientAuth -rfc -keystore floatca.jks -alias floatroot -storepass capass -keypass cakeypass > float_rsa.pem
+cat root.pem float_rsa.pem >> floatchain_rsa.pem
+keytool -importcert -noprompt -file floatchain_rsa.pem -alias floatcert -keystore float_rsa.jks -storepass floatpass -keypass floatpass
diff --git a/node-api/src/test/resources/net/corda/nodeapi/internal/crypto/keystores/trust.jks b/node-api/src/test/resources/net/corda/nodeapi/internal/crypto/keystores/trust.jks
index b4ebeb70fc3f546a9d4694440ccc216f124ff4be..1252f7002a7c6a130c76ac3be08322e7eecdcb05 100644
GIT binary patch
delta 257
zcmV+c0sj8>1NH-u83ljaWccfm9vTD*XI8P1JX{<yGB7hUFflbTG&MO|7Y#EqFf%eY
zF*PwXH91<5N=uRd8bI)A5!E1<+ma{hF09&oU4e(aSsE|v6wKRuriPz{P3k$;7s~W3
zFA7hInHpUyi5Oi6sw8}w;WO0*o|H5Ctf-S&0UdvWTwceQ&*2?4(`euX-jfUbTV0MY
z3<d})hDgpm1OoyE00T$>Fhv3(0P19`0@J?yUk3CK^Xy}M9IR?#M~HH71{6uIHj;E*
z_5vV4jrtqWKE|edB@uI-#msa>p-<r{OA;_`a@qP-GSZY98T&VxPJ3F(D8%D`8Xy0o
H!z2O!1V(A@

delta 257
zcmV+c0sj8>1NH-u83k$LpXF(h9vTD~%ApjIJX{<xIWROZGcY+dG%z_@7Y#BoF)}hZ
zFgZ0eFgaS0N=uRd8bH$jZ=J2>in}iR^=1Luw1g48=+yL+lPKR?eIerz6nRC}Qg1;O
z2`o-g8fRa|7UsyDy}JC&FyYpxn1061pN^AR0Udv{Di{=i-%4s6+w4D@47oOc?%m@s
z3<d})hDgpm1OoyE00T$>Fhv3&M=nsM86Rskf{>C8PZ{9r07f%*iWzzO3H%~0M2bu3
z0wDmCr(IIf0(C;#XU@#^pc(VLqdpXy_RQGc-$#0S!rAqf8jiPF0R|#rr==1{<U(et
HN?QS)oylw&