From fff84d4c2af08dde67e760bc33d31816d6b44f4a Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Fri, 27 Jan 2023 12:45:02 +0100 Subject: [PATCH] Update noise mapping --- schema-bundle.bin | Bin 17451 -> 17808 bytes schemas/noise.prs | 44 +++++++++++++++++++++++++++----------------- 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/schema-bundle.bin b/schema-bundle.bin index f638d10898a9850ec8e35773832a8da02f33ac16..cfe864b81c7d7eec6f0510fe7ef38116f8fb1941 100644 GIT binary patch literal 17808 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 literal 17451 zcmeHO-EQ2-l}0S~pIWl)nGN=OAD{==0J+#pSyC|0csyFSvbi*Edg%SDG3AUu1PN!rPMtfq|n} zuU89mj~{uuH1j68E~@%#lcaUAZ2Hr>%<>OkXr2zQiqZ`qPO}fWnZM3!^TCu~=&u=J z$#-U1)FxPSpVllH{!dtRj786lDPQMTMX>CUmR(^avS|N0C2@XjhGuzb=5sK=m*%$~ zvpp6PBfPr*(n`~t(ifiGoR)nS$Cu{7BEPs@iAb*Qo6%WbXZ7tnbM>X!J4siVdk@Li z^-fytom{W;o3G8YqP)Mq>sPF!4VB&B^)7E~Q`v$2S9r4egrWxDn{*Ddff>!SSzTP& ziT&yA^0FY?=ompW{4rY^;lmEe)Mo!b*QUJvuXM2nkB`xnTxBG7&mtKTQPGfQlHqO8 z;tXCMf=M4;OL$C^V(Fkn)jGMCj}zFXM_b$rGrxEfzD2d!K^=T!ReU799X9FOgH^N zNT^nbZ^oxV$qHyVU=3_1qljR*ji#j3ku%@GwhiFWvD>Iz+mY{Z6GR#Oke z`A(^kxSh9)<@dl}33J`*;&v4^M9+^&xGhcMK{{)!!hQv}VjVPW22)dh%x0lyiwY_k zA$%QM_`l`{V5jjt0~D(sl=p8uw>evwrODw6jV}=!Kn5$=FovyJ1%U@~JH3?AHk7b& zzsaiFeH0kjspvXGjT*@JmVToWO zIhhxEXw?jP8XBk|49r#sK|Z;^8&)eb%dRqL-g2c}14G34ESlaTy)>xv>`N*NApDdq z=Cib%L*!Kb{pvmQ1ly#5O_06szWa_@4T}||w|fY>$Pj3Es5Se?vzb|iNuZxHEF!5F zSRXMQ1;`ZUf@;+Z_F9I4q^5tK&Tb5lN=-4G6-!jBR9gz49iQ62D$@_-k_Oyb$BoP+ z)B|L#+{{9P2QvXiC_d64HZ=>pRg^-dGsPENb)#y2n4#fWK3^3XMFrn3t&}&yBUuAa zC9^!RFHZp#jg2h`wWO7j7kH?$`|R(wo$H8~-8_*Xl-r3c42SU$(R_NHmS+Bgxs`}XXn$>IpZmikf#&Gc zT&3$pZ5M)H~qg(_!dy=7%)urAfyX|cXspv-mS$qlv>E*^|{ z$scHkL4VEYO^O}N1uFP}jQs_HCpF-NsZ)V%S(5QN{8p#K(g0cZkwG&%y(_Ck_c)jUgq~!<7 zhX`4=HtZwcp_veQzn4;?;>i@N2FLXHdhXd%?+WY-I-c=6dJJal6_f-xU7%M1A%F}a zq`G;n66s&8%iKQLRhaH(pcv(8L=#Wabp`to`6b9Zp|y@?G(MkP#yEQB5u>XzJrotl z!1DDfkc|bl!lCK+cP|%Neq-hrX?61s`8*|pJdu7Y!;>20=vwiF7KPJKNDbx&l0$1K zt*Ee3;r;8I?wap-f@R>Fl_|3V*%oTbKEliNU90DB?f3+0)d>-z`Z8@Jh6v-mIUJb! z7p?sWD1vEBnm|{Bl;*f_Qg>45r!fC^o71;JOBNiWF@Ua0rv>Stv1R9`nw8m#1P~ZM zThG}?-co6gDXmbIb=*N<5yT@Iv2rDY|CeJ%0MKc>sOKN9N60#CT&{#Ce$U-Qt30$j zP^)ySNd-n|*&VUlPI)S`d#ngz?RBZmZQ)N;lT^346qnY-7!pHDEmY40I0#wRN0%`4 z8#3;|to9i^Ay0~6>{rFQ)Ly}s*tDaF5RCTEK4|){Zm+`(VLEgb?Njh%?9!Jx+8^?`>}M;?Dr2Km@e= z3ENOFMK*zcNU+W3fEDXtPTfvw(0itBff4F^MnbKc%1bFdkTk&vM`3F>1CvJ(EAW>f zK2nP5fN3LzywJf3Hq$)%i&j!<<16XlKV+p|wMsvQ6_0=->6){2L-Yjlz>igR`@wOc=ux|HZjgMEJGam+%&MR7ta zJcOCJyT9ANqB0c$zZ3b!42R=lAi`*}3L5Kb*S10x!2$b7v3DY!EXq;g@4@Y4(k%L#aJze<6+jo%@aud#6NXz>jQTMH>*g@9($--Ey*(IFyr@6rHEAlCkl(akHhqMCAzJY zw?twOgHxr&f_Jo(ds+b5Z$B@}C0E2Wrcc8A?#IQ*u&BG1Ap6noMDimy?xixar^1pm z`G}Zk>cQOT$W6Us_y&*k8q>SdF03c?zQ7_C8^=^Pu#~4~P}goAGxn!kp0ZAe;4u!)A#A^fM5oXL(xhab z)@fi`42i5hSf#g%B9-kkjdN3=NtUc9RRL>FD8Q++p|e0w{sd?-%QW2A(5hNQ0!?&^ za)z|8xs@Lg2MhXX!syS?&&fJlGl50ccY8?X{osV(KIWaJ7do~|2$hdBS?h(*79=uq zG5lf$%}NJK=r^$xs4)<6&(M}3Lap6?StIw4xSD`;OGFEImmP?X{p zz%;%PQ_~|0yMwi6{!&80L=P`893k56xE`{0XAo*Sn{%xxcr$Sr;bLs_tx#%DF_ZT{#U7M=XK8FI=+*};YU|SQX`Frld#5MrEzRP8QdH&>l^vq; z-kXklkf}z9>0~i(!dc7fSW=T5FX*Vm;~9}4g7Y9 z;qX>)Yg%f0=f}A7WyIU?dv^D6s{ zV_SOrZx6riP>;!F^R+gxJADf^Bc>TtJADVT!W9KaIq~LLwT82Qaja{!^6+4+QWqLn zrS!C2r59FzPP!upV(I!y7x}73wSGl_mTV`D=rLdaDl?1uV_}jkFfFC;+D6_o7SDUs zLfio#AHN5(W=Mo?G<6V;C^_ieG0wzJKGv00kx)|WftUnyX@=HG{p$t6+T_@grO7rs zc^^j+6n$_|o}qWrv8k~&1}c2KVsWp^a3fO!eh@LqrdkDCqxz?4)S0dd>KChY6X8Eh zr(M*LlIK)`=0?`XV_oqFW0iA^FiemsAjo!92?~73hUVL75?)yppP1A+TjXwkSA^oa(%J6Pi8_D&WJj&XEb;@%5#kGe1!(Ytj% zjob|#m+O4eveYfY$2vqEEGMq!KrtzM>a;}rq0XoNA8J>~yi?V0B6ND8GZQbjityNF zn?qgjr_GiH?ho^g*NL<ruxHI@;Wlf3&hTmy-G>fk)O0Ve1e;|XSKWR#eSlT1<}1hlT4p@ zOzLl%VVHkW(i1sH?<6n3`Ps->WT5${HzAx+YoE2XuwHn0E@$5wanPuhXL4gy_w8vm z#bpcN!5{4fUk%y=1<+tCEH1l9bi}?z9uF2F0ds6LzUyt$m@SvL}O^u{W~cXcq|&8pTRUgq_^TH?~I9WW^cU zZnw4uKjD&n$=B7|O5Fk@I_PZ0nwM@h?K|LdW?T9?4u*v+{{`yY^p zZVUqGPWKKIx6id3gl*gVNKw7F?cS~9%bn%8kk)cV7K!VAUD@JZHvuEE9m!>56na(y z(d)-<@t9D(UVTeR*G??@=vQ`QT;;%xayh`>Av28MwethtI}k(@Hr@!koBdX$*fD4i z*dxM?S^f)zWVsA|JfB0%6&8K84BW$)kpbEI>1ek$`X!$>k%cFJ$g|JELdhDCh+Om( zR&uSYkO>E>u6b4jNKlsn)MBA&qd%Io0i3vF3>^n#} zIeqh#J}$GzDfKwNrG_IB1Kv+}_T)~C@&giK8Yo^{`XjB-HF%MC(8j!yHl~b7Qe5G#}x}b5qNaE*%NXgR#~{9jlbRAm5=BDJ4aMX`W<`{WXBcN zLE`E08(fcHmj-veUCrTMO&w zOw1U<;xyHdMXY@!6(F%CKV3`cBP;B0ESY=)%g!a`q(FqHbM08iFPnk;zDlg`KuZ-` z0nI%xfX2!q-r*-}m6EiM<9S*6A2Q|m3||BQM>^C6@y(K%$>+yb7TZ^}LfTOyX)2n~lmzUGjAs*$3a> zZK5YN1W;1P(_%tK9|b-+COAW|<|vjFsUg@kZF7 PNPZUWA3jMUU%vb=`OA7& diff --git a/schemas/noise.prs b/schemas/noise.prs index 17c7328..f14031e 100644 --- a/schemas/noise.prs +++ b/schemas/noise.prs @@ -29,28 +29,38 @@ Packet = @complete bytes / @fragmented [bytes ...] . ; In summary, each noise.Packet, once (reassembled and) decrypted, will be a sequence of zero ; or more machine-encoded protocol.Packets, followed by zero or more 0x80 bytes. -Endpoint = . -EndpointSpec = { - ; Possible transports, in preference order. Could contain e.g. transportAddress.Tcp values or - ; similar. These are just suggestions; it's quite possible the endpoint is reachable by some - ; means not listed. - transports: [any ...] +; A `Route` describes a network path that can be followed to reach some target entity. +; +; It starts with zero or more possible non-Syndicate `transports`, in preference order. These +; could be `transportAddress.Tcp` values or similar. They are just suggestions; it's quite +; possible the endpoint is reachable by some means not listed. The network outside Syndicate +; is, after all, pretty diverse! In particular, *zero* `transports` may be provided, in which +; case some out-of-band means has to be used to make that first connection. +; +; The `transports` give instructions for contacting the first entity in the `Route` path. Often +; this will be a `gatekeeper`, or a `noise` protocol endpoint, or both. Occasionally, it may +; even be the desired target entity. Subsequent `steps` describe how to proceed from the +; initial entity to the target. +Route = . +RouteStep = NoiseStep / GatekeeperStep . + +GatekeeperStep = sturdy.SturdyRef . + +NoiseStep = . +NoiseSpec = { + ; The `serviceSelector` to use in a `Connect`. + service: any, ; The responder's static public key. If not required (uncommon!), supply the empty ByteString. - key: bytes + key: bytes, } -& @protocol EndpointProtocol -& @ref EndpointRef -& @preSharedKeys EndpointPreSharedKeys +& @protocol NoiseProtocol +& @preSharedKeys NoisePreSharedKeys . -; If absent, a default of DefaultProtocol is used. Most endpoints will speak the default. -EndpointProtocol = @present { protocol: string } / @invalid { protocol: any } / @absent {} . +; If absent, a default of DefaultProtocol is used. Most services will speak the default. +NoiseProtocol = @present { protocol: string } / @invalid { protocol: any } / @absent {} . DefaultProtocol = "Noise_NK_25519_ChaChaPoly_BLAKE2s" . -; If present, OID 0 at the responder end is a Gatekeeper, and the named ref should be resolvable. -; If absent, OID 0 at the responder directly denotes the entity of interest. -EndpointRef = @present { ref: sturdy.SturdyRef } / @invalid { ref: any } / @absent {} . - ; If present, Noise pre-shared-keys (PSKs) are drawn from the sequence as required; if the ; sequence is exhausted or not supplied, an all-zeros key is used each time a PSK is needed. -EndpointPreSharedKeys = @present { preSharedKeys: [bytes ...] } / @invalid { preSharedKeys: any } / @absent {} . +NoisePreSharedKeys = @present { preSharedKeys: [bytes ...] } / @invalid { preSharedKeys: any } / @absent {} .