From c24abf9c01193c43d08fe35e3d74407323debbd1 Mon Sep 17 00:00:00 2001 From: Alessandro Sorniotti Date: Wed, 3 Apr 2019 11:51:45 +0200 Subject: [PATCH] [FAB-15022] Basic-network support for new lifecycle This change set upgrades config files, scripts and fixtures for the basic-network sample. Changes are as follows: - configtx.yaml was amended adding capabilities and policies required to bootstrap a 2.0 channel - crypto-config.yaml was amended adding support for node OUs (so that policies involving peers, admins and clients can be evaluated) - generate.sh was amended adding the name of the orderer system channel - generate.sh is executed, producing fixtures in the crypto-config and config directories - docker-compose.yml is changed specifying the correct SKI after crypto material has been regenerated - finally, startFabric.sh has been upgraded to use the new lifecycle Change-Id: I201a98e3bf4d9717741539f572719aa687f4bb63 Signed-off-by: Alessandro Sorniotti --- basic-network/config/channel.tx | Bin 368 -> 421 bytes basic-network/config/genesis.block | Bin 6360 -> 8415 bytes basic-network/configtx.yaml | 174 ++++++++++++++++++ basic-network/crypto-config.yaml | 1 + ...23a9028332a846f05c5feef48f0e56cd74a6b1d_sk | 5 + ...da6f3b6b74925ed0d23061af4899409ba46ae6a_sk | 5 - .../example.com/ca/ca.example.com-cert.pem | 25 +-- .../msp/admincerts/Admin@example.com-cert.pem | 22 +-- .../msp/cacerts/ca.example.com-cert.pem | 25 +-- .../msp/tlscacerts/tlsca.example.com-cert.pem | 25 +-- .../msp/admincerts/Admin@example.com-cert.pem | 22 +-- .../msp/cacerts/ca.example.com-cert.pem | 25 +-- ...558dc7859c4fe458e262e674a6c23f242ea33d1_sk | 5 - ...5f3e54f7af2e4571d29275708c18b7331a8103b_sk | 5 + .../signcerts/orderer.example.com-cert.pem | 22 +-- .../msp/tlscacerts/tlsca.example.com-cert.pem | 25 +-- .../orderers/orderer.example.com/tls/ca.crt | 25 +-- .../orderer.example.com/tls/server.crt | 26 +-- .../orderer.example.com/tls/server.key | 6 +- ...6de813fd9d39302dbd8dc2a0b5535b31619db9f_sk | 5 + ...a8d0d7672785b685cb503bcb95e53dcc279fba7_sk | 5 - .../tlsca/tlsca.example.com-cert.pem | 25 +-- .../msp/admincerts/Admin@example.com-cert.pem | 22 +-- .../msp/cacerts/ca.example.com-cert.pem | 25 +-- ...09d6165268fba153211af1281f00d45f54b1022_sk | 5 - ...fae65d24b11b4eac59b53304e19107d08e6f19f_sk | 5 + .../msp/signcerts/Admin@example.com-cert.pem | 22 +-- .../msp/tlscacerts/tlsca.example.com-cert.pem | 25 +-- .../users/Admin@example.com/tls/ca.crt | 25 +-- .../users/Admin@example.com/tls/client.crt | 14 ++ .../users/Admin@example.com/tls/client.key | 5 + .../users/Admin@example.com/tls/server.crt | 14 -- .../users/Admin@example.com/tls/server.key | 5 - ...01851d14504d31aad1b2ddddbac6a57365e497c_sk | 5 - ...0315de6d6509a12ae17db15b1b7209c75ca27d2_sk | 5 + .../ca/ca.org1.example.com-cert.pem | 16 +- .../ca/org1.example.com-cert.pem | 14 -- .../Admin@org1.example.com-cert.pem | 24 +-- .../msp/cacerts/ca.org1.example.com-cert.pem | 16 +- .../org1.example.com/msp/config.yaml | 8 + .../tlsca.org1.example.com-cert.pem | 18 +- .../Admin@org1.example.com-cert.pem | 24 +-- .../msp/cacerts/ca.org1.example.com-cert.pem | 16 +- .../peer0.org1.example.com/msp/config.yaml | 8 + ...72a0ccfbfb42727480fb8c8d0223af321a7893d_sk | 5 - ...a71328346d467cf9ce32b59efebfe5ad8491707_sk | 5 + .../signcerts/peer0.org1.example.com-cert.pem | 20 +- .../tlsca.org1.example.com-cert.pem | 18 +- .../peers/peer0.org1.example.com/tls/ca.crt | 18 +- .../peer0.org1.example.com/tls/server.crt | 18 +- .../peer0.org1.example.com/tls/server.key | 6 +- ...3c8d2c591f745d1babc4d6d9cce0a1acc168acb_sk | 5 - ...626c1d6bb9bde197fd52d9e74715fc575425993_sk | 5 + .../tlsca/tlsca.org1.example.com-cert.pem | 18 +- .../Admin@org1.example.com-cert.pem | 24 +-- .../msp/cacerts/ca.org1.example.com-cert.pem | 16 +- ...e8b503e412fdb598477840617919fa88a346165_sk | 5 + ...91e62130f8008a0bf996e4e4b84cd097a747fec_sk | 5 - .../signcerts/Admin@org1.example.com-cert.pem | 24 +-- .../tlsca.org1.example.com-cert.pem | 18 +- .../users/Admin@org1.example.com/tls/ca.crt | 18 +- .../Admin@org1.example.com/tls/client.crt | 14 ++ .../Admin@org1.example.com/tls/client.key | 5 + .../Admin@org1.example.com/tls/server.crt | 14 -- .../Admin@org1.example.com/tls/server.key | 5 - .../User1@org1.example.com-cert.pem | 24 +-- .../msp/cacerts/ca.org1.example.com-cert.pem | 16 +- ...7c97e90f3952e379497dc55eb903f31b50abc83_sk | 5 - ...e229c662d0884350b9e3286fcc1d769e22e2746_sk | 5 + .../signcerts/User1@org1.example.com-cert.pem | 24 +-- .../tlsca.org1.example.com-cert.pem | 18 +- .../users/User1@org1.example.com/tls/ca.crt | 18 +- .../User1@org1.example.com/tls/client.crt | 14 ++ .../User1@org1.example.com/tls/client.key | 5 + .../User1@org1.example.com/tls/server.crt | 14 -- .../User1@org1.example.com/tls/server.key | 5 - basic-network/docker-compose.yml | 2 +- basic-network/generate.sh | 2 +- fabcar/startFabric.sh | 18 +- 79 files changed, 717 insertions(+), 518 deletions(-) create mode 100644 basic-network/crypto-config/ordererOrganizations/example.com/ca/60a3a0436468d6505527325c123a9028332a846f05c5feef48f0e56cd74a6b1d_sk delete mode 100755 basic-network/crypto-config/ordererOrganizations/example.com/ca/a0606a4a860a1e31c90a23788da6f3b6b74925ed0d23061af4899409ba46ae6a_sk delete mode 100755 basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/keystore/4d2f776c0fef8eac3f460a7c3558dc7859c4fe458e262e674a6c23f242ea33d1_sk create mode 100644 basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/keystore/7557b147fe249860e7eae055e5f3e54f7af2e4571d29275708c18b7331a8103b_sk mode change 100755 => 100644 basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.key create mode 100644 basic-network/crypto-config/ordererOrganizations/example.com/tlsca/270655cf5f4b8e67e0f29e7c66de813fd9d39302dbd8dc2a0b5535b31619db9f_sk delete mode 100755 basic-network/crypto-config/ordererOrganizations/example.com/tlsca/8d2186556c85d515e737d0c0da8d0d7672785b685cb503bcb95e53dcc279fba7_sk delete mode 100755 basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/keystore/1deeab5433fa6e5f045eb763109d6165268fba153211af1281f00d45f54b1022_sk create mode 100644 basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/keystore/4f9f167ca424595a28a1451e7fae65d24b11b4eac59b53304e19107d08e6f19f_sk create mode 100644 basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/client.crt create mode 100644 basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/client.key delete mode 100644 basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/server.crt delete mode 100755 basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/server.key delete mode 100755 basic-network/crypto-config/peerOrganizations/org1.example.com/ca/4239aa0dcd76daeeb8ba0cda701851d14504d31aad1b2ddddbac6a57365e497c_sk create mode 100644 basic-network/crypto-config/peerOrganizations/org1.example.com/ca/4b8f785ca3d30a7af17a0cfcf0315de6d6509a12ae17db15b1b7209c75ca27d2_sk delete mode 100644 basic-network/crypto-config/peerOrganizations/org1.example.com/ca/org1.example.com-cert.pem create mode 100644 basic-network/crypto-config/peerOrganizations/org1.example.com/msp/config.yaml create mode 100644 basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/config.yaml delete mode 100755 basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/keystore/46be1d569fe68f33e517c9e0072a0ccfbfb42727480fb8c8d0223af321a7893d_sk create mode 100644 basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/keystore/9a8eca60905ae4df38b8dc09ea71328346d467cf9ce32b59efebfe5ad8491707_sk mode change 100755 => 100644 basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.key delete mode 100755 basic-network/crypto-config/peerOrganizations/org1.example.com/tlsca/ed3fd82393e95fc2c475afc113c8d2c591f745d1babc4d6d9cce0a1acc168acb_sk create mode 100644 basic-network/crypto-config/peerOrganizations/org1.example.com/tlsca/f08ad36f8ad883db109c35d22626c1d6bb9bde197fd52d9e74715fc575425993_sk create mode 100644 basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/keystore/c4fc186411097d368184b61aae8b503e412fdb598477840617919fa88a346165_sk delete mode 100755 basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/keystore/cd96d5260ad4757551ed4a5a991e62130f8008a0bf996e4e4b84cd097a747fec_sk create mode 100644 basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/client.crt create mode 100644 basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/client.key delete mode 100644 basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/server.crt delete mode 100755 basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/server.key delete mode 100755 basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/keystore/c75bd6911aca808941c3557ee7c97e90f3952e379497dc55eb903f31b50abc83_sk create mode 100644 basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/keystore/d0ccda16347d394d9634ad067e229c662d0884350b9e3286fcc1d769e22e2746_sk create mode 100644 basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/client.crt create mode 100644 basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/client.key delete mode 100644 basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/server.crt delete mode 100755 basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/server.key diff --git a/basic-network/config/channel.tx b/basic-network/config/channel.tx index bba64bed8be75342de09936f3238b24893e6fb6f..bc0fd753634255c8516eb6da07ff267728553dc7 100644 GIT binary patch literal 421 zcmd;D#LOkmCCb4h#m2GX|HP-PN}Rcs$r*`xd8s)+>QkWIho0c zC7JnoLcBuUT4v_+0YVH?d|X`4`FX|pMJ1V~xj_C=CZTyus5<(XI2chisc`W) zCl(|oW#(j-WTqAii3o9Vad5GO8O0j_jbL+3$<53wRx;%h@ySd}O|DGNNp;Oj$uBBS z%}vcK5t0=W=3o}$=i){Z6ae}Ls!az)f{n#&kBv&{GlN1}rk7e`EvMO=rRwid8=H;d4XgQ=BCmAH0m>5}Fq$L|B z8=6=qrX{7BBwJWonx!RK8krcGC#IShrka?USSDE-nMNnn3@Xp zGja7WaUqNpauSl^;&v=3$jMAjEXmBDXe&6miBVZqY8Ru>WJY9}JfUVr4n`qvE_VN- cbVJ|Z03n9Syo~CTBN!DY8#1a)u4L2!05AqC49atU%VkQ^K!aTYd`V@?5*TL1$=03UJ)U<5hDiIc+u3E+!iI3=mo zJ&&Eoj@Jobj2hi+RsHo~vA+8L?;|)neT)0XpWDB`_{O(?^Gjd-&hLKjOMmpk+MA27 zf9=M9W&ir?U%CC^w`l6GAovypA3*Rs;J1!nK6&}{==g&l|KY!V>g-k!_TA78ouM_G zxs$v17_P|koKs|(Y%a%g4DS|cChJ-Z>u`2~w`|^G9p2)(9Elq+99?9X0i7SvR-P@` zIhH!5-pK#l_y6@%Km3h<`tJW6|3hK^ zKQi^*JJcV%4#36NdgxI<`t0dHx@slpsT-e` zNNi#mQWao0R$#Uzp&=Gb6Q|M!Hj!5|Nl%6_t_^KvGPQH%*lJ6u?8DZ+&M`!j)Qyk= zoT(glnaQTh@Tn|9eIF1Q0%Nk>b~dq<7O5{Tanng;tt*(#CQhXN2&$CK z#cn&D_ol_QJ)I13vzy3pH+o4*vPQSfdd*pRXisZ%;4rlnZfc3-?E)%NvfNGWYGzUg zqt^(s7WTOxEF|C@zaeZpwC6g9>8S<7^?T z_FFaR&Zj6_;h4tE49MWX+Q9mDF-jVb;DDD9!~(RsNol(tO?raR?*7$E(nUyXmB{l~ z1R+wO){;?z5!na)_Wt@(BB4y8$r$2oM@ePhK^+OIM4I@4R2y5ho@VOKx`WjGSnxKL zpt%Cb>6{m6KjGS&jy{e07zSj7g`#7&xSI{_K`gZdRTIS+(+gLahUJ2`YG~!KvK$#; zm}}EvBTCy!F?8eESQu8vlSK78eo&;1w5M&RomI0t)+T+WoEsobTx)i7qD%^Gpy~6n{`~AK>5KEp2G1#G~x!e2_^dZ3!K?wndnrLGzRN#|9u*Cp)Mi8{d z=CIuu)FoqD7)y30qfA7ToW5<~gy-FCBh%JrUf$_0tf8iQea!jkcu)quO+8g&MoniFo14>>v{;^@1`W#uHry1pH1oVH0}eFvOe`Zf zis=*wI?K)2M#UW{whKHX)1x^oFh$>~cuTWp**QzG_sb?P#UHYIF*teu{lCk; z@&5a79b!-41UGjv#%SsW@shelT?f~g=(7G7!EIrmQ#ajc8IGLgD40dm@nyg};HF^B zEqgQ>Ek|xdeU<{?7+g2Azn!ICx{P`oye5!#?ktKUV?B4N6Y2vMALGUhJ$44MSa*t902zO|h$^@RQ|pX6oC#iKp+ zcUVp82k(L#+j|JY=4 z5%8n8ssDbP`ta?m%71z48Qn6-89f+XozYbWVTqpC3%I(PvE9C+&v5V2GuqjF(r2_{ zz|KJdNJ??t+dP;mlQS$WiO|}|U_)YRLr^72`bPvNrJ+;9#yF{oB>NY~o0<=k_O{F) zCwPO?Lm6oMXoIyV5%$@?A|++BwUG==R1@KDNkF)wF>++Jdn;$k&AW!w#z@=Mp%m9Z zi;-hh>aDwN&bK->-`+?hKXLYrhgc&DXofEY%N3hQ4o1N)1`t_bY!B>@4*ck3=l)y= zpoW+U8gbYjth#eJ+03f4n9C`q!S`jlL(b>8U^`7mWYbZY6~vy>tIgI19OQ%aoHer& z5S{tD)iu3#v~Ig@GwufVnz!4&ZJ_WYk{vYnVSktF=q+h0>{X^sfDQt?tM zNQs#2WP|~=QU<|RLQ*u8*}(a(1C5nbPxFAz7THdvVFX}r%bAm?IO4dGzl`ccXdYhwhli!P0ViSm{ zcTf*2;xjmDb^4H}AdeF%>6R{B4FPJG4u=TIHr6~S*>b{Y6*p7`EuPnAN83&)NRm@`!wAh&CCUwsAggcWcv`JnhbvxS0`I zxxes6+8|SM*J-+jtUG%GSRRoO|Nd0)m|Iyr$Y0TuDi$V6FM}I-Rp47)L!7a4ReJt!m6g-Mv{Q$C z-EXhNQ1Kg81RG^bgXSD--pJ&v*qc3ya3w^_4Pu1{Z!Q#b$#x-;lW8c%Yz%ztRIAt zJ0%FDewq3OLVBOO&(eC0x^d}^oV;?`u5;zLVM-uvex2Ayx5$|LQ+m|2w z`pSb}ue>7Z(qf{%NYSLHU!`tR;Hu{b+db6lRX5p#4fV8pdeo!42VTGM*M!jBxmAr| zGIG|Wr<=s!IzIG#dM9%cm$`VuoVjrO9#?Vp-k~k^dFq(l({<_^apWEse)n+|r@sVF zN>(%+%{(~q0^(r~rxdlF+5Sbt;W3@Q2R^qm-b8C@T{O^_VeBm9aOd|O|CoF}a~ZCJ zlZ!in{eI|15it)r>J+>Y>|dyV!A*D8+83N)`o#jx(T|<_>Ek`f+?5AO492IMhs1N4A_^z@FBOHf0}ce|f^ zJV+1;&{FkR75}RG{_p#LaCQ0K4_^PB`Jes85C8S!=JId8Y5(qrU;eW4!~cByH~;pZ zzyI2g{`%j3{ae_dmccj5;E&2+3x4h5<@+yR-nsaXKly{deC_IP>_oBU8Pmnoe*a4j zUL(q+Ri8Ly9j{L)sz#M3=44VMDas;Avr1J-+%X8tXjoR2w5WZKtu&=xW?)QygId>j+VE^?H`~8RDv)#2@M*SZ4)rXh={s4St_w%0~V1NGr`@w_9 zogd%%VE3XqUX-3KVChvLIK-u81$IWKT{v z16T=D#?{1jsEfIebA@ecWR$`2} ztm(tSq0ds;VbM3Gd0++2L?h<8M$|K2h2w)ksB(N`tLI#zk3G*E(~;h%e3QU4frZAw z2B{n&d7u+K(=Zi0OG2uZc3G4mc9uyj+KzT@{;o}=PHkZ1(>ao(l#w-dD9b#TwuXb8 zQ&F*JJJ%Q*wPm6i86$mT1=Lbgxe=n}gWDOBz<_8bBByV)5#<|W$v1OON3?Yq>>;`E ze}Vec+~J$C#b@(QAZ<*Qvk)EbZ2-)Wsu5iBY(u)34Ds}K#rF}}fG)=~%<*^12@n?{ zpb;LsobM1(6L2uHn4}Ap>SR2MsZRr`PPCGwl!DXIB6>v`gXJ7iY$fOB~#Bp zm1=j_&LDH*)ifSfO98>UQl9wZoVF1pcaLeaDMy!5d3W~o(ucj>DG2>ye^|%^+EsRc zAcFP1F?TR-B8X@>si*DT<|=rXW<;)dQ!BS3+3`9_Iw2w!Py++I*`y_8td%IP*hyr} zEn+;I*AWcQ{?ZUJ5O*Qs28<}P$s~&eGn@5$rR_B+=E-#46*|z z>jXnm8=>d-N{Y$Kr1V=H%v8auvwa#R$o>n z32{-%x*7|L%ie>sP@-XRwyskEBfSX>20@s%(>*ABnvqj6gs$udE7mF#L{cR|;^u}$ zdkQ`naCo+g`EA7}s@ZCo>rQ{1J{gW#C534byWKI`5>?0zK#3oq-h@F>X(9VE;>vnP z3sBSJHkT+$rCM%91sL51-PLU|oQBGD(_*gmLB44X7PD~zLPD60rb*U`rY4`o+;c!d z-vh7q1xR3bcAr$W_5E8x(pL+ROqdf$6xit&M?u-KW!Ja-l39gm9EyV{{Y-8D|AcmO zXrE}OxlkfdTubk#p&qd3BcCQdDfIxl;GPrcUl8*XMB_Zzky`=!k&3!bfUc{;k4e!z);UWk6Wc!^-TYIRs*KqibfsnQeiXrwgov68Ga z$<*^MFMTz8(PAFH4rnGt!L)Qyf0$_mL4RA>%Wv9uhmr>oI?Jch%XN9gi|CCdv5 zX>ba=b*etpOfuVc2D4^k%*T3bnPg-JaAqEjB$r!~jRj3dj+K7+Jo>r31MOhCh^}z( zS;aAIXB}a`i2cmP%h)6A0=rXuzjE=?;j!L7eqVkGJY+m$v2frs2iR{vIQQ?Q_P1}1a2>yhaQ5gF;bb9!P+A(L8QZBby{#0-R;>6>$$;f9 zB7CYcV1Q_GuQVACb)FQ|%^VI-k&O*@LG8e&;7q7AIc8O^f><|4Dx{Dq=V%@lZQ`zN z+kM=Y8Y)*n=8zJAPnr{)QUb8c37RbIA097M8R7}5SFE&olm%Q$`PvgA8<^_t;+Yn6 zb<`F|ZkO(6QpHScl@i9i*qbLI$X%~H?v1T2OSNbtGbZND&DV9GsUTuKZ?)(EUoe5c zsWRoxY|6myB-UozPB`hT_Q9*jk8T&w&kJ7QDe+vWMq{?(8Lx;Xa_BoE5!7o&rQaXN zY#;Ibrr(;wpsK8>)h>8}Q?hUn&!_0s_tKHr9tV?3*wQN9Fs&`y5byV$dSehNoh>1t ztPp$dCMQf2yg4TQ_Rrvs?gKH`3*5|2N zR#}4tRxgKLcVUV_dDu)n+P;psiYn&fC_+R#-;|BVI{8^Lc_&QlV*>e1ogDJ?svl}? z!53Q0R3d%D%;UA)YB{(hrkVj7VlZILCBF`yDqEa&vS?pt%Y+vE$!OE58!%$c0QqAW zcC~Gh&KkMZ@<_5e(+w6fBI|57kwA@8C!$iSKZ`cCz^s;LYtnL-1c~ zo5nFIH?(Wcq?&Pw>@<>2lv!lXp-xPwE!|1ENw+izorWefhF&w^{gT~4 zMQsKb`fvf-_1mTJ^OP_s$~Mog#E7`(&4-a^4~A4ekyB|Uv15JfG~;mG8L*qq+!-`- z1~`*s@w5~^S7NfxBtpun*GfX6R@)dJKjW&LhE|*0ABsfR1jew;>aEGZPDNKp3Vz+R zH&&?WE(~j9i>eJ)QPt}&QG_#oZcRF4ZJLI|=N4j4lJkl@>%sT2_X<7uvo}=geeB*% z)%IAZUR56J=U>6TPz<}gG3*}p#?4{prHVl(3H=ifI!od&fH!EPs41({zzLHWyNA6B zULm5>mkxFxy8~X0!g+W$xdN~6 z*XU1k2YZO!y#V(=`smNg?|$^rdncQ#tH+){!rm;zc#$g{Q;C~4Cr8gV$A%j=r|jTe z>|QYqIGw}&SI#!?gSY5;Xw8Pkd}{C0fFe&huKC1#=Y9GBd~QF6HDW_BB5%5I`$ehH zij(!;<%=H`ueVN1T#DfSQMNPr#f_KA%w*R7&?F;B%w8G$5YdD4f*i_;2 pm%#nwf^hDJMXuxp7`Dq*4poiQlEn_*?)j&*%jaFW052Wh{{zZhpm+cP diff --git a/basic-network/configtx.yaml b/basic-network/configtx.yaml index 98828ebc38..e16209422b 100644 --- a/basic-network/configtx.yaml +++ b/basic-network/configtx.yaml @@ -27,6 +27,20 @@ Organizations: # MSPDir is the filesystem path which contains the MSP configuration MSPDir: crypto-config/ordererOrganizations/example.com/msp + # Policies defines the set of policies at this level of the config tree + # For organization policies, their canonical path is usually + # /Channel/// + Policies: + Readers: + Type: Signature + Rule: "OR('OrdererMSP.member')" + Writers: + Type: Signature + Rule: "OR('OrdererMSP.member')" + Admins: + Type: Signature + Rule: "OR('OrdererMSP.admin')" + - &Org1 # DefaultOrg defines the organization which is used in the sampleconfig # of the fabric.git development environment @@ -37,6 +51,24 @@ Organizations: MSPDir: crypto-config/peerOrganizations/org1.example.com/msp + # Policies defines the set of policies at this level of the config tree + # For organization policies, their canonical path is usually + # /Channel/// + Policies: + Readers: + Type: Signature + Rule: "OR('Org1MSP.admin', 'Org1MSP.peer', 'Org1MSP.client')" + Writers: + Type: Signature + Rule: "OR('Org1MSP.admin', 'Org1MSP.client')" + Admins: + Type: Signature + Rule: "OR('Org1MSP.admin')" + Endorsement: + Type: Signature + Rule: "OR('Org1MSP.peer')" + + # leave this flag set to true. AnchorPeers: # AnchorPeers defines the location of peers which can be used # for cross org gossip communication. Note, this value is only @@ -44,6 +76,69 @@ Organizations: - Host: peer0.org1.example.com Port: 7051 +################################################################################ +# +# SECTION: Capabilities +# +# - This section defines the capabilities of fabric network. This is a new +# concept as of v1.1.0 and should not be utilized in mixed networks with +# v1.0.x peers and orderers. Capabilities define features which must be +# present in a fabric binary for that binary to safely participate in the +# fabric network. For instance, if a new MSP type is added, newer binaries +# might recognize and validate the signatures from this type, while older +# binaries without this support would be unable to validate those +# transactions. This could lead to different versions of the fabric binaries +# having different world states. Instead, defining a capability for a channel +# informs those binaries without this capability that they must cease +# processing transactions until they have been upgraded. For v1.0.x if any +# capabilities are defined (including a map with all capabilities turned off) +# then the v1.0.x peer will deliberately crash. +# +################################################################################ +Capabilities: + # Channel capabilities apply to both the orderers and the peers and must be + # supported by both. + # Set the value of the capability to true to require it. + Channel: &ChannelCapabilities + # V1.3 for Channel is a catchall flag for behavior which has been + # determined to be desired for all orderers and peers running at the v1.3.x + # level, but which would be incompatible with orderers and peers from + # prior releases. + # Prior to enabling V1.3 channel capabilities, ensure that all + # orderers and peers on a channel are at v1.3.0 or later. + V1_3: true + + # Orderer capabilities apply only to the orderers, and may be safely + # used with prior release peers. + # Set the value of the capability to true to require it. + Orderer: &OrdererCapabilities + # V1.1 for Orderer is a catchall flag for behavior which has been + # determined to be desired for all orderers running at the v1.1.x + # level, but which would be incompatible with orderers from prior releases. + # Prior to enabling V1.1 orderer capabilities, ensure that all + # orderers on a channel are at v1.1.0 or later. + V1_1: true + + # Application capabilities apply only to the peer network, and may be safely + # used with prior release orderers. + # Set the value of the capability to true to require it. + Application: &ApplicationCapabilities + # V2.0 for Application enables the new non-backwards compatible + # features and fixes of fabric v2.0. + V2_0: true + # V1.3 for Application enables the new non-backwards compatible + # features and fixes of fabric v1.3 (note, this need not be set if + # later version capabilities are set) + V1_3: false + # V1.2 for Application enables the new non-backwards compatible + # features and fixes of fabric v1.2 (note, this need not be set if + # later version capabilities are set) + V1_2: false + # V1.1 for Application enables the new non-backwards compatible + # features and fixes of fabric v1.1 (note, this need not be set if + # later version capabilities are set). + V1_1: false + ################################################################################ # # SECTION: Application @@ -58,6 +153,28 @@ Application: &ApplicationDefaults # the application side of the network Organizations: + # Policies defines the set of policies at this level of the config tree + # For Application policies, their canonical path is + # /Channel/Application/ + Policies: + Readers: + Type: ImplicitMeta + Rule: "ANY Readers" + Writers: + Type: ImplicitMeta + Rule: "ANY Writers" + Admins: + Type: ImplicitMeta + Rule: "MAJORITY Admins" + LifecycleEndorsement: + Type: ImplicitMeta + Rule: "MAJORITY Endorsement" + Endorsement: + Type: ImplicitMeta + Rule: "MAJORITY Endorsement" + + Capabilities: + <<: *ApplicationCapabilities ################################################################################ # # SECTION: Orderer @@ -103,6 +220,57 @@ Orderer: &OrdererDefaults # the orderer side of the network Organizations: + # Policies defines the set of policies at this level of the config tree + # For Orderer policies, their canonical path is + # /Channel/Orderer/ + Policies: + Readers: + Type: ImplicitMeta + Rule: "ANY Readers" + Writers: + Type: ImplicitMeta + Rule: "ANY Writers" + Admins: + Type: ImplicitMeta + Rule: "MAJORITY Admins" + # BlockValidation specifies what signatures must be included in the block + # from the orderer for the peer to validate it. + BlockValidation: + Type: ImplicitMeta + Rule: "ANY Writers" + +################################################################################ +# +# CHANNEL +# +# This section defines the values to encode into a config transaction or +# genesis block for channel related parameters. +# +################################################################################ +Channel: &ChannelDefaults + # Policies defines the set of policies at this level of the config tree + # For Channel policies, their canonical path is + # /Channel/ + Policies: + # Who may invoke the 'Deliver' API + Readers: + Type: ImplicitMeta + Rule: "ANY Readers" + # Who may invoke the 'Broadcast' API + Writers: + Type: ImplicitMeta + Rule: "ANY Writers" + # By default, who may modify elements at this config level + Admins: + Type: ImplicitMeta + Rule: "MAJORITY Admins" + + # Capabilities describes the channel level capabilities, see the + # dedicated Capabilities section elsewhere in this file for a full + # description + Capabilities: + <<: *ChannelCapabilities + ################################################################################ # # Profile @@ -114,18 +282,24 @@ Orderer: &OrdererDefaults Profiles: OneOrgOrdererGenesis: + <<: *ChannelDefaults Orderer: <<: *OrdererDefaults Organizations: - *OrdererOrg + Capabilities: + <<: *OrdererCapabilities Consortiums: SampleConsortium: Organizations: - *Org1 OneOrgChannel: Consortium: SampleConsortium + <<: *ChannelDefaults Application: <<: *ApplicationDefaults Organizations: - *Org1 + Capabilities: + <<: *ApplicationCapabilities diff --git a/basic-network/crypto-config.yaml b/basic-network/crypto-config.yaml index 05bb2dc1b0..fb01dffb05 100644 --- a/basic-network/crypto-config.yaml +++ b/basic-network/crypto-config.yaml @@ -26,6 +26,7 @@ PeerOrgs: # --------------------------------------------------------------------------- - Name: Org1 Domain: org1.example.com + EnableNodeOUs: true # --------------------------------------------------------------------------- # "Specs" # --------------------------------------------------------------------------- diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/ca/60a3a0436468d6505527325c123a9028332a846f05c5feef48f0e56cd74a6b1d_sk b/basic-network/crypto-config/ordererOrganizations/example.com/ca/60a3a0436468d6505527325c123a9028332a846f05c5feef48f0e56cd74a6b1d_sk new file mode 100644 index 0000000000..f7d4073343 --- /dev/null +++ b/basic-network/crypto-config/ordererOrganizations/example.com/ca/60a3a0436468d6505527325c123a9028332a846f05c5feef48f0e56cd74a6b1d_sk @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgl0Tpf6w6lq46Xy7M +dwGcn9Dy7oJrm+idNhzsuPCXybChRANCAASnZ+ZV2YbfMPvQaGfqwVLZ0uho9Tio +Tj5Pfj40QIyixko1llyrq9Dt9T3m4XvfKB2yk171IdUNAepmB1K52PnV +-----END PRIVATE KEY----- diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/ca/a0606a4a860a1e31c90a23788da6f3b6b74925ed0d23061af4899409ba46ae6a_sk b/basic-network/crypto-config/ordererOrganizations/example.com/ca/a0606a4a860a1e31c90a23788da6f3b6b74925ed0d23061af4899409ba46ae6a_sk deleted file mode 100755 index eba07e23a6..0000000000 --- a/basic-network/crypto-config/ordererOrganizations/example.com/ca/a0606a4a860a1e31c90a23788da6f3b6b74925ed0d23061af4899409ba46ae6a_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgbIRfBJjk/t3HLnEz -32V4sCllmJtnliVv4UmLfrjZ+B6hRANCAASM01iiFoDgTsTd27nU+R1z7YZbqM4I -Tlz13Mg+SQWsWn25IM6/IwtzNq5SSQZtJwpo7+gtS5IggDn7WJMi6Hy6 ------END PRIVATE KEY----- diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/ca/ca.example.com-cert.pem b/basic-network/crypto-config/ordererOrganizations/example.com/ca/ca.example.com-cert.pem index 240d428987..bb1bdb92c9 100644 --- a/basic-network/crypto-config/ordererOrganizations/example.com/ca/ca.example.com-cert.pem +++ b/basic-network/crypto-config/ordererOrganizations/example.com/ca/ca.example.com-cert.pem @@ -1,14 +1,15 @@ -----BEGIN CERTIFICATE----- -MIICLjCCAdWgAwIBAgIQHuAANpa/kDL7CPyNttctRjAKBggqhkjOPQQDAjBpMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w -bGUuY29tMB4XDTE3MDgzMTA5MTQzMloXDTI3MDgyOTA5MTQzMlowaTELMAkGA1UE -BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz -Y28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFtcGxlLmNv -bTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABIzTWKIWgOBOxN3budT5HXPthluo -zghOXPXcyD5JBaxafbkgzr8jC3M2rlJJBm0nCmjv6C1LkiCAOftYkyLofLqjXzBd -MA4GA1UdDwEB/wQEAwIBpjAPBgNVHSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMB -Af8wKQYDVR0OBCIEIKBgakqGCh4xyQojeI2m87a3SSXtDSMGGvSJlAm6Rq5qMAoG -CCqGSM49BAMCA0cAMEQCIGShwWIKXmf3oJY3Oow7pKA0SSe89UsRLy2HMxxNzgWx -AiB097hBfmM2JEZsEZfMbEM2U7edQIDyCoPOgm5ha9wDNw== +MIICPjCCAeSgAwIBAgIRAIvKUkOSe/nqaK1yUopBGiEwCgYIKoZIzj0EAwIwaTEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFt +cGxlLmNvbTAeFw0xOTA0MDMwOTM2MDBaFw0yOTAzMzEwOTM2MDBaMGkxCzAJBgNV +BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNp +c2NvMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEXMBUGA1UEAxMOY2EuZXhhbXBsZS5j +b20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASnZ+ZV2YbfMPvQaGfqwVLZ0uho +9TioTj5Pfj40QIyixko1llyrq9Dt9T3m4XvfKB2yk171IdUNAepmB1K52PnVo20w +azAOBgNVHQ8BAf8EBAMCAaYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB +MA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIGCjoENkaNZQVScyXBI6kCgzKoRv +BcX+70jw5WzXSmsdMAoGCCqGSM49BAMCA0gAMEUCIQDDuM0qeCmrJ7QvPQJrKtiT +h3W0rPsxWG9reunkChLklwIgXjo90TxZQzmXvRYkQldGJ3fBQDyQbRlGl74oGS2i +eEE= -----END CERTIFICATE----- diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/msp/admincerts/Admin@example.com-cert.pem b/basic-network/crypto-config/ordererOrganizations/example.com/msp/admincerts/Admin@example.com-cert.pem index 60d3a0b556..26667f9bc6 100644 --- a/basic-network/crypto-config/ordererOrganizations/example.com/msp/admincerts/Admin@example.com-cert.pem +++ b/basic-network/crypto-config/ordererOrganizations/example.com/msp/admincerts/Admin@example.com-cert.pem @@ -1,13 +1,13 @@ -----BEGIN CERTIFICATE----- -MIICCTCCAbCgAwIBAgIQVMXz1cejr3sGgDsXuIBK3zAKBggqhkjOPQQDAjBpMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w -bGUuY29tMB4XDTE3MDgzMTA5MTQzMloXDTI3MDgyOTA5MTQzMlowVjELMAkGA1UE -BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz -Y28xGjAYBgNVBAMMEUFkbWluQGV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZI -zj0DAQcDQgAEFufLmRXBZHc3d7HvYSU4jR4nJnzfmJlWN6Gm0Bm+NsO8lwb1TDa4 -cPzAOgnbIm1VFwhBd+sE3TIzIWsM2Kzv1aNNMEswDgYDVR0PAQH/BAQDAgeAMAwG -A1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgoGBqSoYKHjHJCiN4jabztrdJJe0NIwYa -9ImUCbpGrmowCgYIKoZIzj0EAwIDRwAwRAIgId+xpuBHjfWvL8aAsDbmMjXAoOYy -BgazcJh446kZaDACIDeyvsH5Xwes5w5Sksv7mb6/kr4ceCy00h1Vlt5bwPiu +MIICCzCCAbGgAwIBAgIRAPEuMhjzbXslBwbekcOmD1AwCgYIKoZIzj0EAwIwaTEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFt +cGxlLmNvbTAeFw0xOTA0MDMwOTM2MDBaFw0yOTAzMzEwOTM2MDBaMFYxCzAJBgNV +BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNp +c2NvMRowGAYDVQQDDBFBZG1pbkBleGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqG +SM49AwEHA0IABKTFtF0SNhy/MW+TYUE9DuBjN9oxqWFUj4p7wdxSLZBRZf5KLX7g +M1CnH7ur9DsJE70n1PX+/vPuMyIeB33V0Y6jTTBLMA4GA1UdDwEB/wQEAwIHgDAM +BgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIGCjoENkaNZQVScyXBI6kCgzKoRvBcX+ +70jw5WzXSmsdMAoGCCqGSM49BAMCA0gAMEUCIQDUkVhWPfOETm7kEb//GlDVEzAW +cr+Y1P/WSng6cYqahQIgdM5jxkfLoR8s8zFctevNEQvQOsNbJlJ08v6yEc9J3tM= -----END CERTIFICATE----- diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/msp/cacerts/ca.example.com-cert.pem b/basic-network/crypto-config/ordererOrganizations/example.com/msp/cacerts/ca.example.com-cert.pem index 240d428987..bb1bdb92c9 100644 --- a/basic-network/crypto-config/ordererOrganizations/example.com/msp/cacerts/ca.example.com-cert.pem +++ b/basic-network/crypto-config/ordererOrganizations/example.com/msp/cacerts/ca.example.com-cert.pem @@ -1,14 +1,15 @@ -----BEGIN CERTIFICATE----- -MIICLjCCAdWgAwIBAgIQHuAANpa/kDL7CPyNttctRjAKBggqhkjOPQQDAjBpMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w -bGUuY29tMB4XDTE3MDgzMTA5MTQzMloXDTI3MDgyOTA5MTQzMlowaTELMAkGA1UE -BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz -Y28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFtcGxlLmNv -bTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABIzTWKIWgOBOxN3budT5HXPthluo -zghOXPXcyD5JBaxafbkgzr8jC3M2rlJJBm0nCmjv6C1LkiCAOftYkyLofLqjXzBd -MA4GA1UdDwEB/wQEAwIBpjAPBgNVHSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMB -Af8wKQYDVR0OBCIEIKBgakqGCh4xyQojeI2m87a3SSXtDSMGGvSJlAm6Rq5qMAoG -CCqGSM49BAMCA0cAMEQCIGShwWIKXmf3oJY3Oow7pKA0SSe89UsRLy2HMxxNzgWx -AiB097hBfmM2JEZsEZfMbEM2U7edQIDyCoPOgm5ha9wDNw== +MIICPjCCAeSgAwIBAgIRAIvKUkOSe/nqaK1yUopBGiEwCgYIKoZIzj0EAwIwaTEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFt +cGxlLmNvbTAeFw0xOTA0MDMwOTM2MDBaFw0yOTAzMzEwOTM2MDBaMGkxCzAJBgNV +BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNp +c2NvMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEXMBUGA1UEAxMOY2EuZXhhbXBsZS5j +b20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASnZ+ZV2YbfMPvQaGfqwVLZ0uho +9TioTj5Pfj40QIyixko1llyrq9Dt9T3m4XvfKB2yk171IdUNAepmB1K52PnVo20w +azAOBgNVHQ8BAf8EBAMCAaYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB +MA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIGCjoENkaNZQVScyXBI6kCgzKoRv +BcX+70jw5WzXSmsdMAoGCCqGSM49BAMCA0gAMEUCIQDDuM0qeCmrJ7QvPQJrKtiT +h3W0rPsxWG9reunkChLklwIgXjo90TxZQzmXvRYkQldGJ3fBQDyQbRlGl74oGS2i +eEE= -----END CERTIFICATE----- diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/tlsca.example.com-cert.pem b/basic-network/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/tlsca.example.com-cert.pem index c0abc7f6f0..e54667dc33 100644 --- a/basic-network/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/tlsca.example.com-cert.pem +++ b/basic-network/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/tlsca.example.com-cert.pem @@ -1,14 +1,15 @@ -----BEGIN CERTIFICATE----- -MIICNTCCAdugAwIBAgIQT0WLBisbcQ6AkirTJApb1TAKBggqhkjOPQQDAjBsMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xGjAYBgNVBAMTEXRsc2NhLmV4 -YW1wbGUuY29tMB4XDTE3MDgzMTA5MTQzMloXDTI3MDgyOTA5MTQzMlowbDELMAkG -A1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFu -Y2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5leGFt -cGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABGtRFSyePgHhit2JfQNn -Gbda3X9Y+Eb5Ft/4L9uLsxc4zEMLt2TJZewEfO/Uoe9YH9VhFmGj/d9M0d/0HSAn -K8WjXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNVHSUECDAGBgRVHSUAMA8GA1UdEwEB -/wQFMAMBAf8wKQYDVR0OBCIEII0hhlVshdUV5zfQwNqNDXZyeFtoXLUDvLleU9zC -efunMAoGCCqGSM49BAMCA0gAMEUCIQDxLfsMRqPJuoH77vahGkE6EYMqvzjVI2Ob -aV1DZJfUdwIgHuHXPvKvcoYZgAo7Xc57Uqs6hSpMs0CjzcfLXYiwoVc= +MIICRDCCAeqgAwIBAgIRAJDUJIOlNerIx+QFWaH83u0wCgYIKoZIzj0EAwIwbDEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5l +eGFtcGxlLmNvbTAeFw0xOTA0MDMwOTM2MDBaFw0yOTAzMzEwOTM2MDBaMGwxCzAJ +BgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJh +bmNpc2NvMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEaMBgGA1UEAxMRdGxzY2EuZXhh +bXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR3oVXOKK15Rh5C3LuT ++tpMhYM+/kD+mpcWui1JAO2S4SrCIZLkQAsv5bMfm0tN8bim9u5Z7BVCxpwUfPaV +bAz7o20wazAOBgNVHQ8BAf8EBAMCAaYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsG +AQUFBwMBMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEICcGVc9fS45n4PKefGbe +gT/Z05MC29jcKgtVNbMWGdufMAoGCCqGSM49BAMCA0gAMEUCIQDHa9XqxJ1WPT0r +uMe7oxuiV9wU6PenP8ayIRq9iuaEewIgVPTIqwVeIdFT8UJszIbATd1TpMX9xI1k +ZOCqemwfc9A= -----END CERTIFICATE----- diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/admincerts/Admin@example.com-cert.pem b/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/admincerts/Admin@example.com-cert.pem index 60d3a0b556..26667f9bc6 100644 --- a/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/admincerts/Admin@example.com-cert.pem +++ b/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/admincerts/Admin@example.com-cert.pem @@ -1,13 +1,13 @@ -----BEGIN CERTIFICATE----- -MIICCTCCAbCgAwIBAgIQVMXz1cejr3sGgDsXuIBK3zAKBggqhkjOPQQDAjBpMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w -bGUuY29tMB4XDTE3MDgzMTA5MTQzMloXDTI3MDgyOTA5MTQzMlowVjELMAkGA1UE -BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz -Y28xGjAYBgNVBAMMEUFkbWluQGV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZI -zj0DAQcDQgAEFufLmRXBZHc3d7HvYSU4jR4nJnzfmJlWN6Gm0Bm+NsO8lwb1TDa4 -cPzAOgnbIm1VFwhBd+sE3TIzIWsM2Kzv1aNNMEswDgYDVR0PAQH/BAQDAgeAMAwG -A1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgoGBqSoYKHjHJCiN4jabztrdJJe0NIwYa -9ImUCbpGrmowCgYIKoZIzj0EAwIDRwAwRAIgId+xpuBHjfWvL8aAsDbmMjXAoOYy -BgazcJh446kZaDACIDeyvsH5Xwes5w5Sksv7mb6/kr4ceCy00h1Vlt5bwPiu +MIICCzCCAbGgAwIBAgIRAPEuMhjzbXslBwbekcOmD1AwCgYIKoZIzj0EAwIwaTEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFt +cGxlLmNvbTAeFw0xOTA0MDMwOTM2MDBaFw0yOTAzMzEwOTM2MDBaMFYxCzAJBgNV +BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNp +c2NvMRowGAYDVQQDDBFBZG1pbkBleGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqG +SM49AwEHA0IABKTFtF0SNhy/MW+TYUE9DuBjN9oxqWFUj4p7wdxSLZBRZf5KLX7g +M1CnH7ur9DsJE70n1PX+/vPuMyIeB33V0Y6jTTBLMA4GA1UdDwEB/wQEAwIHgDAM +BgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIGCjoENkaNZQVScyXBI6kCgzKoRvBcX+ +70jw5WzXSmsdMAoGCCqGSM49BAMCA0gAMEUCIQDUkVhWPfOETm7kEb//GlDVEzAW +cr+Y1P/WSng6cYqahQIgdM5jxkfLoR8s8zFctevNEQvQOsNbJlJ08v6yEc9J3tM= -----END CERTIFICATE----- diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/cacerts/ca.example.com-cert.pem b/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/cacerts/ca.example.com-cert.pem index 240d428987..bb1bdb92c9 100644 --- a/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/cacerts/ca.example.com-cert.pem +++ b/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/cacerts/ca.example.com-cert.pem @@ -1,14 +1,15 @@ -----BEGIN CERTIFICATE----- -MIICLjCCAdWgAwIBAgIQHuAANpa/kDL7CPyNttctRjAKBggqhkjOPQQDAjBpMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w -bGUuY29tMB4XDTE3MDgzMTA5MTQzMloXDTI3MDgyOTA5MTQzMlowaTELMAkGA1UE -BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz -Y28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFtcGxlLmNv -bTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABIzTWKIWgOBOxN3budT5HXPthluo -zghOXPXcyD5JBaxafbkgzr8jC3M2rlJJBm0nCmjv6C1LkiCAOftYkyLofLqjXzBd -MA4GA1UdDwEB/wQEAwIBpjAPBgNVHSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMB -Af8wKQYDVR0OBCIEIKBgakqGCh4xyQojeI2m87a3SSXtDSMGGvSJlAm6Rq5qMAoG -CCqGSM49BAMCA0cAMEQCIGShwWIKXmf3oJY3Oow7pKA0SSe89UsRLy2HMxxNzgWx -AiB097hBfmM2JEZsEZfMbEM2U7edQIDyCoPOgm5ha9wDNw== +MIICPjCCAeSgAwIBAgIRAIvKUkOSe/nqaK1yUopBGiEwCgYIKoZIzj0EAwIwaTEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFt +cGxlLmNvbTAeFw0xOTA0MDMwOTM2MDBaFw0yOTAzMzEwOTM2MDBaMGkxCzAJBgNV +BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNp +c2NvMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEXMBUGA1UEAxMOY2EuZXhhbXBsZS5j +b20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASnZ+ZV2YbfMPvQaGfqwVLZ0uho +9TioTj5Pfj40QIyixko1llyrq9Dt9T3m4XvfKB2yk171IdUNAepmB1K52PnVo20w +azAOBgNVHQ8BAf8EBAMCAaYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB +MA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIGCjoENkaNZQVScyXBI6kCgzKoRv +BcX+70jw5WzXSmsdMAoGCCqGSM49BAMCA0gAMEUCIQDDuM0qeCmrJ7QvPQJrKtiT +h3W0rPsxWG9reunkChLklwIgXjo90TxZQzmXvRYkQldGJ3fBQDyQbRlGl74oGS2i +eEE= -----END CERTIFICATE----- diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/keystore/4d2f776c0fef8eac3f460a7c3558dc7859c4fe458e262e674a6c23f242ea33d1_sk b/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/keystore/4d2f776c0fef8eac3f460a7c3558dc7859c4fe458e262e674a6c23f242ea33d1_sk deleted file mode 100755 index ffcf94460d..0000000000 --- a/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/keystore/4d2f776c0fef8eac3f460a7c3558dc7859c4fe458e262e674a6c23f242ea33d1_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg730zOAwSLJKj9wle -jbxx4d0P2Qwl314A+znW9n6070mhRANCAARQ4kbOlqzGNLkQmZsUh78a04kkCjqa -EmovJhP08G9VJ1pD9NCUw2WosRmAU/rBz0K2tSn9YOdn8zbMumgM+ORy ------END PRIVATE KEY----- diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/keystore/7557b147fe249860e7eae055e5f3e54f7af2e4571d29275708c18b7331a8103b_sk b/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/keystore/7557b147fe249860e7eae055e5f3e54f7af2e4571d29275708c18b7331a8103b_sk new file mode 100644 index 0000000000..1ea378abd9 --- /dev/null +++ b/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/keystore/7557b147fe249860e7eae055e5f3e54f7af2e4571d29275708c18b7331a8103b_sk @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgFhNtiaWuwyh4C7vP +Xtp/cqX5ICFM63N1Cj/vZJFlroChRANCAAQse8ZB7j//7XWVnnoLlJY9OucffTao +eFZTryDHoL5nUWFc5JSOYcVCC+Y0iPPfzn6O/D4mGBWcSu/qjCUsJ0Om +-----END PRIVATE KEY----- diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/signcerts/orderer.example.com-cert.pem b/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/signcerts/orderer.example.com-cert.pem index ce1bb447da..49c695ebba 100644 --- a/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/signcerts/orderer.example.com-cert.pem +++ b/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/signcerts/orderer.example.com-cert.pem @@ -1,13 +1,13 @@ -----BEGIN CERTIFICATE----- -MIICDDCCAbOgAwIBAgIRAK30hdRcBxQJYNPqPkiFo3IwCgYIKoZIzj0EAwIwaTEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFt -cGxlLmNvbTAeFw0xNzA4MzEwOTE0MzJaFw0yNzA4MjkwOTE0MzJaMFgxCzAJBgNV -BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNp -c2NvMRwwGgYDVQQDExNvcmRlcmVyLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYI -KoZIzj0DAQcDQgAEUOJGzpasxjS5EJmbFIe/GtOJJAo6mhJqLyYT9PBvVSdaQ/TQ -lMNlqLEZgFP6wc9CtrUp/WDnZ/M2zLpoDPjkcqNNMEswDgYDVR0PAQH/BAQDAgeA -MAwGA1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgoGBqSoYKHjHJCiN4jabztrdJJe0N -IwYa9ImUCbpGrmowCgYIKoZIzj0EAwIDRwAwRAIgHsU1f4jzuul6zYGY/Xn/H5X5 -gDe7/u8dZxJfWwXOGNsCICbXt6yezSzacOFQDkvAPz5/3OYI5YKLSTl+Wilfa/qy +MIICCzCCAbKgAwIBAgIQLcLm3LDyAJ4YJBN7k00w7TAKBggqhkjOPQQDAjBpMQsw +CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy +YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w +bGUuY29tMB4XDTE5MDQwMzA5MzYwMFoXDTI5MDMzMTA5MzYwMFowWDELMAkGA1UE +BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz +Y28xHDAaBgNVBAMTE29yZGVyZXIuZXhhbXBsZS5jb20wWTATBgcqhkjOPQIBBggq +hkjOPQMBBwNCAAQse8ZB7j//7XWVnnoLlJY9OucffTaoeFZTryDHoL5nUWFc5JSO +YcVCC+Y0iPPfzn6O/D4mGBWcSu/qjCUsJ0Omo00wSzAOBgNVHQ8BAf8EBAMCB4Aw +DAYDVR0TAQH/BAIwADArBgNVHSMEJDAigCBgo6BDZGjWUFUnMlwSOpAoMyqEbwXF +/u9I8OVs10prHTAKBggqhkjOPQQDAgNHADBEAiB1NglCAo1m6diKrI6ERjiMayc9 +m2Sb5NHR55CEqOCoXQIgC6yo7O/Y15ZayJKztbNVT6u4JPy5IWbV6meViOrYttw= -----END CERTIFICATE----- diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem b/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem index c0abc7f6f0..e54667dc33 100644 --- a/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem +++ b/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem @@ -1,14 +1,15 @@ -----BEGIN CERTIFICATE----- -MIICNTCCAdugAwIBAgIQT0WLBisbcQ6AkirTJApb1TAKBggqhkjOPQQDAjBsMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xGjAYBgNVBAMTEXRsc2NhLmV4 -YW1wbGUuY29tMB4XDTE3MDgzMTA5MTQzMloXDTI3MDgyOTA5MTQzMlowbDELMAkG -A1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFu -Y2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5leGFt -cGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABGtRFSyePgHhit2JfQNn -Gbda3X9Y+Eb5Ft/4L9uLsxc4zEMLt2TJZewEfO/Uoe9YH9VhFmGj/d9M0d/0HSAn -K8WjXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNVHSUECDAGBgRVHSUAMA8GA1UdEwEB -/wQFMAMBAf8wKQYDVR0OBCIEII0hhlVshdUV5zfQwNqNDXZyeFtoXLUDvLleU9zC -efunMAoGCCqGSM49BAMCA0gAMEUCIQDxLfsMRqPJuoH77vahGkE6EYMqvzjVI2Ob -aV1DZJfUdwIgHuHXPvKvcoYZgAo7Xc57Uqs6hSpMs0CjzcfLXYiwoVc= +MIICRDCCAeqgAwIBAgIRAJDUJIOlNerIx+QFWaH83u0wCgYIKoZIzj0EAwIwbDEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5l +eGFtcGxlLmNvbTAeFw0xOTA0MDMwOTM2MDBaFw0yOTAzMzEwOTM2MDBaMGwxCzAJ +BgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJh +bmNpc2NvMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEaMBgGA1UEAxMRdGxzY2EuZXhh +bXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR3oVXOKK15Rh5C3LuT ++tpMhYM+/kD+mpcWui1JAO2S4SrCIZLkQAsv5bMfm0tN8bim9u5Z7BVCxpwUfPaV +bAz7o20wazAOBgNVHQ8BAf8EBAMCAaYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsG +AQUFBwMBMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEICcGVc9fS45n4PKefGbe +gT/Z05MC29jcKgtVNbMWGdufMAoGCCqGSM49BAMCA0gAMEUCIQDHa9XqxJ1WPT0r +uMe7oxuiV9wU6PenP8ayIRq9iuaEewIgVPTIqwVeIdFT8UJszIbATd1TpMX9xI1k +ZOCqemwfc9A= -----END CERTIFICATE----- diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/ca.crt b/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/ca.crt index c0abc7f6f0..e54667dc33 100644 --- a/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/ca.crt +++ b/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/ca.crt @@ -1,14 +1,15 @@ -----BEGIN CERTIFICATE----- -MIICNTCCAdugAwIBAgIQT0WLBisbcQ6AkirTJApb1TAKBggqhkjOPQQDAjBsMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xGjAYBgNVBAMTEXRsc2NhLmV4 -YW1wbGUuY29tMB4XDTE3MDgzMTA5MTQzMloXDTI3MDgyOTA5MTQzMlowbDELMAkG -A1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFu -Y2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5leGFt -cGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABGtRFSyePgHhit2JfQNn -Gbda3X9Y+Eb5Ft/4L9uLsxc4zEMLt2TJZewEfO/Uoe9YH9VhFmGj/d9M0d/0HSAn -K8WjXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNVHSUECDAGBgRVHSUAMA8GA1UdEwEB -/wQFMAMBAf8wKQYDVR0OBCIEII0hhlVshdUV5zfQwNqNDXZyeFtoXLUDvLleU9zC -efunMAoGCCqGSM49BAMCA0gAMEUCIQDxLfsMRqPJuoH77vahGkE6EYMqvzjVI2Ob -aV1DZJfUdwIgHuHXPvKvcoYZgAo7Xc57Uqs6hSpMs0CjzcfLXYiwoVc= +MIICRDCCAeqgAwIBAgIRAJDUJIOlNerIx+QFWaH83u0wCgYIKoZIzj0EAwIwbDEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5l +eGFtcGxlLmNvbTAeFw0xOTA0MDMwOTM2MDBaFw0yOTAzMzEwOTM2MDBaMGwxCzAJ +BgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJh +bmNpc2NvMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEaMBgGA1UEAxMRdGxzY2EuZXhh +bXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR3oVXOKK15Rh5C3LuT ++tpMhYM+/kD+mpcWui1JAO2S4SrCIZLkQAsv5bMfm0tN8bim9u5Z7BVCxpwUfPaV +bAz7o20wazAOBgNVHQ8BAf8EBAMCAaYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsG +AQUFBwMBMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEICcGVc9fS45n4PKefGbe +gT/Z05MC29jcKgtVNbMWGdufMAoGCCqGSM49BAMCA0gAMEUCIQDHa9XqxJ1WPT0r +uMe7oxuiV9wU6PenP8ayIRq9iuaEewIgVPTIqwVeIdFT8UJszIbATd1TpMX9xI1k +ZOCqemwfc9A= -----END CERTIFICATE----- diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.crt b/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.crt index 020ffe81a1..e14412afda 100644 --- a/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.crt +++ b/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.crt @@ -1,15 +1,15 @@ -----BEGIN CERTIFICATE----- -MIICWTCCAf+gAwIBAgIQLwiilHvhB1gOg5eGs5O9YDAKBggqhkjOPQQDAjBsMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xGjAYBgNVBAMTEXRsc2NhLmV4 -YW1wbGUuY29tMB4XDTE3MDgzMTA5MTQzMloXDTI3MDgyOTA5MTQzMlowWDELMAkG -A1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFu -Y2lzY28xHDAaBgNVBAMTE29yZGVyZXIuZXhhbXBsZS5jb20wWTATBgcqhkjOPQIB -BggqhkjOPQMBBwNCAARYRRq90z+ioUM2U9OzPnvqvz9Jpza9JOEsG6UJyEzWB8R7 -bHr0XR1Dl8lodlLh3C5vTrb6vqtpNeVXVsd+VVyIo4GWMIGTMA4GA1UdDwEB/wQE -AwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIw -ADArBgNVHSMEJDAigCCNIYZVbIXVFec30MDajQ12cnhbaFy1A7y5XlPcwnn7pzAn -BgNVHREEIDAeghNvcmRlcmVyLmV4YW1wbGUuY29tggdvcmRlcmVyMAoGCCqGSM49 -BAMCA0gAMEUCIQDwjzlscwNhuVcxF+FQy3PNwxsSRSOsQqjmFbMFNDSG6wIgfNO0 -Mp/QtUShzWepgh1nm8MmDNcnVOOeb4JJy6Gd3Ss= +MIICWjCCAgCgAwIBAgIRAK+/fHlh8X0JonkAt70mkSEwCgYIKoZIzj0EAwIwbDEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5l +eGFtcGxlLmNvbTAeFw0xOTA0MDMwOTM2MDBaFw0yOTAzMzEwOTM2MDBaMFgxCzAJ +BgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJh +bmNpc2NvMRwwGgYDVQQDExNvcmRlcmVyLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0C +AQYIKoZIzj0DAQcDQgAEnMCrbnA2tOkYHvTMZvJoo5uEAz/i5T1yqMZ5E433OoFr +7jw8vx72gbOvThAAkKtDQzfzX7FGN/jjxkJe/ZOV4qOBljCBkzAOBgNVHQ8BAf8E +BAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQC +MAAwKwYDVR0jBCQwIoAgJwZVz19Ljmfg8p58Zt6BP9nTkwLb2NwqC1U1sxYZ258w +JwYDVR0RBCAwHoITb3JkZXJlci5leGFtcGxlLmNvbYIHb3JkZXJlcjAKBggqhkjO +PQQDAgNIADBFAiEAnvdPMX47O87ovJyGUTlbiRnJduguoIr031RTmxYTN+UCICWU +YssGBgusVl2lplO9fJRJcn89WqORFygJj/1t8syA -----END CERTIFICATE----- diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.key b/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.key old mode 100755 new mode 100644 index 5f76f8a40b..642e3e853a --- a/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.key +++ b/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.key @@ -1,5 +1,5 @@ -----BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgH/whD1mna09pbmG6 -txGQVIYDx1pZdM/Bkaq1eWYUZqChRANCAARYRRq90z+ioUM2U9OzPnvqvz9Jpza9 -JOEsG6UJyEzWB8R7bHr0XR1Dl8lodlLh3C5vTrb6vqtpNeVXVsd+VVyI +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgYnh9EV9FF22x/Nqm +OxnTqM0stWUBU4O9JHWWwyb19MmhRANCAAScwKtucDa06Rge9Mxm8mijm4QDP+Ll +PXKoxnkTjfc6gWvuPDy/HvaBs69OEACQq0NDN/NfsUY3+OPGQl79k5Xi -----END PRIVATE KEY----- diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/tlsca/270655cf5f4b8e67e0f29e7c66de813fd9d39302dbd8dc2a0b5535b31619db9f_sk b/basic-network/crypto-config/ordererOrganizations/example.com/tlsca/270655cf5f4b8e67e0f29e7c66de813fd9d39302dbd8dc2a0b5535b31619db9f_sk new file mode 100644 index 0000000000..11ce443ecb --- /dev/null +++ b/basic-network/crypto-config/ordererOrganizations/example.com/tlsca/270655cf5f4b8e67e0f29e7c66de813fd9d39302dbd8dc2a0b5535b31619db9f_sk @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgZBfvrqeRMB7smrs4 +5HGU7VrInAL4YqP3akNVytR66uKhRANCAAR3oVXOKK15Rh5C3LuT+tpMhYM+/kD+ +mpcWui1JAO2S4SrCIZLkQAsv5bMfm0tN8bim9u5Z7BVCxpwUfPaVbAz7 +-----END PRIVATE KEY----- diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/tlsca/8d2186556c85d515e737d0c0da8d0d7672785b685cb503bcb95e53dcc279fba7_sk b/basic-network/crypto-config/ordererOrganizations/example.com/tlsca/8d2186556c85d515e737d0c0da8d0d7672785b685cb503bcb95e53dcc279fba7_sk deleted file mode 100755 index f97d39be3a..0000000000 --- a/basic-network/crypto-config/ordererOrganizations/example.com/tlsca/8d2186556c85d515e737d0c0da8d0d7672785b685cb503bcb95e53dcc279fba7_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg6n+vdmDFdoXHLx81 -4KX5d2rChT+6peumwVy6CK6Vld6hRANCAARrURUsnj4B4YrdiX0DZxm3Wt1/WPhG -+Rbf+C/bi7MXOMxDC7dkyWXsBHzv1KHvWB/VYRZho/3fTNHf9B0gJyvF ------END PRIVATE KEY----- diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/tlsca/tlsca.example.com-cert.pem b/basic-network/crypto-config/ordererOrganizations/example.com/tlsca/tlsca.example.com-cert.pem index c0abc7f6f0..e54667dc33 100644 --- a/basic-network/crypto-config/ordererOrganizations/example.com/tlsca/tlsca.example.com-cert.pem +++ b/basic-network/crypto-config/ordererOrganizations/example.com/tlsca/tlsca.example.com-cert.pem @@ -1,14 +1,15 @@ -----BEGIN CERTIFICATE----- -MIICNTCCAdugAwIBAgIQT0WLBisbcQ6AkirTJApb1TAKBggqhkjOPQQDAjBsMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xGjAYBgNVBAMTEXRsc2NhLmV4 -YW1wbGUuY29tMB4XDTE3MDgzMTA5MTQzMloXDTI3MDgyOTA5MTQzMlowbDELMAkG -A1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFu -Y2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5leGFt -cGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABGtRFSyePgHhit2JfQNn -Gbda3X9Y+Eb5Ft/4L9uLsxc4zEMLt2TJZewEfO/Uoe9YH9VhFmGj/d9M0d/0HSAn -K8WjXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNVHSUECDAGBgRVHSUAMA8GA1UdEwEB -/wQFMAMBAf8wKQYDVR0OBCIEII0hhlVshdUV5zfQwNqNDXZyeFtoXLUDvLleU9zC -efunMAoGCCqGSM49BAMCA0gAMEUCIQDxLfsMRqPJuoH77vahGkE6EYMqvzjVI2Ob -aV1DZJfUdwIgHuHXPvKvcoYZgAo7Xc57Uqs6hSpMs0CjzcfLXYiwoVc= +MIICRDCCAeqgAwIBAgIRAJDUJIOlNerIx+QFWaH83u0wCgYIKoZIzj0EAwIwbDEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5l +eGFtcGxlLmNvbTAeFw0xOTA0MDMwOTM2MDBaFw0yOTAzMzEwOTM2MDBaMGwxCzAJ +BgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJh +bmNpc2NvMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEaMBgGA1UEAxMRdGxzY2EuZXhh +bXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR3oVXOKK15Rh5C3LuT ++tpMhYM+/kD+mpcWui1JAO2S4SrCIZLkQAsv5bMfm0tN8bim9u5Z7BVCxpwUfPaV +bAz7o20wazAOBgNVHQ8BAf8EBAMCAaYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsG +AQUFBwMBMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEICcGVc9fS45n4PKefGbe +gT/Z05MC29jcKgtVNbMWGdufMAoGCCqGSM49BAMCA0gAMEUCIQDHa9XqxJ1WPT0r +uMe7oxuiV9wU6PenP8ayIRq9iuaEewIgVPTIqwVeIdFT8UJszIbATd1TpMX9xI1k +ZOCqemwfc9A= -----END CERTIFICATE----- diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/admincerts/Admin@example.com-cert.pem b/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/admincerts/Admin@example.com-cert.pem index 60d3a0b556..26667f9bc6 100644 --- a/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/admincerts/Admin@example.com-cert.pem +++ b/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/admincerts/Admin@example.com-cert.pem @@ -1,13 +1,13 @@ -----BEGIN CERTIFICATE----- -MIICCTCCAbCgAwIBAgIQVMXz1cejr3sGgDsXuIBK3zAKBggqhkjOPQQDAjBpMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w -bGUuY29tMB4XDTE3MDgzMTA5MTQzMloXDTI3MDgyOTA5MTQzMlowVjELMAkGA1UE -BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz -Y28xGjAYBgNVBAMMEUFkbWluQGV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZI -zj0DAQcDQgAEFufLmRXBZHc3d7HvYSU4jR4nJnzfmJlWN6Gm0Bm+NsO8lwb1TDa4 -cPzAOgnbIm1VFwhBd+sE3TIzIWsM2Kzv1aNNMEswDgYDVR0PAQH/BAQDAgeAMAwG -A1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgoGBqSoYKHjHJCiN4jabztrdJJe0NIwYa -9ImUCbpGrmowCgYIKoZIzj0EAwIDRwAwRAIgId+xpuBHjfWvL8aAsDbmMjXAoOYy -BgazcJh446kZaDACIDeyvsH5Xwes5w5Sksv7mb6/kr4ceCy00h1Vlt5bwPiu +MIICCzCCAbGgAwIBAgIRAPEuMhjzbXslBwbekcOmD1AwCgYIKoZIzj0EAwIwaTEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFt +cGxlLmNvbTAeFw0xOTA0MDMwOTM2MDBaFw0yOTAzMzEwOTM2MDBaMFYxCzAJBgNV +BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNp +c2NvMRowGAYDVQQDDBFBZG1pbkBleGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqG +SM49AwEHA0IABKTFtF0SNhy/MW+TYUE9DuBjN9oxqWFUj4p7wdxSLZBRZf5KLX7g +M1CnH7ur9DsJE70n1PX+/vPuMyIeB33V0Y6jTTBLMA4GA1UdDwEB/wQEAwIHgDAM +BgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIGCjoENkaNZQVScyXBI6kCgzKoRvBcX+ +70jw5WzXSmsdMAoGCCqGSM49BAMCA0gAMEUCIQDUkVhWPfOETm7kEb//GlDVEzAW +cr+Y1P/WSng6cYqahQIgdM5jxkfLoR8s8zFctevNEQvQOsNbJlJ08v6yEc9J3tM= -----END CERTIFICATE----- diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/cacerts/ca.example.com-cert.pem b/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/cacerts/ca.example.com-cert.pem index 240d428987..bb1bdb92c9 100644 --- a/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/cacerts/ca.example.com-cert.pem +++ b/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/cacerts/ca.example.com-cert.pem @@ -1,14 +1,15 @@ -----BEGIN CERTIFICATE----- -MIICLjCCAdWgAwIBAgIQHuAANpa/kDL7CPyNttctRjAKBggqhkjOPQQDAjBpMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w -bGUuY29tMB4XDTE3MDgzMTA5MTQzMloXDTI3MDgyOTA5MTQzMlowaTELMAkGA1UE -BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz -Y28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFtcGxlLmNv -bTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABIzTWKIWgOBOxN3budT5HXPthluo -zghOXPXcyD5JBaxafbkgzr8jC3M2rlJJBm0nCmjv6C1LkiCAOftYkyLofLqjXzBd -MA4GA1UdDwEB/wQEAwIBpjAPBgNVHSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMB -Af8wKQYDVR0OBCIEIKBgakqGCh4xyQojeI2m87a3SSXtDSMGGvSJlAm6Rq5qMAoG -CCqGSM49BAMCA0cAMEQCIGShwWIKXmf3oJY3Oow7pKA0SSe89UsRLy2HMxxNzgWx -AiB097hBfmM2JEZsEZfMbEM2U7edQIDyCoPOgm5ha9wDNw== +MIICPjCCAeSgAwIBAgIRAIvKUkOSe/nqaK1yUopBGiEwCgYIKoZIzj0EAwIwaTEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFt +cGxlLmNvbTAeFw0xOTA0MDMwOTM2MDBaFw0yOTAzMzEwOTM2MDBaMGkxCzAJBgNV +BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNp +c2NvMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEXMBUGA1UEAxMOY2EuZXhhbXBsZS5j +b20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASnZ+ZV2YbfMPvQaGfqwVLZ0uho +9TioTj5Pfj40QIyixko1llyrq9Dt9T3m4XvfKB2yk171IdUNAepmB1K52PnVo20w +azAOBgNVHQ8BAf8EBAMCAaYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB +MA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIGCjoENkaNZQVScyXBI6kCgzKoRv +BcX+70jw5WzXSmsdMAoGCCqGSM49BAMCA0gAMEUCIQDDuM0qeCmrJ7QvPQJrKtiT +h3W0rPsxWG9reunkChLklwIgXjo90TxZQzmXvRYkQldGJ3fBQDyQbRlGl74oGS2i +eEE= -----END CERTIFICATE----- diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/keystore/1deeab5433fa6e5f045eb763109d6165268fba153211af1281f00d45f54b1022_sk b/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/keystore/1deeab5433fa6e5f045eb763109d6165268fba153211af1281f00d45f54b1022_sk deleted file mode 100755 index 0cf298210a..0000000000 --- a/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/keystore/1deeab5433fa6e5f045eb763109d6165268fba153211af1281f00d45f54b1022_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgAKUK8aZ5PJMhPpx4 -7mMQoJaha/3jhprXOSxj83ibaYShRANCAAQW58uZFcFkdzd3se9hJTiNHicmfN+Y -mVY3oabQGb42w7yXBvVMNrhw/MA6CdsibVUXCEF36wTdMjMhawzYrO/V ------END PRIVATE KEY----- diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/keystore/4f9f167ca424595a28a1451e7fae65d24b11b4eac59b53304e19107d08e6f19f_sk b/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/keystore/4f9f167ca424595a28a1451e7fae65d24b11b4eac59b53304e19107d08e6f19f_sk new file mode 100644 index 0000000000..3f03182838 --- /dev/null +++ b/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/keystore/4f9f167ca424595a28a1451e7fae65d24b11b4eac59b53304e19107d08e6f19f_sk @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgmvJiin2qoymcDI/e +ktT63g8JUClSQPx0q3Bu89UAeUChRANCAASkxbRdEjYcvzFvk2FBPQ7gYzfaMalh +VI+Ke8HcUi2QUWX+Si1+4DNQpx+7q/Q7CRO9J9T1/v7z7jMiHgd91dGO +-----END PRIVATE KEY----- diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/signcerts/Admin@example.com-cert.pem b/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/signcerts/Admin@example.com-cert.pem index 60d3a0b556..26667f9bc6 100644 --- a/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/signcerts/Admin@example.com-cert.pem +++ b/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/signcerts/Admin@example.com-cert.pem @@ -1,13 +1,13 @@ -----BEGIN CERTIFICATE----- -MIICCTCCAbCgAwIBAgIQVMXz1cejr3sGgDsXuIBK3zAKBggqhkjOPQQDAjBpMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w -bGUuY29tMB4XDTE3MDgzMTA5MTQzMloXDTI3MDgyOTA5MTQzMlowVjELMAkGA1UE -BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz -Y28xGjAYBgNVBAMMEUFkbWluQGV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZI -zj0DAQcDQgAEFufLmRXBZHc3d7HvYSU4jR4nJnzfmJlWN6Gm0Bm+NsO8lwb1TDa4 -cPzAOgnbIm1VFwhBd+sE3TIzIWsM2Kzv1aNNMEswDgYDVR0PAQH/BAQDAgeAMAwG -A1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgoGBqSoYKHjHJCiN4jabztrdJJe0NIwYa -9ImUCbpGrmowCgYIKoZIzj0EAwIDRwAwRAIgId+xpuBHjfWvL8aAsDbmMjXAoOYy -BgazcJh446kZaDACIDeyvsH5Xwes5w5Sksv7mb6/kr4ceCy00h1Vlt5bwPiu +MIICCzCCAbGgAwIBAgIRAPEuMhjzbXslBwbekcOmD1AwCgYIKoZIzj0EAwIwaTEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFt +cGxlLmNvbTAeFw0xOTA0MDMwOTM2MDBaFw0yOTAzMzEwOTM2MDBaMFYxCzAJBgNV +BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNp +c2NvMRowGAYDVQQDDBFBZG1pbkBleGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqG +SM49AwEHA0IABKTFtF0SNhy/MW+TYUE9DuBjN9oxqWFUj4p7wdxSLZBRZf5KLX7g +M1CnH7ur9DsJE70n1PX+/vPuMyIeB33V0Y6jTTBLMA4GA1UdDwEB/wQEAwIHgDAM +BgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIGCjoENkaNZQVScyXBI6kCgzKoRvBcX+ +70jw5WzXSmsdMAoGCCqGSM49BAMCA0gAMEUCIQDUkVhWPfOETm7kEb//GlDVEzAW +cr+Y1P/WSng6cYqahQIgdM5jxkfLoR8s8zFctevNEQvQOsNbJlJ08v6yEc9J3tM= -----END CERTIFICATE----- diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/tlscacerts/tlsca.example.com-cert.pem b/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/tlscacerts/tlsca.example.com-cert.pem index c0abc7f6f0..e54667dc33 100644 --- a/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/tlscacerts/tlsca.example.com-cert.pem +++ b/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/tlscacerts/tlsca.example.com-cert.pem @@ -1,14 +1,15 @@ -----BEGIN CERTIFICATE----- -MIICNTCCAdugAwIBAgIQT0WLBisbcQ6AkirTJApb1TAKBggqhkjOPQQDAjBsMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xGjAYBgNVBAMTEXRsc2NhLmV4 -YW1wbGUuY29tMB4XDTE3MDgzMTA5MTQzMloXDTI3MDgyOTA5MTQzMlowbDELMAkG -A1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFu -Y2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5leGFt -cGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABGtRFSyePgHhit2JfQNn -Gbda3X9Y+Eb5Ft/4L9uLsxc4zEMLt2TJZewEfO/Uoe9YH9VhFmGj/d9M0d/0HSAn -K8WjXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNVHSUECDAGBgRVHSUAMA8GA1UdEwEB -/wQFMAMBAf8wKQYDVR0OBCIEII0hhlVshdUV5zfQwNqNDXZyeFtoXLUDvLleU9zC -efunMAoGCCqGSM49BAMCA0gAMEUCIQDxLfsMRqPJuoH77vahGkE6EYMqvzjVI2Ob -aV1DZJfUdwIgHuHXPvKvcoYZgAo7Xc57Uqs6hSpMs0CjzcfLXYiwoVc= +MIICRDCCAeqgAwIBAgIRAJDUJIOlNerIx+QFWaH83u0wCgYIKoZIzj0EAwIwbDEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5l +eGFtcGxlLmNvbTAeFw0xOTA0MDMwOTM2MDBaFw0yOTAzMzEwOTM2MDBaMGwxCzAJ +BgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJh +bmNpc2NvMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEaMBgGA1UEAxMRdGxzY2EuZXhh +bXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR3oVXOKK15Rh5C3LuT ++tpMhYM+/kD+mpcWui1JAO2S4SrCIZLkQAsv5bMfm0tN8bim9u5Z7BVCxpwUfPaV +bAz7o20wazAOBgNVHQ8BAf8EBAMCAaYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsG +AQUFBwMBMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEICcGVc9fS45n4PKefGbe +gT/Z05MC29jcKgtVNbMWGdufMAoGCCqGSM49BAMCA0gAMEUCIQDHa9XqxJ1WPT0r +uMe7oxuiV9wU6PenP8ayIRq9iuaEewIgVPTIqwVeIdFT8UJszIbATd1TpMX9xI1k +ZOCqemwfc9A= -----END CERTIFICATE----- diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/ca.crt b/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/ca.crt index c0abc7f6f0..e54667dc33 100644 --- a/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/ca.crt +++ b/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/ca.crt @@ -1,14 +1,15 @@ -----BEGIN CERTIFICATE----- -MIICNTCCAdugAwIBAgIQT0WLBisbcQ6AkirTJApb1TAKBggqhkjOPQQDAjBsMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xGjAYBgNVBAMTEXRsc2NhLmV4 -YW1wbGUuY29tMB4XDTE3MDgzMTA5MTQzMloXDTI3MDgyOTA5MTQzMlowbDELMAkG -A1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFu -Y2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5leGFt -cGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABGtRFSyePgHhit2JfQNn -Gbda3X9Y+Eb5Ft/4L9uLsxc4zEMLt2TJZewEfO/Uoe9YH9VhFmGj/d9M0d/0HSAn -K8WjXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNVHSUECDAGBgRVHSUAMA8GA1UdEwEB -/wQFMAMBAf8wKQYDVR0OBCIEII0hhlVshdUV5zfQwNqNDXZyeFtoXLUDvLleU9zC -efunMAoGCCqGSM49BAMCA0gAMEUCIQDxLfsMRqPJuoH77vahGkE6EYMqvzjVI2Ob -aV1DZJfUdwIgHuHXPvKvcoYZgAo7Xc57Uqs6hSpMs0CjzcfLXYiwoVc= +MIICRDCCAeqgAwIBAgIRAJDUJIOlNerIx+QFWaH83u0wCgYIKoZIzj0EAwIwbDEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5l +eGFtcGxlLmNvbTAeFw0xOTA0MDMwOTM2MDBaFw0yOTAzMzEwOTM2MDBaMGwxCzAJ +BgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJh +bmNpc2NvMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEaMBgGA1UEAxMRdGxzY2EuZXhh +bXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR3oVXOKK15Rh5C3LuT ++tpMhYM+/kD+mpcWui1JAO2S4SrCIZLkQAsv5bMfm0tN8bim9u5Z7BVCxpwUfPaV +bAz7o20wazAOBgNVHQ8BAf8EBAMCAaYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsG +AQUFBwMBMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEICcGVc9fS45n4PKefGbe +gT/Z05MC29jcKgtVNbMWGdufMAoGCCqGSM49BAMCA0gAMEUCIQDHa9XqxJ1WPT0r +uMe7oxuiV9wU6PenP8ayIRq9iuaEewIgVPTIqwVeIdFT8UJszIbATd1TpMX9xI1k +ZOCqemwfc9A= -----END CERTIFICATE----- diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/client.crt b/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/client.crt new file mode 100644 index 0000000000..4c9964ea24 --- /dev/null +++ b/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/client.crt @@ -0,0 +1,14 @@ +-----BEGIN CERTIFICATE----- +MIICLDCCAdKgAwIBAgIQVuAtoS1vz2Gr+5hiIwtb0DAKBggqhkjOPQQDAjBsMQsw +CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy +YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xGjAYBgNVBAMTEXRsc2NhLmV4 +YW1wbGUuY29tMB4XDTE5MDQwMzA5MzYwMFoXDTI5MDMzMTA5MzYwMFowVjELMAkG +A1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFu +Y2lzY28xGjAYBgNVBAMMEUFkbWluQGV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYI +KoZIzj0DAQcDQgAESAFACnTk8V+rMUcMtnMFlSXhoOYTURfwBWk/iJtsoMIRsLu+ +Qng5BjYfVvd8RYisAglDhPgd6julcKEz814Wh6NsMGowDgYDVR0PAQH/BAQDAgWg +MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMCsG +A1UdIwQkMCKAICcGVc9fS45n4PKefGbegT/Z05MC29jcKgtVNbMWGdufMAoGCCqG +SM49BAMCA0gAMEUCIQDh5qGMzriI6RcSrU85JmumjbVNfQyxT1MJJLiWd46B/gIg +S6UD/IvMw8bRd8JmLtsiA9NYWPt9MJQHn0Sg/R5ae84= +-----END CERTIFICATE----- diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/client.key b/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/client.key new file mode 100644 index 0000000000..ed1e73e010 --- /dev/null +++ b/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/client.key @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQggyhsL95l1/svyPqF +SDXTaMU8g8Z/kKSVZGUB3HYZmKyhRANCAARIAUAKdOTxX6sxRwy2cwWVJeGg5hNR +F/AFaT+Im2ygwhGwu75CeDkGNh9W93xFiKwCCUOE+B3qO6VwoTPzXhaH +-----END PRIVATE KEY----- diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/server.crt b/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/server.crt deleted file mode 100644 index 634da5ff32..0000000000 --- a/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/server.crt +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICKzCCAdKgAwIBAgIQHYv3zMnbbON0eufj3s78FTAKBggqhkjOPQQDAjBsMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xGjAYBgNVBAMTEXRsc2NhLmV4 -YW1wbGUuY29tMB4XDTE3MDgzMTA5MTQzMloXDTI3MDgyOTA5MTQzMlowVjELMAkG -A1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFu -Y2lzY28xGjAYBgNVBAMMEUFkbWluQGV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYI -KoZIzj0DAQcDQgAEZsLfeA+tjHJJOyxhJOP31uDluC6eCnMBq0LKawBugaoI3vqh -T8ux5ty+ooSJk7EN3pTQa10m0qX/Y7e0J79JL6NsMGowDgYDVR0PAQH/BAQDAgWg -MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMCsG -A1UdIwQkMCKAII0hhlVshdUV5zfQwNqNDXZyeFtoXLUDvLleU9zCefunMAoGCCqG -SM49BAMCA0cAMEQCIEcK5iAxpGN1wtC5w+590RJrLzD7DOzVCUIxAdJp80BUAiA/ -XMFE+lHMJmqeoqmXG14Z/70xmHChlyHxm6lFR2I6gw== ------END CERTIFICATE----- diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/server.key b/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/server.key deleted file mode 100755 index 2f0e055834..0000000000 --- a/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/server.key +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg19ebRLtFBB+n9OCa -KcXLds/nf306mSDnnrA7tlZVjaOhRANCAARmwt94D62Mckk7LGEk4/fW4OW4Lp4K -cwGrQsprAG6Bqgje+qFPy7Hm3L6ihImTsQ3elNBrXSbSpf9jt7Qnv0kv ------END PRIVATE KEY----- diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/ca/4239aa0dcd76daeeb8ba0cda701851d14504d31aad1b2ddddbac6a57365e497c_sk b/basic-network/crypto-config/peerOrganizations/org1.example.com/ca/4239aa0dcd76daeeb8ba0cda701851d14504d31aad1b2ddddbac6a57365e497c_sk deleted file mode 100755 index 87743a0761..0000000000 --- a/basic-network/crypto-config/peerOrganizations/org1.example.com/ca/4239aa0dcd76daeeb8ba0cda701851d14504d31aad1b2ddddbac6a57365e497c_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgYMqNZRu/I7vdcjpm -Tj+O9T4AYXi3MBNW4nzWHJN8nLqhRANCAATNLYBI3trLI/wFhYf+9MpnVb1R/vBF -rbu/43J+R8u4E73sCcx0nRfYCA+dHf22ceuSjq3lMXraorVev5tg4Dc7 ------END PRIVATE KEY----- diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/ca/4b8f785ca3d30a7af17a0cfcf0315de6d6509a12ae17db15b1b7209c75ca27d2_sk b/basic-network/crypto-config/peerOrganizations/org1.example.com/ca/4b8f785ca3d30a7af17a0cfcf0315de6d6509a12ae17db15b1b7209c75ca27d2_sk new file mode 100644 index 0000000000..0ea59270cb --- /dev/null +++ b/basic-network/crypto-config/peerOrganizations/org1.example.com/ca/4b8f785ca3d30a7af17a0cfcf0315de6d6509a12ae17db15b1b7209c75ca27d2_sk @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgeMBO+L4wMaEqygjS +Y4ywCi7ZJn0F90m6MlxoPWsRUjqhRANCAATw/6D7q1n72KQJc5yxQ99xlU/HRdF7 +L+bu23EXA+MYq9Qg2RmTZ8kwH+qMfuFdRA3KclGFYFrMlnnkbmKG8vG1 +-----END PRIVATE KEY----- diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/ca/ca.org1.example.com-cert.pem b/basic-network/crypto-config/peerOrganizations/org1.example.com/ca/ca.org1.example.com-cert.pem index 8a4119f49a..b35e6ed8a3 100644 --- a/basic-network/crypto-config/peerOrganizations/org1.example.com/ca/ca.org1.example.com-cert.pem +++ b/basic-network/crypto-config/peerOrganizations/org1.example.com/ca/ca.org1.example.com-cert.pem @@ -1,15 +1,15 @@ -----BEGIN CERTIFICATE----- -MIICRDCCAeqgAwIBAgIRAIk/1HQ6XgI0p64PQwvUA3owCgYIKoZIzj0EAwIwczEL +MIICUTCCAfigAwIBAgIRAL2BME0pO7MLvn4YdGSnMZ0wCgYIKoZIzj0EAwIwczEL MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh -Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTcwODMxMDkxNDMyWhcNMjcwODI5MDkxNDMy +Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwNDAzMDkzNjAwWhcNMjkwMzMxMDkzNjAw WjBzMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN U2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UE AxMTY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IA -BM0tgEje2ssj/AWFh/70ymdVvVH+8EWtu7/jcn5Hy7gTvewJzHSdF9gID50d/bZx -65KOreUxetqitV6/m2DgNzujXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNVHSUECDAG -BgRVHSUAMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIEI5qg3NdtruuLoM2nAY -UdFFBNMarRst3dusalc2Xkl8MAoGCCqGSM49BAMCA0gAMEUCIQDufxsHbxkSP/y+ -oM2xZGgHL5XSTJVBqBryk1rd08Af6QIgLiAwtR7iKRbf1pKKCkt66MZzItZXC0po -/45uf29T/sc= +BPD/oPurWfvYpAlznLFD33GVT8dF0Xsv5u7bcRcD4xir1CDZGZNnyTAf6ox+4V1E +DcpyUYVgWsyWeeRuYoby8bWjbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNVHSUEFjAU +BggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQg +S494XKPTCnrxegz88DFd5tZQmhKuF9sVsbcgnHXKJ9IwCgYIKoZIzj0EAwIDRwAw +RAIgE6PLk5AyIyxUjydmsu43e5Vls9i55KvQVZWlkEd1l4wCIB82B29Cc4g8/Ean +9lmpctb59bKnBG/c474a1+d3ocTG -----END CERTIFICATE----- diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/ca/org1.example.com-cert.pem b/basic-network/crypto-config/peerOrganizations/org1.example.com/ca/org1.example.com-cert.pem deleted file mode 100644 index ca05efc3bc..0000000000 --- a/basic-network/crypto-config/peerOrganizations/org1.example.com/ca/org1.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICFjCCAb2gAwIBAgIUNDCk4a9Z/oaid+BBpYAGT8A18f8wCgYIKoZIzj0EAwIw -aDELMAkGA1UEBhMCVVMxFzAVBgNVBAgTDk5vcnRoIENhcm9saW5hMRQwEgYDVQQK -EwtIeXBlcmxlZGdlcjEPMA0GA1UECxMGRmFicmljMRkwFwYDVQQDExBmYWJyaWMt -Y2Etc2VydmVyMB4XDTE3MDgzMTE1MzcwMFoXDTMyMDgyNzE1MzcwMFowaDELMAkG -A1UEBhMCVVMxFzAVBgNVBAgTDk5vcnRoIENhcm9saW5hMRQwEgYDVQQKEwtIeXBl -cmxlZGdlcjEPMA0GA1UECxMGRmFicmljMRkwFwYDVQQDExBmYWJyaWMtY2Etc2Vy -dmVyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAExzMhy+KdVYhr6sqA32pAKwM6 -DrPal71NXVNzF/Mdep2jlbhSMu73gwz+q4Hy+SoPnyuIYCpCy5rJhXwEnoQJvaNF -MEMwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQEwHQYDVR0OBBYE -FNLXRcya9ZgImWIPbPPsrdTIDuPEMAoGCCqGSM49BAMCA0cAMEQCIGL9qKSaPG6U -IMvw1zolTgimpIxwulGOuQeVybPwYI3oAiBCmOSz5PfASGh8VtCUCCwE+Ef1xQGI -q6Zjh87nj/eyqQ== ------END CERTIFICATE----- diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem b/basic-network/crypto-config/peerOrganizations/org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem index df8f568c11..264fa9edfc 100644 --- a/basic-network/crypto-config/peerOrganizations/org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem +++ b/basic-network/crypto-config/peerOrganizations/org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem @@ -1,14 +1,14 @@ -----BEGIN CERTIFICATE----- -MIICGDCCAb+gAwIBAgIQFSxnLAGsu04zrFkAEwzn6zAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMS5leGFtcGxlLmNvbTAeFw0xNzA4MzEwOTE0MzJaFw0yNzA4MjkwOTE0MzJa -MFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMR8wHQYDVQQDDBZBZG1pbkBvcmcxLmV4YW1wbGUuY29tMFkw -EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEV1dfmKxsFKWo7o6DNBIaIVebCCPAM9C/ -sLBt4pJRre9pWE987DjXZoZ3glc4+DoPMtTmBRqbPVwYcUvpbYY8p6NNMEswDgYD -VR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgQjmqDc122u64 -ugzacBhR0UUE0xqtGy3d26xqVzZeSXwwCgYIKoZIzj0EAwIDRwAwRAIgXMy26AEU -/GUMPfCMs/nQjQME1ZxBHAYZtKEuRR361JsCIEg9BOZdIoioRivJC+ZUzvJUnkXu -o2HkWiuxLsibGxtE +MIICKjCCAdGgAwIBAgIRAKc1wbuvKM6xOY8IpsRuQ5swCgYIKoZIzj0EAwIwczEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh +Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwNDAzMDkzNjAwWhcNMjkwMzMxMDkzNjAw +WjBsMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN +U2FuIEZyYW5jaXNjbzEPMA0GA1UECxMGY2xpZW50MR8wHQYDVQQDDBZBZG1pbkBv +cmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEbDNRdCJE +su0E+qEleJ4gsJ+9ffFfbnVkRSsDR54NFXDNsUI/mxtCMDEGSHBRMMuD2D87KT3L +/zVWxeFQGa282aNNMEswDgYDVR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYD +VR0jBCQwIoAgS494XKPTCnrxegz88DFd5tZQmhKuF9sVsbcgnHXKJ9IwCgYIKoZI +zj0EAwIDRwAwRAIgJjjGMKrXBviADGyfo6Otu1jqYIXTbDeU2vzWjp4dpagCIE2+ +7kVbT+kWYNmnFmYpGuR/D4FdqgiQf/HeyxxyA4en -----END CERTIFICATE----- diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem b/basic-network/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem index 8a4119f49a..b35e6ed8a3 100644 --- a/basic-network/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem +++ b/basic-network/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem @@ -1,15 +1,15 @@ -----BEGIN CERTIFICATE----- -MIICRDCCAeqgAwIBAgIRAIk/1HQ6XgI0p64PQwvUA3owCgYIKoZIzj0EAwIwczEL +MIICUTCCAfigAwIBAgIRAL2BME0pO7MLvn4YdGSnMZ0wCgYIKoZIzj0EAwIwczEL MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh -Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTcwODMxMDkxNDMyWhcNMjcwODI5MDkxNDMy +Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwNDAzMDkzNjAwWhcNMjkwMzMxMDkzNjAw WjBzMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN U2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UE AxMTY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IA -BM0tgEje2ssj/AWFh/70ymdVvVH+8EWtu7/jcn5Hy7gTvewJzHSdF9gID50d/bZx -65KOreUxetqitV6/m2DgNzujXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNVHSUECDAG -BgRVHSUAMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIEI5qg3NdtruuLoM2nAY -UdFFBNMarRst3dusalc2Xkl8MAoGCCqGSM49BAMCA0gAMEUCIQDufxsHbxkSP/y+ -oM2xZGgHL5XSTJVBqBryk1rd08Af6QIgLiAwtR7iKRbf1pKKCkt66MZzItZXC0po -/45uf29T/sc= +BPD/oPurWfvYpAlznLFD33GVT8dF0Xsv5u7bcRcD4xir1CDZGZNnyTAf6ox+4V1E +DcpyUYVgWsyWeeRuYoby8bWjbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNVHSUEFjAU +BggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQg +S494XKPTCnrxegz88DFd5tZQmhKuF9sVsbcgnHXKJ9IwCgYIKoZIzj0EAwIDRwAw +RAIgE6PLk5AyIyxUjydmsu43e5Vls9i55KvQVZWlkEd1l4wCIB82B29Cc4g8/Ean +9lmpctb59bKnBG/c474a1+d3ocTG -----END CERTIFICATE----- diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/msp/config.yaml b/basic-network/crypto-config/peerOrganizations/org1.example.com/msp/config.yaml new file mode 100644 index 0000000000..f044870547 --- /dev/null +++ b/basic-network/crypto-config/peerOrganizations/org1.example.com/msp/config.yaml @@ -0,0 +1,8 @@ +NodeOUs: + Enable: true + ClientOUIdentifier: + Certificate: cacerts/ca.org1.example.com-cert.pem + OrganizationalUnitIdentifier: client + PeerOUIdentifier: + Certificate: cacerts/ca.org1.example.com-cert.pem + OrganizationalUnitIdentifier: peer diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem b/basic-network/crypto-config/peerOrganizations/org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem index b2a4a2d426..b5ce9e2052 100644 --- a/basic-network/crypto-config/peerOrganizations/org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem +++ b/basic-network/crypto-config/peerOrganizations/org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem @@ -1,15 +1,15 @@ -----BEGIN CERTIFICATE----- -MIICSTCCAfCgAwIBAgIRALOo7o5dtcd8yGpCqowtoIUwCgYIKoZIzj0EAwIwdjEL +MIICVzCCAf6gAwIBAgIRAID7lGZ/MP6IC8UYTDn4FLQwCgYIKoZIzj0EAwIwdjEL MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTcwODMxMDkxNDMyWhcNMjcwODI5MDkx -NDMyWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE +c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwNDAzMDkzNjAwWhcNMjkwMzMxMDkz +NjAwWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0G A1UEAxMWdGxzY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABAftdw28/JThHyrfF4SCTjHUykfeQZ3eqSwYlkCqYF1Lwzae18o97Biz -doz/BBMjisAoJESyzVOrGj7nGD7EzwWjXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNV -HSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIO0/2COT6V/C -xHWvwRPI0sWR90XRurxNbZzOChrMForLMAoGCCqGSM49BAMCA0cAMEQCIGd4ZaLj -1R4C25obVTI/pWriqWlXXAV7h2ZQfD41nNMYAiAO858VYb4xyLUkF9XGtZJpux4x -0ClsWNgEp49nBBsecw== +AwEHA0IABNSoMBOuJDL6KO00PQrsLSiM3i+18O4j7qh6eqNjXhCpnoFlLVJKva3S +mXOA8OjWvDrGjPLBAPJaQAVpMQgib8SjbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNV +HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNV +HQ4EIgQg8IrTb4rYg9sQnDXSJibB1rub3hl/1S2edHFfxXVCWZMwCgYIKoZIzj0E +AwIDRwAwRAIgcF/hO88rEQz3pcsSOUtEwx/THemmDsEjOQVowPR6oMcCIC/zS6Zo +rd4x0veATGx/OG7avXP82Soi/2z9gJxUKsGv -----END CERTIFICATE----- diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem b/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem index df8f568c11..264fa9edfc 100644 --- a/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem +++ b/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem @@ -1,14 +1,14 @@ -----BEGIN CERTIFICATE----- -MIICGDCCAb+gAwIBAgIQFSxnLAGsu04zrFkAEwzn6zAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMS5leGFtcGxlLmNvbTAeFw0xNzA4MzEwOTE0MzJaFw0yNzA4MjkwOTE0MzJa -MFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMR8wHQYDVQQDDBZBZG1pbkBvcmcxLmV4YW1wbGUuY29tMFkw -EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEV1dfmKxsFKWo7o6DNBIaIVebCCPAM9C/ -sLBt4pJRre9pWE987DjXZoZ3glc4+DoPMtTmBRqbPVwYcUvpbYY8p6NNMEswDgYD -VR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgQjmqDc122u64 -ugzacBhR0UUE0xqtGy3d26xqVzZeSXwwCgYIKoZIzj0EAwIDRwAwRAIgXMy26AEU -/GUMPfCMs/nQjQME1ZxBHAYZtKEuRR361JsCIEg9BOZdIoioRivJC+ZUzvJUnkXu -o2HkWiuxLsibGxtE +MIICKjCCAdGgAwIBAgIRAKc1wbuvKM6xOY8IpsRuQ5swCgYIKoZIzj0EAwIwczEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh +Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwNDAzMDkzNjAwWhcNMjkwMzMxMDkzNjAw +WjBsMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN +U2FuIEZyYW5jaXNjbzEPMA0GA1UECxMGY2xpZW50MR8wHQYDVQQDDBZBZG1pbkBv +cmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEbDNRdCJE +su0E+qEleJ4gsJ+9ffFfbnVkRSsDR54NFXDNsUI/mxtCMDEGSHBRMMuD2D87KT3L +/zVWxeFQGa282aNNMEswDgYDVR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYD +VR0jBCQwIoAgS494XKPTCnrxegz88DFd5tZQmhKuF9sVsbcgnHXKJ9IwCgYIKoZI +zj0EAwIDRwAwRAIgJjjGMKrXBviADGyfo6Otu1jqYIXTbDeU2vzWjp4dpagCIE2+ +7kVbT+kWYNmnFmYpGuR/D4FdqgiQf/HeyxxyA4en -----END CERTIFICATE----- diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem b/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem index 8a4119f49a..b35e6ed8a3 100644 --- a/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem +++ b/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem @@ -1,15 +1,15 @@ -----BEGIN CERTIFICATE----- -MIICRDCCAeqgAwIBAgIRAIk/1HQ6XgI0p64PQwvUA3owCgYIKoZIzj0EAwIwczEL +MIICUTCCAfigAwIBAgIRAL2BME0pO7MLvn4YdGSnMZ0wCgYIKoZIzj0EAwIwczEL MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh -Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTcwODMxMDkxNDMyWhcNMjcwODI5MDkxNDMy +Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwNDAzMDkzNjAwWhcNMjkwMzMxMDkzNjAw WjBzMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN U2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UE AxMTY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IA -BM0tgEje2ssj/AWFh/70ymdVvVH+8EWtu7/jcn5Hy7gTvewJzHSdF9gID50d/bZx -65KOreUxetqitV6/m2DgNzujXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNVHSUECDAG -BgRVHSUAMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIEI5qg3NdtruuLoM2nAY -UdFFBNMarRst3dusalc2Xkl8MAoGCCqGSM49BAMCA0gAMEUCIQDufxsHbxkSP/y+ -oM2xZGgHL5XSTJVBqBryk1rd08Af6QIgLiAwtR7iKRbf1pKKCkt66MZzItZXC0po -/45uf29T/sc= +BPD/oPurWfvYpAlznLFD33GVT8dF0Xsv5u7bcRcD4xir1CDZGZNnyTAf6ox+4V1E +DcpyUYVgWsyWeeRuYoby8bWjbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNVHSUEFjAU +BggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQg +S494XKPTCnrxegz88DFd5tZQmhKuF9sVsbcgnHXKJ9IwCgYIKoZIzj0EAwIDRwAw +RAIgE6PLk5AyIyxUjydmsu43e5Vls9i55KvQVZWlkEd1l4wCIB82B29Cc4g8/Ean +9lmpctb59bKnBG/c474a1+d3ocTG -----END CERTIFICATE----- diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/config.yaml b/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/config.yaml new file mode 100644 index 0000000000..f044870547 --- /dev/null +++ b/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/config.yaml @@ -0,0 +1,8 @@ +NodeOUs: + Enable: true + ClientOUIdentifier: + Certificate: cacerts/ca.org1.example.com-cert.pem + OrganizationalUnitIdentifier: client + PeerOUIdentifier: + Certificate: cacerts/ca.org1.example.com-cert.pem + OrganizationalUnitIdentifier: peer diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/keystore/46be1d569fe68f33e517c9e0072a0ccfbfb42727480fb8c8d0223af321a7893d_sk b/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/keystore/46be1d569fe68f33e517c9e0072a0ccfbfb42727480fb8c8d0223af321a7893d_sk deleted file mode 100755 index 6fb7ddea4b..0000000000 --- a/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/keystore/46be1d569fe68f33e517c9e0072a0ccfbfb42727480fb8c8d0223af321a7893d_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg46tw2jZtucld26uq -RQAPPB1+y8BilJU2luj/OsMinWahRANCAAR4ocVupLNwdvuV3WwFatwgYMUUUWdt -sc86apw/OpypM+3wRJQboZV5diuq08cmNjgTgdLbPJHqmfd8bnkRspq2 ------END PRIVATE KEY----- diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/keystore/9a8eca60905ae4df38b8dc09ea71328346d467cf9ce32b59efebfe5ad8491707_sk b/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/keystore/9a8eca60905ae4df38b8dc09ea71328346d467cf9ce32b59efebfe5ad8491707_sk new file mode 100644 index 0000000000..4e1db0780c --- /dev/null +++ b/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/keystore/9a8eca60905ae4df38b8dc09ea71328346d467cf9ce32b59efebfe5ad8491707_sk @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgFLWnQjBCqySJe1gA +AbczdCMo/zz9GjzthGOAfLm2As+hRANCAAS2TbiGZvS+QZgGOsRzwQ3zMK4Gy7zM +9bwdWP1I7GBKfl/IHY72qqJlwhQsUdVG6h1nm4ag6uRvvJg6vwgobRZ5 +-----END PRIVATE KEY----- diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/signcerts/peer0.org1.example.com-cert.pem b/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/signcerts/peer0.org1.example.com-cert.pem index b06c3bf9fd..65b40a2e00 100644 --- a/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/signcerts/peer0.org1.example.com-cert.pem +++ b/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/signcerts/peer0.org1.example.com-cert.pem @@ -1,14 +1,14 @@ -----BEGIN CERTIFICATE----- -MIICGjCCAcCgAwIBAgIRAPlwF/rUZUP9mqN4wSml4iswCgYIKoZIzj0EAwIwczEL +MIICKTCCAc+gAwIBAgIRAKcgY7VzX/a/bxg4c9GmT1UwCgYIKoZIzj0EAwIwczEL MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh -Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTcwODMxMDkxNDMyWhcNMjcwODI5MDkxNDMy -WjBbMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN -U2FuIEZyYW5jaXNjbzEfMB0GA1UEAxMWcGVlcjAub3JnMS5leGFtcGxlLmNvbTBZ -MBMGByqGSM49AgEGCCqGSM49AwEHA0IABHihxW6ks3B2+5XdbAVq3CBgxRRRZ22x -zzpqnD86nKkz7fBElBuhlXl2K6rTxyY2OBOB0ts8keqZ93xueRGymrajTTBLMA4G -A1UdDwEB/wQEAwIHgDAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIEI5qg3Ndtru -uLoM2nAYUdFFBNMarRst3dusalc2Xkl8MAoGCCqGSM49BAMCA0gAMEUCIQD4j0Rn -e1rrd0FSCzsR6u+IuuPK5dI/kR/bh7+VLf0TNgIgCfUtkJvfvzVEwZLFoFyjoHtr -tvwzNUS1U0hEqIaDeo4= +Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwNDAzMDkzNjAwWhcNMjkwMzMxMDkzNjAw +WjBqMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN +U2FuIEZyYW5jaXNjbzENMAsGA1UECxMEcGVlcjEfMB0GA1UEAxMWcGVlcjAub3Jn +MS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABLZNuIZm9L5B +mAY6xHPBDfMwrgbLvMz1vB1Y/UjsYEp+X8gdjvaqomXCFCxR1UbqHWebhqDq5G+8 +mDq/CChtFnmjTTBLMA4GA1UdDwEB/wQEAwIHgDAMBgNVHRMBAf8EAjAAMCsGA1Ud +IwQkMCKAIEuPeFyj0wp68XoM/PAxXebWUJoSrhfbFbG3IJx1yifSMAoGCCqGSM49 +BAMCA0gAMEUCIQC9PLIHZdMXbgUTU5oGjZb/D7nTj+GUnHK+NE/Kmh2zUwIgbvhZ +2+L8d6rwhMvcPR1xWpKOr0xkUwIUIAC1KU1i6Fg= -----END CERTIFICATE----- diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem b/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem index b2a4a2d426..b5ce9e2052 100644 --- a/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem +++ b/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem @@ -1,15 +1,15 @@ -----BEGIN CERTIFICATE----- -MIICSTCCAfCgAwIBAgIRALOo7o5dtcd8yGpCqowtoIUwCgYIKoZIzj0EAwIwdjEL +MIICVzCCAf6gAwIBAgIRAID7lGZ/MP6IC8UYTDn4FLQwCgYIKoZIzj0EAwIwdjEL MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTcwODMxMDkxNDMyWhcNMjcwODI5MDkx -NDMyWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE +c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwNDAzMDkzNjAwWhcNMjkwMzMxMDkz +NjAwWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0G A1UEAxMWdGxzY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABAftdw28/JThHyrfF4SCTjHUykfeQZ3eqSwYlkCqYF1Lwzae18o97Biz -doz/BBMjisAoJESyzVOrGj7nGD7EzwWjXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNV -HSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIO0/2COT6V/C -xHWvwRPI0sWR90XRurxNbZzOChrMForLMAoGCCqGSM49BAMCA0cAMEQCIGd4ZaLj -1R4C25obVTI/pWriqWlXXAV7h2ZQfD41nNMYAiAO858VYb4xyLUkF9XGtZJpux4x -0ClsWNgEp49nBBsecw== +AwEHA0IABNSoMBOuJDL6KO00PQrsLSiM3i+18O4j7qh6eqNjXhCpnoFlLVJKva3S +mXOA8OjWvDrGjPLBAPJaQAVpMQgib8SjbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNV +HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNV +HQ4EIgQg8IrTb4rYg9sQnDXSJibB1rub3hl/1S2edHFfxXVCWZMwCgYIKoZIzj0E +AwIDRwAwRAIgcF/hO88rEQz3pcsSOUtEwx/THemmDsEjOQVowPR6oMcCIC/zS6Zo +rd4x0veATGx/OG7avXP82Soi/2z9gJxUKsGv -----END CERTIFICATE----- diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt b/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt index b2a4a2d426..b5ce9e2052 100644 --- a/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt +++ b/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt @@ -1,15 +1,15 @@ -----BEGIN CERTIFICATE----- -MIICSTCCAfCgAwIBAgIRALOo7o5dtcd8yGpCqowtoIUwCgYIKoZIzj0EAwIwdjEL +MIICVzCCAf6gAwIBAgIRAID7lGZ/MP6IC8UYTDn4FLQwCgYIKoZIzj0EAwIwdjEL MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTcwODMxMDkxNDMyWhcNMjcwODI5MDkx -NDMyWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE +c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwNDAzMDkzNjAwWhcNMjkwMzMxMDkz +NjAwWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0G A1UEAxMWdGxzY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABAftdw28/JThHyrfF4SCTjHUykfeQZ3eqSwYlkCqYF1Lwzae18o97Biz -doz/BBMjisAoJESyzVOrGj7nGD7EzwWjXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNV -HSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIO0/2COT6V/C -xHWvwRPI0sWR90XRurxNbZzOChrMForLMAoGCCqGSM49BAMCA0cAMEQCIGd4ZaLj -1R4C25obVTI/pWriqWlXXAV7h2ZQfD41nNMYAiAO858VYb4xyLUkF9XGtZJpux4x -0ClsWNgEp49nBBsecw== +AwEHA0IABNSoMBOuJDL6KO00PQrsLSiM3i+18O4j7qh6eqNjXhCpnoFlLVJKva3S +mXOA8OjWvDrGjPLBAPJaQAVpMQgib8SjbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNV +HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNV +HQ4EIgQg8IrTb4rYg9sQnDXSJibB1rub3hl/1S2edHFfxXVCWZMwCgYIKoZIzj0E +AwIDRwAwRAIgcF/hO88rEQz3pcsSOUtEwx/THemmDsEjOQVowPR6oMcCIC/zS6Zo +rd4x0veATGx/OG7avXP82Soi/2z9gJxUKsGv -----END CERTIFICATE----- diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.crt b/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.crt index c16f404b05..41c575a5a4 100644 --- a/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.crt +++ b/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.crt @@ -1,15 +1,15 @@ -----BEGIN CERTIFICATE----- -MIICZjCCAg2gAwIBAgIQenbZk7+46tsIJy8JAgySaDAKBggqhkjOPQQDAjB2MQsw +MIICZjCCAg2gAwIBAgIQTUjCZpYZ8GtIDWkYOsL/nTAKBggqhkjOPQQDAjB2MQsw CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz -Y2Eub3JnMS5leGFtcGxlLmNvbTAeFw0xNzA4MzEwOTE0MzJaFw0yNzA4MjkwOTE0 -MzJaMFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH +Y2Eub3JnMS5leGFtcGxlLmNvbTAeFw0xOTA0MDMwOTM2MDBaFw0yOTAzMzEwOTM2 +MDBaMFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH Ew1TYW4gRnJhbmNpc2NvMR8wHQYDVQQDExZwZWVyMC5vcmcxLmV4YW1wbGUuY29t -MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE0AZOhWRZ4aOZeLSBioClHt5VDiNT -CeIxn3rVw9oCzlDDMaIZrBG1lI4o2tXOgOGSIPBmRjy736Njc54InlHlsKOBlzCB +MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE1Gm7zS7Pq9Z/lEVwfozKbqy+m1UT +HJyXjluwCy4mS1fg7QKRZppKJPcL+NSUlP5/4h7BVbDPYkSekale9tb/UaOBlzCB lDAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC -MAwGA1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAg7T/YI5PpX8LEda/BE8jSxZH3RdG6 -vE1tnM4KGswWisswKAYDVR0RBCEwH4IWcGVlcjAub3JnMS5leGFtcGxlLmNvbYIF -cGVlcjAwCgYIKoZIzj0EAwIDRwAwRAIgU9GgYioYa1Mdhhe5MHyZGXfr4G8gBxwe -dqlWU/mGaPsCIGQpA0VoBrP3Neso3htfZnlWKcbrtCD29HBWmT7ImZT1 +MAwGA1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAg8IrTb4rYg9sQnDXSJibB1rub3hl/ +1S2edHFfxXVCWZMwKAYDVR0RBCEwH4IWcGVlcjAub3JnMS5leGFtcGxlLmNvbYIF +cGVlcjAwCgYIKoZIzj0EAwIDRwAwRAIgSTpzMH/wXGrOUvYYr7315Q49MEfYASIO +y6GgQbAz4MwCIGkWtvNHC08hUgJNADyUs583Sr0h6OkQCtlL2SwgJehc -----END CERTIFICATE----- diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.key b/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.key old mode 100755 new mode 100644 index 14623b3298..313a8cc900 --- a/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.key +++ b/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.key @@ -1,5 +1,5 @@ -----BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgMvwKsTL9m2NygrLw -dfrlMzyQlUaSPendFhF+2yLGaH2hRANCAATQBk6FZFnho5l4tIGKgKUe3lUOI1MJ -4jGfetXD2gLOUMMxohmsEbWUjija1c6A4ZIg8GZGPLvfo2NzngieUeWw +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgd4D4RKU2FOjjBzRO +vLP5u1YldbjJBGhX2l7JIEbrg0yhRANCAATUabvNLs+r1n+URXB+jMpurL6bVRMc +nJeOW7ALLiZLV+DtApFmmkok9wv41JSU/n/iHsFVsM9iRJ6RqV721v9R -----END PRIVATE KEY----- diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/tlsca/ed3fd82393e95fc2c475afc113c8d2c591f745d1babc4d6d9cce0a1acc168acb_sk b/basic-network/crypto-config/peerOrganizations/org1.example.com/tlsca/ed3fd82393e95fc2c475afc113c8d2c591f745d1babc4d6d9cce0a1acc168acb_sk deleted file mode 100755 index ddd22ab208..0000000000 --- a/basic-network/crypto-config/peerOrganizations/org1.example.com/tlsca/ed3fd82393e95fc2c475afc113c8d2c591f745d1babc4d6d9cce0a1acc168acb_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgkcI0vNVNanWltD+I -VHz5V1u01+X8VOG3a5ZTLRed0MmhRANCAAQH7XcNvPyU4R8q3xeEgk4x1MpH3kGd -3qksGJZAqmBdS8M2ntfKPewYs3aM/wQTI4rAKCREss1Tqxo+5xg+xM8F ------END PRIVATE KEY----- diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/tlsca/f08ad36f8ad883db109c35d22626c1d6bb9bde197fd52d9e74715fc575425993_sk b/basic-network/crypto-config/peerOrganizations/org1.example.com/tlsca/f08ad36f8ad883db109c35d22626c1d6bb9bde197fd52d9e74715fc575425993_sk new file mode 100644 index 0000000000..2d4740a0d5 --- /dev/null +++ b/basic-network/crypto-config/peerOrganizations/org1.example.com/tlsca/f08ad36f8ad883db109c35d22626c1d6bb9bde197fd52d9e74715fc575425993_sk @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgexG3qyilzKsb6KDG +NUAW54WQNQdtDX7lLd0bc+IyX1GhRANCAATUqDATriQy+ijtND0K7C0ojN4vtfDu +I+6oenqjY14QqZ6BZS1SSr2t0plzgPDo1rw6xozywQDyWkAFaTEIIm/E +-----END PRIVATE KEY----- diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/tlsca/tlsca.org1.example.com-cert.pem b/basic-network/crypto-config/peerOrganizations/org1.example.com/tlsca/tlsca.org1.example.com-cert.pem index b2a4a2d426..b5ce9e2052 100644 --- a/basic-network/crypto-config/peerOrganizations/org1.example.com/tlsca/tlsca.org1.example.com-cert.pem +++ b/basic-network/crypto-config/peerOrganizations/org1.example.com/tlsca/tlsca.org1.example.com-cert.pem @@ -1,15 +1,15 @@ -----BEGIN CERTIFICATE----- -MIICSTCCAfCgAwIBAgIRALOo7o5dtcd8yGpCqowtoIUwCgYIKoZIzj0EAwIwdjEL +MIICVzCCAf6gAwIBAgIRAID7lGZ/MP6IC8UYTDn4FLQwCgYIKoZIzj0EAwIwdjEL MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTcwODMxMDkxNDMyWhcNMjcwODI5MDkx -NDMyWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE +c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwNDAzMDkzNjAwWhcNMjkwMzMxMDkz +NjAwWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0G A1UEAxMWdGxzY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABAftdw28/JThHyrfF4SCTjHUykfeQZ3eqSwYlkCqYF1Lwzae18o97Biz -doz/BBMjisAoJESyzVOrGj7nGD7EzwWjXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNV -HSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIO0/2COT6V/C -xHWvwRPI0sWR90XRurxNbZzOChrMForLMAoGCCqGSM49BAMCA0cAMEQCIGd4ZaLj -1R4C25obVTI/pWriqWlXXAV7h2ZQfD41nNMYAiAO858VYb4xyLUkF9XGtZJpux4x -0ClsWNgEp49nBBsecw== +AwEHA0IABNSoMBOuJDL6KO00PQrsLSiM3i+18O4j7qh6eqNjXhCpnoFlLVJKva3S +mXOA8OjWvDrGjPLBAPJaQAVpMQgib8SjbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNV +HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNV +HQ4EIgQg8IrTb4rYg9sQnDXSJibB1rub3hl/1S2edHFfxXVCWZMwCgYIKoZIzj0E +AwIDRwAwRAIgcF/hO88rEQz3pcsSOUtEwx/THemmDsEjOQVowPR6oMcCIC/zS6Zo +rd4x0veATGx/OG7avXP82Soi/2z9gJxUKsGv -----END CERTIFICATE----- diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem index df8f568c11..264fa9edfc 100644 --- a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem +++ b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem @@ -1,14 +1,14 @@ -----BEGIN CERTIFICATE----- -MIICGDCCAb+gAwIBAgIQFSxnLAGsu04zrFkAEwzn6zAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMS5leGFtcGxlLmNvbTAeFw0xNzA4MzEwOTE0MzJaFw0yNzA4MjkwOTE0MzJa -MFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMR8wHQYDVQQDDBZBZG1pbkBvcmcxLmV4YW1wbGUuY29tMFkw -EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEV1dfmKxsFKWo7o6DNBIaIVebCCPAM9C/ -sLBt4pJRre9pWE987DjXZoZ3glc4+DoPMtTmBRqbPVwYcUvpbYY8p6NNMEswDgYD -VR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgQjmqDc122u64 -ugzacBhR0UUE0xqtGy3d26xqVzZeSXwwCgYIKoZIzj0EAwIDRwAwRAIgXMy26AEU -/GUMPfCMs/nQjQME1ZxBHAYZtKEuRR361JsCIEg9BOZdIoioRivJC+ZUzvJUnkXu -o2HkWiuxLsibGxtE +MIICKjCCAdGgAwIBAgIRAKc1wbuvKM6xOY8IpsRuQ5swCgYIKoZIzj0EAwIwczEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh +Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwNDAzMDkzNjAwWhcNMjkwMzMxMDkzNjAw +WjBsMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN +U2FuIEZyYW5jaXNjbzEPMA0GA1UECxMGY2xpZW50MR8wHQYDVQQDDBZBZG1pbkBv +cmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEbDNRdCJE +su0E+qEleJ4gsJ+9ffFfbnVkRSsDR54NFXDNsUI/mxtCMDEGSHBRMMuD2D87KT3L +/zVWxeFQGa282aNNMEswDgYDVR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYD +VR0jBCQwIoAgS494XKPTCnrxegz88DFd5tZQmhKuF9sVsbcgnHXKJ9IwCgYIKoZI +zj0EAwIDRwAwRAIgJjjGMKrXBviADGyfo6Otu1jqYIXTbDeU2vzWjp4dpagCIE2+ +7kVbT+kWYNmnFmYpGuR/D4FdqgiQf/HeyxxyA4en -----END CERTIFICATE----- diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem index 8a4119f49a..b35e6ed8a3 100644 --- a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem +++ b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem @@ -1,15 +1,15 @@ -----BEGIN CERTIFICATE----- -MIICRDCCAeqgAwIBAgIRAIk/1HQ6XgI0p64PQwvUA3owCgYIKoZIzj0EAwIwczEL +MIICUTCCAfigAwIBAgIRAL2BME0pO7MLvn4YdGSnMZ0wCgYIKoZIzj0EAwIwczEL MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh -Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTcwODMxMDkxNDMyWhcNMjcwODI5MDkxNDMy +Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwNDAzMDkzNjAwWhcNMjkwMzMxMDkzNjAw WjBzMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN U2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UE AxMTY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IA -BM0tgEje2ssj/AWFh/70ymdVvVH+8EWtu7/jcn5Hy7gTvewJzHSdF9gID50d/bZx -65KOreUxetqitV6/m2DgNzujXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNVHSUECDAG -BgRVHSUAMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIEI5qg3NdtruuLoM2nAY -UdFFBNMarRst3dusalc2Xkl8MAoGCCqGSM49BAMCA0gAMEUCIQDufxsHbxkSP/y+ -oM2xZGgHL5XSTJVBqBryk1rd08Af6QIgLiAwtR7iKRbf1pKKCkt66MZzItZXC0po -/45uf29T/sc= +BPD/oPurWfvYpAlznLFD33GVT8dF0Xsv5u7bcRcD4xir1CDZGZNnyTAf6ox+4V1E +DcpyUYVgWsyWeeRuYoby8bWjbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNVHSUEFjAU +BggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQg +S494XKPTCnrxegz88DFd5tZQmhKuF9sVsbcgnHXKJ9IwCgYIKoZIzj0EAwIDRwAw +RAIgE6PLk5AyIyxUjydmsu43e5Vls9i55KvQVZWlkEd1l4wCIB82B29Cc4g8/Ean +9lmpctb59bKnBG/c474a1+d3ocTG -----END CERTIFICATE----- diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/keystore/c4fc186411097d368184b61aae8b503e412fdb598477840617919fa88a346165_sk b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/keystore/c4fc186411097d368184b61aae8b503e412fdb598477840617919fa88a346165_sk new file mode 100644 index 0000000000..547fd0c861 --- /dev/null +++ b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/keystore/c4fc186411097d368184b61aae8b503e412fdb598477840617919fa88a346165_sk @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgtYXP0ZPDqJq3iTyt +0DnbrWgEfcRt1kY+Uebr9PhqwFGhRANCAARsM1F0IkSy7QT6oSV4niCwn7198V9u +dWRFKwNHng0VcM2xQj+bG0IwMQZIcFEwy4PYPzspPcv/NVbF4VAZrbzZ +-----END PRIVATE KEY----- diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/keystore/cd96d5260ad4757551ed4a5a991e62130f8008a0bf996e4e4b84cd097a747fec_sk b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/keystore/cd96d5260ad4757551ed4a5a991e62130f8008a0bf996e4e4b84cd097a747fec_sk deleted file mode 100755 index fef217d052..0000000000 --- a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/keystore/cd96d5260ad4757551ed4a5a991e62130f8008a0bf996e4e4b84cd097a747fec_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgRgQr347ij6cjwX7m -KjzbbD8Tlwdfu6FaubjWJWLGyqahRANCAARXV1+YrGwUpajujoM0EhohV5sII8Az -0L+wsG3iklGt72lYT3zsONdmhneCVzj4Og8y1OYFGps9XBhxS+lthjyn ------END PRIVATE KEY----- diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/signcerts/Admin@org1.example.com-cert.pem b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/signcerts/Admin@org1.example.com-cert.pem index df8f568c11..264fa9edfc 100644 --- a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/signcerts/Admin@org1.example.com-cert.pem +++ b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/signcerts/Admin@org1.example.com-cert.pem @@ -1,14 +1,14 @@ -----BEGIN CERTIFICATE----- -MIICGDCCAb+gAwIBAgIQFSxnLAGsu04zrFkAEwzn6zAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMS5leGFtcGxlLmNvbTAeFw0xNzA4MzEwOTE0MzJaFw0yNzA4MjkwOTE0MzJa -MFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMR8wHQYDVQQDDBZBZG1pbkBvcmcxLmV4YW1wbGUuY29tMFkw -EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEV1dfmKxsFKWo7o6DNBIaIVebCCPAM9C/ -sLBt4pJRre9pWE987DjXZoZ3glc4+DoPMtTmBRqbPVwYcUvpbYY8p6NNMEswDgYD -VR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgQjmqDc122u64 -ugzacBhR0UUE0xqtGy3d26xqVzZeSXwwCgYIKoZIzj0EAwIDRwAwRAIgXMy26AEU -/GUMPfCMs/nQjQME1ZxBHAYZtKEuRR361JsCIEg9BOZdIoioRivJC+ZUzvJUnkXu -o2HkWiuxLsibGxtE +MIICKjCCAdGgAwIBAgIRAKc1wbuvKM6xOY8IpsRuQ5swCgYIKoZIzj0EAwIwczEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh +Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwNDAzMDkzNjAwWhcNMjkwMzMxMDkzNjAw +WjBsMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN +U2FuIEZyYW5jaXNjbzEPMA0GA1UECxMGY2xpZW50MR8wHQYDVQQDDBZBZG1pbkBv +cmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEbDNRdCJE +su0E+qEleJ4gsJ+9ffFfbnVkRSsDR54NFXDNsUI/mxtCMDEGSHBRMMuD2D87KT3L +/zVWxeFQGa282aNNMEswDgYDVR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYD +VR0jBCQwIoAgS494XKPTCnrxegz88DFd5tZQmhKuF9sVsbcgnHXKJ9IwCgYIKoZI +zj0EAwIDRwAwRAIgJjjGMKrXBviADGyfo6Otu1jqYIXTbDeU2vzWjp4dpagCIE2+ +7kVbT+kWYNmnFmYpGuR/D4FdqgiQf/HeyxxyA4en -----END CERTIFICATE----- diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem index b2a4a2d426..b5ce9e2052 100644 --- a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem +++ b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem @@ -1,15 +1,15 @@ -----BEGIN CERTIFICATE----- -MIICSTCCAfCgAwIBAgIRALOo7o5dtcd8yGpCqowtoIUwCgYIKoZIzj0EAwIwdjEL +MIICVzCCAf6gAwIBAgIRAID7lGZ/MP6IC8UYTDn4FLQwCgYIKoZIzj0EAwIwdjEL MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTcwODMxMDkxNDMyWhcNMjcwODI5MDkx -NDMyWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE +c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwNDAzMDkzNjAwWhcNMjkwMzMxMDkz +NjAwWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0G A1UEAxMWdGxzY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABAftdw28/JThHyrfF4SCTjHUykfeQZ3eqSwYlkCqYF1Lwzae18o97Biz -doz/BBMjisAoJESyzVOrGj7nGD7EzwWjXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNV -HSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIO0/2COT6V/C -xHWvwRPI0sWR90XRurxNbZzOChrMForLMAoGCCqGSM49BAMCA0cAMEQCIGd4ZaLj -1R4C25obVTI/pWriqWlXXAV7h2ZQfD41nNMYAiAO858VYb4xyLUkF9XGtZJpux4x -0ClsWNgEp49nBBsecw== +AwEHA0IABNSoMBOuJDL6KO00PQrsLSiM3i+18O4j7qh6eqNjXhCpnoFlLVJKva3S +mXOA8OjWvDrGjPLBAPJaQAVpMQgib8SjbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNV +HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNV +HQ4EIgQg8IrTb4rYg9sQnDXSJibB1rub3hl/1S2edHFfxXVCWZMwCgYIKoZIzj0E +AwIDRwAwRAIgcF/hO88rEQz3pcsSOUtEwx/THemmDsEjOQVowPR6oMcCIC/zS6Zo +rd4x0veATGx/OG7avXP82Soi/2z9gJxUKsGv -----END CERTIFICATE----- diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/ca.crt b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/ca.crt index b2a4a2d426..b5ce9e2052 100644 --- a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/ca.crt +++ b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/ca.crt @@ -1,15 +1,15 @@ -----BEGIN CERTIFICATE----- -MIICSTCCAfCgAwIBAgIRALOo7o5dtcd8yGpCqowtoIUwCgYIKoZIzj0EAwIwdjEL +MIICVzCCAf6gAwIBAgIRAID7lGZ/MP6IC8UYTDn4FLQwCgYIKoZIzj0EAwIwdjEL MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTcwODMxMDkxNDMyWhcNMjcwODI5MDkx -NDMyWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE +c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwNDAzMDkzNjAwWhcNMjkwMzMxMDkz +NjAwWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0G A1UEAxMWdGxzY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABAftdw28/JThHyrfF4SCTjHUykfeQZ3eqSwYlkCqYF1Lwzae18o97Biz -doz/BBMjisAoJESyzVOrGj7nGD7EzwWjXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNV -HSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIO0/2COT6V/C -xHWvwRPI0sWR90XRurxNbZzOChrMForLMAoGCCqGSM49BAMCA0cAMEQCIGd4ZaLj -1R4C25obVTI/pWriqWlXXAV7h2ZQfD41nNMYAiAO858VYb4xyLUkF9XGtZJpux4x -0ClsWNgEp49nBBsecw== +AwEHA0IABNSoMBOuJDL6KO00PQrsLSiM3i+18O4j7qh6eqNjXhCpnoFlLVJKva3S +mXOA8OjWvDrGjPLBAPJaQAVpMQgib8SjbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNV +HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNV +HQ4EIgQg8IrTb4rYg9sQnDXSJibB1rub3hl/1S2edHFfxXVCWZMwCgYIKoZIzj0E +AwIDRwAwRAIgcF/hO88rEQz3pcsSOUtEwx/THemmDsEjOQVowPR6oMcCIC/zS6Zo +rd4x0veATGx/OG7avXP82Soi/2z9gJxUKsGv -----END CERTIFICATE----- diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/client.crt b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/client.crt new file mode 100644 index 0000000000..aa6c68d4bd --- /dev/null +++ b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/client.crt @@ -0,0 +1,14 @@ +-----BEGIN CERTIFICATE----- +MIICOjCCAeGgAwIBAgIQN2CPLU2Z5c2oN/kYQYqw7DAKBggqhkjOPQQDAjB2MQsw +CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy +YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz +Y2Eub3JnMS5leGFtcGxlLmNvbTAeFw0xOTA0MDMwOTM2MDBaFw0yOTAzMzEwOTM2 +MDBaMFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH +Ew1TYW4gRnJhbmNpc2NvMR8wHQYDVQQDDBZBZG1pbkBvcmcxLmV4YW1wbGUuY29t +MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEOK4mGQM3LqhX0eGxpwSN/GwNqkkd +GeUY8tbdjV3YFfJkVP9t4a6DgRYfmsXcBuSI2+zSK6jopgyb8lpgQHnZ3aNsMGow +DgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAM +BgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIPCK02+K2IPbEJw10iYmwda7m94Zf9Ut +nnRxX8V1QlmTMAoGCCqGSM49BAMCA0cAMEQCICb8PVNA0j/YKcGYGlq1KBNmFdlq +6wXi16SyLeabi4nAAiAzJqYX6n0gyMLMKjVjELB56cf2nk15tetow7ymkm3vcQ== +-----END CERTIFICATE----- diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/client.key b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/client.key new file mode 100644 index 0000000000..9041bf0e02 --- /dev/null +++ b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/client.key @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgi3xJTb99H87bleWu +wixwYTCvJEebjTo1efPLDGtMsN+hRANCAAQ4riYZAzcuqFfR4bGnBI38bA2qSR0Z +5Rjy1t2NXdgV8mRU/23hroOBFh+axdwG5Ijb7NIrqOimDJvyWmBAednd +-----END PRIVATE KEY----- diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/server.crt b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/server.crt deleted file mode 100644 index 77b05bfd3a..0000000000 --- a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/server.crt +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICOjCCAeGgAwIBAgIQZbszPe722f2AcfnwpG2ENDAKBggqhkjOPQQDAjB2MQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz -Y2Eub3JnMS5leGFtcGxlLmNvbTAeFw0xNzA4MzEwOTE0MzJaFw0yNzA4MjkwOTE0 -MzJaMFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMR8wHQYDVQQDDBZBZG1pbkBvcmcxLmV4YW1wbGUuY29t -MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE5ZfQwNA0oBGCr7zX4I/Ufq1Ht740 -RnkV+6VBceaG4x45bR0a0ZWeslPzmIRXOir9QvqLvnxGY3aJiadX65kNFKNsMGow -DgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAM -BgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIO0/2COT6V/CxHWvwRPI0sWR90XRurxN -bZzOChrMForLMAoGCCqGSM49BAMCA0cAMEQCIF2V2t75M9bgjQ3pktVEYnCS4u0S -Izw6ZNSy8q/i6C6cAiB4V0ejzQYtp5C25F2xMD+JSlwrhBAOJNK1AkTzj9mgWg== ------END CERTIFICATE----- diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/server.key b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/server.key deleted file mode 100755 index ab4c61cb4a..0000000000 --- a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/server.key +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgqAuu2rihnWgQDlHI -7Gqyn+Bap3mMqbJ7UQLXIT6lwtmhRANCAATll9DA0DSgEYKvvNfgj9R+rUe3vjRG -eRX7pUFx5objHjltHRrRlZ6yU/OYhFc6Kv1C+ou+fEZjdomJp1frmQ0U ------END PRIVATE KEY----- diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/admincerts/User1@org1.example.com-cert.pem b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/admincerts/User1@org1.example.com-cert.pem index d70ce4c5c1..af7b3e4c65 100644 --- a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/admincerts/User1@org1.example.com-cert.pem +++ b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/admincerts/User1@org1.example.com-cert.pem @@ -1,14 +1,14 @@ -----BEGIN CERTIFICATE----- -MIICGTCCAb+gAwIBAgIQPyhm+v0ZIqCo6MATzLc+5jAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMS5leGFtcGxlLmNvbTAeFw0xNzA4MzEwOTE0MzJaFw0yNzA4MjkwOTE0MzJa -MFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMR8wHQYDVQQDDBZVc2VyMUBvcmcxLmV4YW1wbGUuY29tMFkw -EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEL/SomNVO3R5nnsemQ4im/UUZ8Ixs7/nH -3NH1ROfVJ+m7niDf1ZmhvTyiJzrUpI+n5+/OKIX/Z/VhDuAIR/QLLKNNMEswDgYD -VR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgQjmqDc122u64 -ugzacBhR0UUE0xqtGy3d26xqVzZeSXwwCgYIKoZIzj0EAwIDSAAwRQIhAJk63AHS -CEvJh64Yx5CnWDgDYNoj0jsi+gGheIxbUYgMAiAi/qPG7KEuuDBL4LlZRfkeatMW -ZKPD7ikt+vOYgVnqlA== +MIICKzCCAdGgAwIBAgIRAIUX7bzYm7Jh4wLqSyweiagwCgYIKoZIzj0EAwIwczEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh +Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwNDAzMDkzNjAwWhcNMjkwMzMxMDkzNjAw +WjBsMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN +U2FuIEZyYW5jaXNjbzEPMA0GA1UECxMGY2xpZW50MR8wHQYDVQQDDBZVc2VyMUBv +cmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEYnytY4kP +uZAIOB8R+mdd4fyyLyp+OW8IBqdWS0Cbph68Fu3hiWyMMLje8rEzsVggkhaPkArn +w6LfD15GcuQZP6NNMEswDgYDVR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYD +VR0jBCQwIoAgS494XKPTCnrxegz88DFd5tZQmhKuF9sVsbcgnHXKJ9IwCgYIKoZI +zj0EAwIDSAAwRQIhAOXiP5p9KmS/3Mq6TEn7Bokr7iXBb/vBiklFWUxtrso/AiAN +MMSjeIzLUxbmBSWzAcPUKhhbBZXersFUlsf7bw+KoA== -----END CERTIFICATE----- diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem index 8a4119f49a..b35e6ed8a3 100644 --- a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem +++ b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem @@ -1,15 +1,15 @@ -----BEGIN CERTIFICATE----- -MIICRDCCAeqgAwIBAgIRAIk/1HQ6XgI0p64PQwvUA3owCgYIKoZIzj0EAwIwczEL +MIICUTCCAfigAwIBAgIRAL2BME0pO7MLvn4YdGSnMZ0wCgYIKoZIzj0EAwIwczEL MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh -Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTcwODMxMDkxNDMyWhcNMjcwODI5MDkxNDMy +Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwNDAzMDkzNjAwWhcNMjkwMzMxMDkzNjAw WjBzMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN U2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UE AxMTY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IA -BM0tgEje2ssj/AWFh/70ymdVvVH+8EWtu7/jcn5Hy7gTvewJzHSdF9gID50d/bZx -65KOreUxetqitV6/m2DgNzujXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNVHSUECDAG -BgRVHSUAMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIEI5qg3NdtruuLoM2nAY -UdFFBNMarRst3dusalc2Xkl8MAoGCCqGSM49BAMCA0gAMEUCIQDufxsHbxkSP/y+ -oM2xZGgHL5XSTJVBqBryk1rd08Af6QIgLiAwtR7iKRbf1pKKCkt66MZzItZXC0po -/45uf29T/sc= +BPD/oPurWfvYpAlznLFD33GVT8dF0Xsv5u7bcRcD4xir1CDZGZNnyTAf6ox+4V1E +DcpyUYVgWsyWeeRuYoby8bWjbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNVHSUEFjAU +BggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQg +S494XKPTCnrxegz88DFd5tZQmhKuF9sVsbcgnHXKJ9IwCgYIKoZIzj0EAwIDRwAw +RAIgE6PLk5AyIyxUjydmsu43e5Vls9i55KvQVZWlkEd1l4wCIB82B29Cc4g8/Ean +9lmpctb59bKnBG/c474a1+d3ocTG -----END CERTIFICATE----- diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/keystore/c75bd6911aca808941c3557ee7c97e90f3952e379497dc55eb903f31b50abc83_sk b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/keystore/c75bd6911aca808941c3557ee7c97e90f3952e379497dc55eb903f31b50abc83_sk deleted file mode 100755 index 252c00b49a..0000000000 --- a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/keystore/c75bd6911aca808941c3557ee7c97e90f3952e379497dc55eb903f31b50abc83_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgJ8IrEgxfZzjGsyt+ -0o27jvhwUJE2W1PrFeZi8LwHbiuhRANCAAQv9KiY1U7dHmeex6ZDiKb9RRnwjGzv -+cfc0fVE59Un6bueIN/VmaG9PKInOtSkj6fn784ohf9n9WEO4AhH9Ass ------END PRIVATE KEY----- diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/keystore/d0ccda16347d394d9634ad067e229c662d0884350b9e3286fcc1d769e22e2746_sk b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/keystore/d0ccda16347d394d9634ad067e229c662d0884350b9e3286fcc1d769e22e2746_sk new file mode 100644 index 0000000000..cc6cf492c5 --- /dev/null +++ b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/keystore/d0ccda16347d394d9634ad067e229c662d0884350b9e3286fcc1d769e22e2746_sk @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg3Mw4ABYrXbKAL2+7 +tvG9A1BOXDFmy2oB44PAIrcJoGGhRANCAARifK1jiQ+5kAg4HxH6Z13h/LIvKn45 +bwgGp1ZLQJumHrwW7eGJbIwwuN7ysTOxWCCSFo+QCufDot8PXkZy5Bk/ +-----END PRIVATE KEY----- diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/signcerts/User1@org1.example.com-cert.pem b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/signcerts/User1@org1.example.com-cert.pem index d70ce4c5c1..af7b3e4c65 100644 --- a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/signcerts/User1@org1.example.com-cert.pem +++ b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/signcerts/User1@org1.example.com-cert.pem @@ -1,14 +1,14 @@ -----BEGIN CERTIFICATE----- -MIICGTCCAb+gAwIBAgIQPyhm+v0ZIqCo6MATzLc+5jAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMS5leGFtcGxlLmNvbTAeFw0xNzA4MzEwOTE0MzJaFw0yNzA4MjkwOTE0MzJa -MFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMR8wHQYDVQQDDBZVc2VyMUBvcmcxLmV4YW1wbGUuY29tMFkw -EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEL/SomNVO3R5nnsemQ4im/UUZ8Ixs7/nH -3NH1ROfVJ+m7niDf1ZmhvTyiJzrUpI+n5+/OKIX/Z/VhDuAIR/QLLKNNMEswDgYD -VR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgQjmqDc122u64 -ugzacBhR0UUE0xqtGy3d26xqVzZeSXwwCgYIKoZIzj0EAwIDSAAwRQIhAJk63AHS -CEvJh64Yx5CnWDgDYNoj0jsi+gGheIxbUYgMAiAi/qPG7KEuuDBL4LlZRfkeatMW -ZKPD7ikt+vOYgVnqlA== +MIICKzCCAdGgAwIBAgIRAIUX7bzYm7Jh4wLqSyweiagwCgYIKoZIzj0EAwIwczEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh +Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwNDAzMDkzNjAwWhcNMjkwMzMxMDkzNjAw +WjBsMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN +U2FuIEZyYW5jaXNjbzEPMA0GA1UECxMGY2xpZW50MR8wHQYDVQQDDBZVc2VyMUBv +cmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEYnytY4kP +uZAIOB8R+mdd4fyyLyp+OW8IBqdWS0Cbph68Fu3hiWyMMLje8rEzsVggkhaPkArn +w6LfD15GcuQZP6NNMEswDgYDVR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYD +VR0jBCQwIoAgS494XKPTCnrxegz88DFd5tZQmhKuF9sVsbcgnHXKJ9IwCgYIKoZI +zj0EAwIDSAAwRQIhAOXiP5p9KmS/3Mq6TEn7Bokr7iXBb/vBiklFWUxtrso/AiAN +MMSjeIzLUxbmBSWzAcPUKhhbBZXersFUlsf7bw+KoA== -----END CERTIFICATE----- diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem index b2a4a2d426..b5ce9e2052 100644 --- a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem +++ b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem @@ -1,15 +1,15 @@ -----BEGIN CERTIFICATE----- -MIICSTCCAfCgAwIBAgIRALOo7o5dtcd8yGpCqowtoIUwCgYIKoZIzj0EAwIwdjEL +MIICVzCCAf6gAwIBAgIRAID7lGZ/MP6IC8UYTDn4FLQwCgYIKoZIzj0EAwIwdjEL MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTcwODMxMDkxNDMyWhcNMjcwODI5MDkx -NDMyWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE +c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwNDAzMDkzNjAwWhcNMjkwMzMxMDkz +NjAwWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0G A1UEAxMWdGxzY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABAftdw28/JThHyrfF4SCTjHUykfeQZ3eqSwYlkCqYF1Lwzae18o97Biz -doz/BBMjisAoJESyzVOrGj7nGD7EzwWjXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNV -HSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIO0/2COT6V/C -xHWvwRPI0sWR90XRurxNbZzOChrMForLMAoGCCqGSM49BAMCA0cAMEQCIGd4ZaLj -1R4C25obVTI/pWriqWlXXAV7h2ZQfD41nNMYAiAO858VYb4xyLUkF9XGtZJpux4x -0ClsWNgEp49nBBsecw== +AwEHA0IABNSoMBOuJDL6KO00PQrsLSiM3i+18O4j7qh6eqNjXhCpnoFlLVJKva3S +mXOA8OjWvDrGjPLBAPJaQAVpMQgib8SjbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNV +HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNV +HQ4EIgQg8IrTb4rYg9sQnDXSJibB1rub3hl/1S2edHFfxXVCWZMwCgYIKoZIzj0E +AwIDRwAwRAIgcF/hO88rEQz3pcsSOUtEwx/THemmDsEjOQVowPR6oMcCIC/zS6Zo +rd4x0veATGx/OG7avXP82Soi/2z9gJxUKsGv -----END CERTIFICATE----- diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/ca.crt b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/ca.crt index b2a4a2d426..b5ce9e2052 100644 --- a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/ca.crt +++ b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/ca.crt @@ -1,15 +1,15 @@ -----BEGIN CERTIFICATE----- -MIICSTCCAfCgAwIBAgIRALOo7o5dtcd8yGpCqowtoIUwCgYIKoZIzj0EAwIwdjEL +MIICVzCCAf6gAwIBAgIRAID7lGZ/MP6IC8UYTDn4FLQwCgYIKoZIzj0EAwIwdjEL MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTcwODMxMDkxNDMyWhcNMjcwODI5MDkx -NDMyWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE +c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwNDAzMDkzNjAwWhcNMjkwMzMxMDkz +NjAwWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0G A1UEAxMWdGxzY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABAftdw28/JThHyrfF4SCTjHUykfeQZ3eqSwYlkCqYF1Lwzae18o97Biz -doz/BBMjisAoJESyzVOrGj7nGD7EzwWjXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNV -HSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIO0/2COT6V/C -xHWvwRPI0sWR90XRurxNbZzOChrMForLMAoGCCqGSM49BAMCA0cAMEQCIGd4ZaLj -1R4C25obVTI/pWriqWlXXAV7h2ZQfD41nNMYAiAO858VYb4xyLUkF9XGtZJpux4x -0ClsWNgEp49nBBsecw== +AwEHA0IABNSoMBOuJDL6KO00PQrsLSiM3i+18O4j7qh6eqNjXhCpnoFlLVJKva3S +mXOA8OjWvDrGjPLBAPJaQAVpMQgib8SjbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNV +HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNV +HQ4EIgQg8IrTb4rYg9sQnDXSJibB1rub3hl/1S2edHFfxXVCWZMwCgYIKoZIzj0E +AwIDRwAwRAIgcF/hO88rEQz3pcsSOUtEwx/THemmDsEjOQVowPR6oMcCIC/zS6Zo +rd4x0veATGx/OG7avXP82Soi/2z9gJxUKsGv -----END CERTIFICATE----- diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/client.crt b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/client.crt new file mode 100644 index 0000000000..b6d190a86d --- /dev/null +++ b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/client.crt @@ -0,0 +1,14 @@ +-----BEGIN CERTIFICATE----- +MIICPDCCAeKgAwIBAgIRAOHUA6JILlmMHxaYgKFGWskwCgYIKoZIzj0EAwIwdjEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs +c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwNDAzMDkzNjAwWhcNMjkwMzMxMDkz +NjAwWjBbMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE +BxMNU2FuIEZyYW5jaXNjbzEfMB0GA1UEAwwWVXNlcjFAb3JnMS5leGFtcGxlLmNv +bTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABPhdf+3N0DSIbVvArIy4GoaVACDG +f0UODUED/YyHuV1zhTiRz7vfZJYe9kEG5L1ATz977lC91HEy26tfNXHo5T2jbDBq +MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw +DAYDVR0TAQH/BAIwADArBgNVHSMEJDAigCDwitNvitiD2xCcNdImJsHWu5veGX/V +LZ50cV/FdUJZkzAKBggqhkjOPQQDAgNIADBFAiEA1X9E+WHUxl0GHRibVLB6a5nb +mUI6JHg5qmFypUPmwzICIH+vkTtdLOK8JgF5poiICrasotrHMZO9pADTus2gGnna +-----END CERTIFICATE----- diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/client.key b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/client.key new file mode 100644 index 0000000000..e247dd5804 --- /dev/null +++ b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/client.key @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgdMEYh3oeOis4vn1R +VaV1tIrvv40H9SSTOjd1BhCJx52hRANCAAT4XX/tzdA0iG1bwKyMuBqGlQAgxn9F +Dg1BA/2Mh7ldc4U4kc+732SWHvZBBuS9QE8/e+5QvdRxMturXzVx6OU9 +-----END PRIVATE KEY----- diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/server.crt b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/server.crt deleted file mode 100644 index 3e99dbf401..0000000000 --- a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/server.crt +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICOzCCAeGgAwIBAgIQat+rcnuTNMrNDQULaEwq7zAKBggqhkjOPQQDAjB2MQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz -Y2Eub3JnMS5leGFtcGxlLmNvbTAeFw0xNzA4MzEwOTE0MzJaFw0yNzA4MjkwOTE0 -MzJaMFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMR8wHQYDVQQDDBZVc2VyMUBvcmcxLmV4YW1wbGUuY29t -MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEFcqqFuh5CXSij4Ma6/tySXB9hYZn -2oFaVJWPn0JIhqj8rl9vHuNzgwoI1ZNR9fKGmrovqaZjcSg87jxh7gZSeaNsMGow -DgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAM -BgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIO0/2COT6V/CxHWvwRPI0sWR90XRurxN -bZzOChrMForLMAoGCCqGSM49BAMCA0gAMEUCIQCWp1joCFbOhXbZ2sPW1e6gJBNG -ZK+JY6Lm0bGk4vBk6QIgLQ5nzPRWHJNRaqIbigk0OLBKQtzv/Nfbsi6DnhNQoZU= ------END CERTIFICATE----- diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/server.key b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/server.key deleted file mode 100755 index 02043b8c27..0000000000 --- a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/server.key +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgf8ybpxd0cfNqWnfX -KRoa6e/hEJGs0zMCkE+5si/xuV+hRANCAAQVyqoW6HkJdKKPgxrr+3JJcH2Fhmfa -gVpUlY+fQkiGqPyuX28e43ODCgjVk1H18oaaui+ppmNxKDzuPGHuBlJ5 ------END PRIVATE KEY----- diff --git a/basic-network/docker-compose.yml b/basic-network/docker-compose.yml index 8a8663e1ce..cc889f84b7 100644 --- a/basic-network/docker-compose.yml +++ b/basic-network/docker-compose.yml @@ -15,7 +15,7 @@ services: - FABRIC_CA_HOME=/etc/hyperledger/fabric-ca-server - FABRIC_CA_SERVER_CA_NAME=ca.example.com - FABRIC_CA_SERVER_CA_CERTFILE=/etc/hyperledger/fabric-ca-server-config/ca.org1.example.com-cert.pem - - FABRIC_CA_SERVER_CA_KEYFILE=/etc/hyperledger/fabric-ca-server-config/4239aa0dcd76daeeb8ba0cda701851d14504d31aad1b2ddddbac6a57365e497c_sk + - FABRIC_CA_SERVER_CA_KEYFILE=/etc/hyperledger/fabric-ca-server-config/4b8f785ca3d30a7af17a0cfcf0315de6d6509a12ae17db15b1b7209c75ca27d2_sk ports: - "7054:7054" command: sh -c 'fabric-ca-server start -b admin:adminpw' diff --git a/basic-network/generate.sh b/basic-network/generate.sh index e5308a6e79..7966cd397a 100755 --- a/basic-network/generate.sh +++ b/basic-network/generate.sh @@ -20,7 +20,7 @@ if [ "$?" -ne 0 ]; then fi # generate genesis block for orderer -configtxgen -profile OneOrgOrdererGenesis -outputBlock ./config/genesis.block +configtxgen -profile OneOrgOrdererGenesis -channelID ordererchannel -outputBlock ./config/genesis.block if [ "$?" -ne 0 ]; then echo "Failed to generate orderer genesis block..." exit 1 diff --git a/fabcar/startFabric.sh b/fabcar/startFabric.sh index 7a2fcaee47..e3ee04689b 100755 --- a/fabcar/startFabric.sh +++ b/fabcar/startFabric.sh @@ -45,10 +45,22 @@ cd ../basic-network # and prime the ledger with our 10 cars docker-compose -f ./docker-compose.yml up -d cli -docker exec -e "CORE_PEER_LOCALMSPID=Org1MSP" -e "CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp" cli peer chaincode install -n fabcar -v 1.0 -p "$CC_SRC_PATH" -l "$CC_RUNTIME_LANGUAGE" -docker exec -e "CORE_PEER_LOCALMSPID=Org1MSP" -e "CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp" cli peer chaincode instantiate -o orderer.example.com:7050 -C mychannel -n fabcar -l "$CC_RUNTIME_LANGUAGE" -v 1.0 -c '{"Args":[]}' -P "OR ('Org1MSP.member','Org2MSP.member')" +docker exec -e "CORE_PEER_LOCALMSPID=Org1MSP" -e "CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp" cli \ + peer lifecycle chaincode package fabcar.tar.gz --path "$CC_SRC_PATH" --lang "$CC_RUNTIME_LANGUAGE" --label fabcarv1 +docker exec -e "CORE_PEER_LOCALMSPID=Org1MSP" -e "CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp" cli \ + peer lifecycle chaincode install fabcar.tar.gz +docker exec -e "CORE_PEER_LOCALMSPID=Org1MSP" -e "CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp" cli \ + /bin/bash -c "peer lifecycle chaincode queryinstalled > log" +PACKAGE_ID=`docker exec cli sed -nr '/Label: fabcarv1/s/Package ID: (.*), Label: fabcarv1/\1/p;' log` +docker exec -e "CORE_PEER_LOCALMSPID=Org1MSP" -e "CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp" cli \ + peer lifecycle chaincode approveformyorg -o orderer.example.com:7050 --channelID mychannel --name fabcar --version 1.0 --init-required --signature-policy "OR ('Org1MSP.member','Org2MSP.member')" --sequence 1 --waitForEvent --package-id $PACKAGE_ID +docker exec -e "CORE_PEER_LOCALMSPID=Org1MSP" -e "CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp" cli \ + peer lifecycle chaincode commit -o orderer.example.com:7050 --channelID mychannel --name fabcar --version 1.0 --init-required --signature-policy "OR ('Org1MSP.member','Org2MSP.member')" --sequence 1 --waitForEvent +docker exec -e "CORE_PEER_LOCALMSPID=Org1MSP" -e "CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp" cli \ + peer chaincode invoke -o orderer.example.com:7050 -C mychannel -n fabcar --isInit -c '{"Args":[]}' sleep 10 -docker exec -e "CORE_PEER_LOCALMSPID=Org1MSP" -e "CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp" cli peer chaincode invoke -o orderer.example.com:7050 -C mychannel -n fabcar -c '{"function":"initLedger","Args":[]}' +docker exec -e "CORE_PEER_LOCALMSPID=Org1MSP" -e "CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp" cli \ + peer chaincode invoke -o orderer.example.com:7050 -C mychannel -n fabcar -c '{"function":"initLedger","Args":[]}' cat <