diff --git a/docs/CONTRIBUTING.html b/docs/CONTRIBUTING.html
index 2446a2b..0904d98 100644
--- a/docs/CONTRIBUTING.html
+++ b/docs/CONTRIBUTING.html
@@ -128,7 +128,7 @@ github.com/go-i2p/go-i2p
     </main>
     
     <footer class="page-footer">
-      <p>Generated on 2025-06-27 14:20:41 • <a href="https://github.com/go-i2p/go-i2p" target="_blank">View on GitHub</a></p>
+      <p>Generated on 2025-06-27 15:22:36 • <a href="https://github.com/go-i2p/go-i2p" target="_blank">View on GitHub</a></p>
     </footer>
   </div>
 </body>
diff --git a/docs/ROADMAP.html b/docs/ROADMAP.html
index ea55c47..d78be51 100644
--- a/docs/ROADMAP.html
+++ b/docs/ROADMAP.html
@@ -127,7 +127,7 @@
     </main>
     
     <footer class="page-footer">
-      <p>Generated on 2025-06-27 14:20:41 • <a href="https://github.com/go-i2p/go-i2p" target="_blank">View on GitHub</a></p>
+      <p>Generated on 2025-06-27 15:22:36 • <a href="https://github.com/go-i2p/go-i2p" target="_blank">View on GitHub</a></p>
     </footer>
   </div>
 </body>
diff --git a/docs/template.html b/docs/template.html
index 4c31f2a..653134b 100644
--- a/docs/template.html
+++ b/docs/template.html
@@ -65,7 +65,7 @@
     </main>
     
     <footer class="page-footer">
-      <p>Generated on 2025-06-27 14:20:41 • <a href="https://github.com/go-i2p/go-i2p" target="_blank">View on GitHub</a></p>
+      <p>Generated on 2025-06-27 15:22:36 • <a href="https://github.com/go-i2p/go-i2p" target="_blank">View on GitHub</a></p>
     </footer>
   </div>
 </body>
diff --git a/images/exportable.svg b/images/exportable.svg
index 19f74a3..f4ea53a 100644
--- a/images/exportable.svg
+++ b/images/exportable.svg
@@ -4,106 +4,68 @@
 <!-- Generated by graphviz version 2.40.1 (20161225.0304)
  -->
 <!-- Title: gocallvis Pages: 1 -->
-<svg width="272pt" height="306pt"
- viewBox="0.00 0.00 271.84 306.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(0 306)">
+<svg width="293pt" height="184pt"
+ viewBox="0.00 0.00 293.42 184.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(0 184)">
 <title>gocallvis</title>
-<polygon fill="#d3d3d3" stroke="transparent" points="0,0 0,-306 271.8444,-306 271.8444,0 0,0"/>
+<polygon fill="#d3d3d3" stroke="transparent" points="0,0 0,-184 293.4152,-184 293.4152,0 0,0"/>
 <g id="clust1" class="cluster">
 <title>cluster_focus</title>
-<polygon fill="#e6ecfa" stroke="#000000" stroke-width=".5" points="8,-8 8,-298 263.8444,-298 263.8444,-8 8,-8"/>
-<text text-anchor="middle" x="135.9222" y="-277.8" font-family="Arial" font-size="18.00" fill="#000000">exportable</text>
+<polygon fill="#e6ecfa" stroke="#000000" stroke-width=".5" points="8,-8 8,-176 285.4152,-176 285.4152,-8 8,-8"/>
+<text text-anchor="middle" x="146.7076" y="-155.8" font-family="Arial" font-size="18.00" fill="#000000">exportable</text>
 </g>
 <g id="clust2" class="cluster">
-<title>cluster_*github.com/go&#45;i2p/go&#45;i2p/lib/common/certificate.Certificate</title>
-<g id="a_clust2"><a xlink:title="type: *github.com/go&#45;i2p/go&#45;i2p/lib/common/certificate.Certificate">
-<path fill="#eed8ae" stroke="#000000" stroke-width=".5" d="M162.9439,-60C162.9439,-60 237.9005,-60 237.9005,-60 243.9005,-60 249.9005,-66 249.9005,-72 249.9005,-72 249.9005,-248 249.9005,-248 249.9005,-254 243.9005,-260 237.9005,-260 237.9005,-260 162.9439,-260 162.9439,-260 156.9439,-260 150.9439,-254 150.9439,-248 150.9439,-248 150.9439,-72 150.9439,-72 150.9439,-66 156.9439,-60 162.9439,-60"/>
-<text text-anchor="middle" x="200.4222" y="-68.5" font-family="Arial" font-size="15.00" fill="#222222">(*Certificate)</text>
+<title>cluster_*github.com/go&#45;i2p/go&#45;i2p/lib/common/keys_and_cert.KeysAndCert</title>
+<g id="a_clust2"><a xlink:title="type: *github.com/go&#45;i2p/go&#45;i2p/lib/common/keys_and_cert.KeysAndCert">
+<path fill="#eed8ae" stroke="#000000" stroke-width=".5" d="M161.7805,-60C161.7805,-60 258.6347,-60 258.6347,-60 264.6347,-60 270.6347,-66 270.6347,-72 270.6347,-72 270.6347,-126 270.6347,-126 270.6347,-132 264.6347,-138 258.6347,-138 258.6347,-138 161.7805,-138 161.7805,-138 155.7805,-138 149.7805,-132 149.7805,-126 149.7805,-126 149.7805,-72 149.7805,-72 149.7805,-66 155.7805,-60 161.7805,-60"/>
+<text text-anchor="middle" x="210.2076" y="-68.5" font-family="Arial" font-size="15.00" fill="#222222">(*KeysAndCert)</text>
 </a>
 </g>
 </g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/certificate.Fuzz -->
+<!-- github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/router_identity.Fuzz -->
 <g id="node1" class="node">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/certificate.Fuzz</title>
-<g id="a_node1"><a xlink:title="github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/certificate.Fuzz | defined in fuzz.go:5&#10;at fuzz.go:6: calling [github.com/go&#45;i2p/go&#45;i2p/lib/common/certificate.ReadCertificate]&#10;at fuzz.go:7: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/common/certificate.Certificate).Data]&#10;at fuzz.go:8: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/common/certificate.Certificate).Length]&#10;at fuzz.go:9: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/common/certificate.Certificate).Type]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M58,-160C58,-160 28,-160 28,-160 22,-160 16,-154 16,-148 16,-148 16,-136 16,-136 16,-130 22,-124 28,-124 28,-124 58,-124 58,-124 64,-124 70,-130 70,-136 70,-136 70,-148 70,-148 70,-154 64,-160 58,-160"/>
-<text text-anchor="middle" x="43" y="-137.8" font-family="Verdana" font-size="14.00" fill="#000000">Fuzz</text>
+<title>github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/router_identity.Fuzz</title>
+<g id="a_node1"><a xlink:title="github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/router_identity.Fuzz | defined in fuzz.go:5&#10;at fuzz.go:7: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/common/keys_and_cert.KeysAndCert).Certificate]&#10;at fuzz.go:6: calling [github.com/go&#45;i2p/go&#45;i2p/lib/common/router_identity.ReadRouterIdentity]">
+<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M58,-65C58,-65 28,-65 28,-65 22,-65 16,-59 16,-53 16,-53 16,-41 16,-41 16,-35 22,-29 28,-29 28,-29 58,-29 58,-29 64,-29 70,-35 70,-41 70,-41 70,-53 70,-53 70,-59 64,-65 58,-65"/>
+<text text-anchor="middle" x="43" y="-42.8" font-family="Verdana" font-size="14.00" fill="#000000">Fuzz</text>
 </a>
 </g>
 </g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/common/certificate.ReadCertificate -->
+<!-- github.com/go&#45;i2p/go&#45;i2p/lib/common/router_identity.ReadRouterIdentity -->
 <g id="node2" class="node">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/common/certificate.ReadCertificate</title>
-<g id="a_node2"><a xlink:title="github.com/go&#45;i2p/go&#45;i2p/lib/common/certificate.ReadCertificate | defined in certificate.go:201">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M243.7667,-52C243.7667,-52 156.0777,-52 156.0777,-52 150.0777,-52 144.0777,-46 144.0777,-40 144.0777,-40 144.0777,-28 144.0777,-28 144.0777,-22 150.0777,-16 156.0777,-16 156.0777,-16 243.7667,-16 243.7667,-16 249.7667,-16 255.7667,-22 255.7667,-28 255.7667,-28 255.7667,-40 255.7667,-40 255.7667,-46 249.7667,-52 243.7667,-52"/>
-<text text-anchor="middle" x="199.9222" y="-38.2" font-family="Verdana" font-size="14.00" fill="#000000">certificate</text>
-<text text-anchor="middle" x="199.9222" y="-21.4" font-family="Verdana" font-size="14.00" fill="#000000">ReadCertificate</text>
+<title>github.com/go&#45;i2p/go&#45;i2p/lib/common/router_identity.ReadRouterIdentity</title>
+<g id="a_node2"><a xlink:title="github.com/go&#45;i2p/go&#45;i2p/lib/common/router_identity.ReadRouterIdentity | defined in router_identity.go:37">
+<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M265.6234,-52C265.6234,-52 154.7918,-52 154.7918,-52 148.7918,-52 142.7918,-46 142.7918,-40 142.7918,-40 142.7918,-28 142.7918,-28 142.7918,-22 148.7918,-16 154.7918,-16 154.7918,-16 265.6234,-16 265.6234,-16 271.6234,-16 277.6234,-22 277.6234,-28 277.6234,-28 277.6234,-40 277.6234,-40 277.6234,-46 271.6234,-52 265.6234,-52"/>
+<text text-anchor="middle" x="210.2076" y="-38.2" font-family="Verdana" font-size="14.00" fill="#000000">router_identity</text>
+<text text-anchor="middle" x="210.2076" y="-21.4" font-family="Verdana" font-size="14.00" fill="#000000">ReadRouterIdentity</text>
 </a>
 </g>
 </g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/certificate.Fuzz&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/common/certificate.ReadCertificate -->
-<g id="edge1" class="edge">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/certificate.Fuzz&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/common/certificate.ReadCertificate</title>
-<g id="a_edge1"><a xlink:title="at fuzz.go:6: calling [github.com/go&#45;i2p/go&#45;i2p/lib/common/certificate.ReadCertificate]">
-<path fill="none" stroke="#8b4513" d="M60.5563,-123.8395C78.2431,-106.2965 107.1045,-79.6361 142.3601,-57.393"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="144.2536,-60.3376 150.9601,-52.1355 140.6025,-54.3652 144.2536,-60.3376"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/common/certificate.Certificate).Data -->
-<g id="node3" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/common/certificate.Certificate).Data</title>
-<g id="a_node3"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/common/certificate.Certificate).Data | defined in certificate.go:134">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M227.8788,-130C227.8788,-130 171.9656,-130 171.9656,-130 165.9656,-130 159.9656,-124 159.9656,-118 159.9656,-118 159.9656,-106 159.9656,-106 159.9656,-100 165.9656,-94 171.9656,-94 171.9656,-94 227.8788,-94 227.8788,-94 233.8788,-94 239.8788,-100 239.8788,-106 239.8788,-106 239.8788,-118 239.8788,-118 239.8788,-124 233.8788,-130 227.8788,-130"/>
-<text text-anchor="middle" x="199.9222" y="-116.2" font-family="Verdana" font-size="14.00" fill="#000000">certificate</text>
-<text text-anchor="middle" x="199.9222" y="-99.4" font-family="Verdana" font-size="14.00" fill="#000000">Data</text>
-</a>
-</g>
-</g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/certificate.Fuzz&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/common/certificate.Certificate).Data -->
+<!-- github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/router_identity.Fuzz&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/common/router_identity.ReadRouterIdentity -->
 <g id="edge2" class="edge">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/certificate.Fuzz&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/common/certificate.Certificate).Data</title>
-<g id="a_edge2"><a xlink:title="at fuzz.go:7: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/common/certificate.Certificate).Data]">
-<path fill="none" stroke="#8b4513" d="M70.3338,-136.7744C92.2913,-132.5766 123.7111,-126.5699 150.1132,-121.5224"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="150.7913,-124.9562 159.9562,-119.6406 149.4768,-118.0807 150.7913,-124.9562"/>
+<title>github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/router_identity.Fuzz&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/common/router_identity.ReadRouterIdentity</title>
+<g id="a_edge2"><a xlink:title="at fuzz.go:6: calling [github.com/go&#45;i2p/go&#45;i2p/lib/common/router_identity.ReadRouterIdentity]">
+<path fill="none" stroke="#8b4513" d="M70.2369,-44.8824C87.33,-43.5534 110.3072,-41.767 132.6983,-40.0262"/>
+<polygon fill="#8b4513" stroke="#8b4513" points="133.223,-43.496 142.9216,-39.2313 132.6803,-36.5171 133.223,-43.496"/>
 </a>
 </g>
 </g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/common/certificate.Certificate).Length -->
-<g id="node4" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/common/certificate.Certificate).Length</title>
-<g id="a_node4"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/common/certificate.Certificate).Length | defined in certificate.go:125">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M227.8788,-191C227.8788,-191 171.9656,-191 171.9656,-191 165.9656,-191 159.9656,-185 159.9656,-179 159.9656,-179 159.9656,-167 159.9656,-167 159.9656,-161 165.9656,-155 171.9656,-155 171.9656,-155 227.8788,-155 227.8788,-155 233.8788,-155 239.8788,-161 239.8788,-167 239.8788,-167 239.8788,-179 239.8788,-179 239.8788,-185 233.8788,-191 227.8788,-191"/>
-<text text-anchor="middle" x="199.9222" y="-177.2" font-family="Verdana" font-size="14.00" fill="#000000">certificate</text>
-<text text-anchor="middle" x="199.9222" y="-160.4" font-family="Verdana" font-size="14.00" fill="#000000">Length</text>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/common/keys_and_cert.KeysAndCert).Certificate -->
+<g id="node3" class="node">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/common/keys_and_cert.KeysAndCert).Certificate</title>
+<g id="a_node3"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/common/keys_and_cert.KeysAndCert).Certificate | defined in keys_and_cert.go:139">
+<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M250.5619,-130C250.5619,-130 169.8533,-130 169.8533,-130 163.8533,-130 157.8533,-124 157.8533,-118 157.8533,-118 157.8533,-106 157.8533,-106 157.8533,-100 163.8533,-94 169.8533,-94 169.8533,-94 250.5619,-94 250.5619,-94 256.5619,-94 262.5619,-100 262.5619,-106 262.5619,-106 262.5619,-118 262.5619,-118 262.5619,-124 256.5619,-130 250.5619,-130"/>
+<text text-anchor="middle" x="210.2076" y="-116.2" font-family="Verdana" font-size="14.00" fill="#000000">keys_and_cert</text>
+<text text-anchor="middle" x="210.2076" y="-99.4" font-family="Verdana" font-size="14.00" fill="#000000">Certificate</text>
 </a>
 </g>
 </g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/certificate.Fuzz&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/common/certificate.Certificate).Length -->
-<g id="edge3" class="edge">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/certificate.Fuzz&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/common/certificate.Certificate).Length</title>
-<g id="a_edge3"><a xlink:title="at fuzz.go:8: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/common/certificate.Certificate).Length]">
-<path fill="none" stroke="#8b4513" d="M70.3338,-147.3998C92.2913,-151.7375 123.7111,-157.9445 150.1132,-163.1602"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="149.4674,-166.6002 159.9562,-165.1047 150.8241,-159.7329 149.4674,-166.6002"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/common/certificate.Certificate).Type -->
-<g id="node5" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/common/certificate.Certificate).Type</title>
-<g id="a_node5"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/common/certificate.Certificate).Type | defined in certificate.go:116">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M227.8788,-252C227.8788,-252 171.9656,-252 171.9656,-252 165.9656,-252 159.9656,-246 159.9656,-240 159.9656,-240 159.9656,-228 159.9656,-228 159.9656,-222 165.9656,-216 171.9656,-216 171.9656,-216 227.8788,-216 227.8788,-216 233.8788,-216 239.8788,-222 239.8788,-228 239.8788,-228 239.8788,-240 239.8788,-240 239.8788,-246 233.8788,-252 227.8788,-252"/>
-<text text-anchor="middle" x="199.9222" y="-238.2" font-family="Verdana" font-size="14.00" fill="#000000">certificate</text>
-<text text-anchor="middle" x="199.9222" y="-221.4" font-family="Verdana" font-size="14.00" fill="#000000">Type</text>
-</a>
-</g>
-</g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/certificate.Fuzz&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/common/certificate.Certificate).Type -->
-<g id="edge4" class="edge">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/certificate.Fuzz&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/common/certificate.Certificate).Type</title>
-<g id="a_edge4"><a xlink:title="at fuzz.go:9: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/common/certificate.Certificate).Type]">
-<path fill="none" stroke="#8b4513" d="M70.1769,-159.2759C90.3621,-171.9616 118.6668,-189.4457 144,-204 148.084,-206.3463 152.3634,-208.7456 156.6592,-211.1147"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="154.9879,-214.1898 165.4424,-215.9086 158.3415,-208.0455 154.9879,-214.1898"/>
+<!-- github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/router_identity.Fuzz&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/common/keys_and_cert.KeysAndCert).Certificate -->
+<g id="edge1" class="edge">
+<title>github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/router_identity.Fuzz&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/common/keys_and_cert.KeysAndCert).Certificate</title>
+<g id="a_edge1"><a xlink:title="at fuzz.go:7: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/common/keys_and_cert.KeysAndCert).Certificate]">
+<path fill="none" stroke="#8b4513" d="M70.3186,-59.5347C90.2689,-68.4946 118.0733,-80.5827 143,-90 144.6187,-90.6115 146.2628,-91.2224 147.9247,-91.8308"/>
+<polygon fill="#8b4513" stroke="#8b4513" points="146.9887,-95.2129 157.5834,-95.2765 149.3408,-88.6199 146.9887,-95.2129"/>
 </a>
 </g>
 </g>
diff --git a/images/handshake.svg b/images/handshake.svg
index 52fc991..baeec92 100644
--- a/images/handshake.svg
+++ b/images/handshake.svg
@@ -4,131 +4,425 @@
 <!-- Generated by graphviz version 2.40.1 (20161225.0304)
  -->
 <!-- Title: gocallvis Pages: 1 -->
-<svg width="374pt" height="306pt"
- viewBox="0.00 0.00 374.02 306.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(0 306)">
+<svg width="637pt" height="960pt"
+ viewBox="0.00 0.00 637.35 960.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(0 960)">
 <title>gocallvis</title>
-<polygon fill="#d3d3d3" stroke="transparent" points="0,0 0,-306 374.0184,-306 374.0184,0 0,0"/>
+<polygon fill="#d3d3d3" stroke="transparent" points="0,0 0,-960 637.3474,-960 637.3474,0 0,0"/>
 <g id="clust1" class="cluster">
 <title>cluster_focus</title>
-<polygon fill="#e6ecfa" stroke="#000000" stroke-width=".5" points="8,-8 8,-298 366.0184,-298 366.0184,-8 8,-8"/>
-<text text-anchor="middle" x="187.0092" y="-277.8" font-family="Arial" font-size="18.00" fill="#000000">handshake</text>
+<polygon fill="#e6ecfa" stroke="#000000" stroke-width=".5" points="7.0274,-8 7.0274,-952 629.3474,-952 629.3474,-8 7.0274,-8"/>
+<text text-anchor="middle" x="318.1874" y="-931.8" font-family="Arial" font-size="18.00" fill="#000000">handshake</text>
+</g>
+<g id="clust5" class="cluster">
+<title>cluster_*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF</title>
+<g id="a_clust5"><a xlink:title="type: *github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF">
+<path fill="#eed8ae" stroke="#000000" stroke-width=".5" d="M482.1748,-338C482.1748,-338 609.3474,-338 609.3474,-338 615.3474,-338 621.3474,-344 621.3474,-350 621.3474,-350 621.3474,-587 621.3474,-587 621.3474,-593 615.3474,-599 609.3474,-599 609.3474,-599 482.1748,-599 482.1748,-599 476.1748,-599 470.1748,-593 470.1748,-587 470.1748,-587 470.1748,-350 470.1748,-350 470.1748,-344 476.1748,-338 482.1748,-338"/>
+<text text-anchor="middle" x="545.7611" y="-346.5" font-family="Arial" font-size="15.00" fill="#222222">(*NoiseKDF)</text>
+</a>
+</g>
+</g>
+<g id="clust4" class="cluster">
+<title>cluster_*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState</title>
+<g id="a_clust4"><a xlink:title="type: *github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState">
+<path fill="#b0c4de" stroke="#000000" stroke-width=".5" d="M28,-155C28,-155 401.1748,-155 401.1748,-155 407.1748,-155 413.1748,-161 413.1748,-167 413.1748,-167 413.1748,-587 413.1748,-587 413.1748,-593 407.1748,-599 401.1748,-599 401.1748,-599 28,-599 28,-599 22,-599 16,-593 16,-587 16,-587 16,-167 16,-167 16,-161 22,-155 28,-155"/>
+<text text-anchor="middle" x="214.5874" y="-163.5" font-family="Arial" font-size="15.00" fill="#222222">(*NoiseHandshakeState)</text>
+</a>
+</g>
+</g>
+<g id="clust3" class="cluster">
+<title>cluster_*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.HandshakeBuilder</title>
+<g id="a_clust3"><a xlink:title="type: *github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.HandshakeBuilder">
+<path fill="#b0c4de" stroke="#000000" stroke-width=".5" d="M27.0274,-16C27.0274,-16 157.1452,-16 157.1452,-16 163.1452,-16 169.1452,-22 169.1452,-28 169.1452,-28 169.1452,-82 169.1452,-82 169.1452,-88 163.1452,-94 157.1452,-94 157.1452,-94 27.0274,-94 27.0274,-94 21.0274,-94 15.0274,-88 15.0274,-82 15.0274,-82 15.0274,-28 15.0274,-28 15.0274,-22 21.0274,-16 27.0274,-16"/>
+<text text-anchor="middle" x="92.0863" y="-24.5" font-family="Arial" font-size="15.00" fill="#222222">(*HandshakeBuilder)</text>
+</a>
+</g>
 </g>
 <g id="clust2" class="cluster">
-<title>cluster_*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState</title>
-<g id="a_clust2"><a xlink:title="type: *github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState">
-<path fill="#b0c4de" stroke="#000000" stroke-width=".5" d="M28,-60C28,-60 160.6326,-60 160.6326,-60 166.6326,-60 172.6326,-66 172.6326,-72 172.6326,-72 172.6326,-248 172.6326,-248 172.6326,-254 166.6326,-260 160.6326,-260 160.6326,-260 28,-260 28,-260 22,-260 16,-254 16,-248 16,-248 16,-72 16,-72 16,-66 22,-60 28,-60"/>
-<text text-anchor="middle" x="94.3163" y="-68.5" font-family="Arial" font-size="15.00" fill="#222222">(*HandshakeState)</text>
+<title>cluster_*github.com/flynn/noise.HandshakeState</title>
+<g id="a_clust2"><a xlink:title="type: *github.com/flynn/noise.HandshakeState">
+<path fill="#eed8ae" stroke="#000000" stroke-width=".5" d="M269.7792,-607C269.7792,-607 388.2898,-607 388.2898,-607 394.2898,-607 400.2898,-613 400.2898,-619 400.2898,-619 400.2898,-795 400.2898,-795 400.2898,-801 394.2898,-807 388.2898,-807 388.2898,-807 269.7792,-807 269.7792,-807 263.7792,-807 257.7792,-801 257.7792,-795 257.7792,-795 257.7792,-619 257.7792,-619 257.7792,-613 263.7792,-607 269.7792,-607"/>
+<text text-anchor="middle" x="329.0345" y="-615.5" font-family="Arial" font-size="15.00" fill="#222222">(*HandshakeState)</text>
+</a>
+</g>
+</g>
+<!-- github.com/flynn/noise.NewCipherSuite -->
+<g id="node1" class="node">
+<title>github.com/flynn/noise.NewCipherSuite</title>
+<g id="a_node1"><a xlink:title="github.com/flynn/noise.NewCipherSuite | defined in cipher_suite.go:84">
+<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M375.8435,-137C375.8435,-137 282.2255,-137 282.2255,-137 276.2255,-137 270.2255,-131 270.2255,-125 270.2255,-125 270.2255,-113 270.2255,-113 270.2255,-107 276.2255,-101 282.2255,-101 282.2255,-101 375.8435,-101 375.8435,-101 381.8435,-101 387.8435,-107 387.8435,-113 387.8435,-113 387.8435,-125 387.8435,-125 387.8435,-131 381.8435,-137 375.8435,-137"/>
+<text text-anchor="middle" x="329.0345" y="-123.2" font-family="Verdana" font-size="14.00" fill="#000000">noise</text>
+<text text-anchor="middle" x="329.0345" y="-106.4" font-family="Verdana" font-size="14.00" fill="#000000">NewCipherSuite</text>
+</a>
+</g>
+</g>
+<!-- github.com/flynn/noise.NewHandshakeState -->
+<g id="node2" class="node">
+<title>github.com/flynn/noise.NewHandshakeState</title>
+<g id="a_node2"><a xlink:title="github.com/flynn/noise.NewHandshakeState | defined in state.go:317">
+<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M387.1508,-71C387.1508,-71 270.9182,-71 270.9182,-71 264.9182,-71 258.9182,-65 258.9182,-59 258.9182,-59 258.9182,-47 258.9182,-47 258.9182,-41 264.9182,-35 270.9182,-35 270.9182,-35 387.1508,-35 387.1508,-35 393.1508,-35 399.1508,-41 399.1508,-47 399.1508,-47 399.1508,-59 399.1508,-59 399.1508,-65 393.1508,-71 387.1508,-71"/>
+<text text-anchor="middle" x="329.0345" y="-57.2" font-family="Verdana" font-size="14.00" fill="#000000">noise</text>
+<text text-anchor="middle" x="329.0345" y="-40.4" font-family="Verdana" font-size="14.00" fill="#000000">NewHandshakeState</text>
 </a>
 </g>
 </g>
 <!-- github.com/samber/oops.Errorf -->
-<g id="node1" class="node">
-<title>github.com/samber/oops.Errorf</title>
-<g id="a_node1"><a xlink:title="github.com/samber/oops.Errorf | defined in oops.go:34">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M315.0208,-167C315.0208,-167 280.6302,-167 280.6302,-167 274.6302,-167 268.6302,-161 268.6302,-155 268.6302,-155 268.6302,-143 268.6302,-143 268.6302,-137 274.6302,-131 280.6302,-131 280.6302,-131 315.0208,-131 315.0208,-131 321.0208,-131 327.0208,-137 327.0208,-143 327.0208,-143 327.0208,-155 327.0208,-155 327.0208,-161 321.0208,-167 315.0208,-167"/>
-<text text-anchor="middle" x="297.8255" y="-153.2" font-family="Verdana" font-size="14.00" fill="#000000">oops</text>
-<text text-anchor="middle" x="297.8255" y="-136.4" font-family="Verdana" font-size="14.00" fill="#000000">Errorf</text>
-</a>
-</g>
-</g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.NewHandshakeState -->
-<g id="node2" class="node">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.NewHandshakeState</title>
-<g id="a_node2"><a xlink:title="github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.NewHandshakeState | defined in handshake.go:78&#10;at handshake.go:98: calling [github.com/go&#45;i2p/go&#45;i2p/lib/crypto/curve25519.GenerateKeyPair]&#10;at handshake.go:101: calling [github.com/samber/oops.Errorf]&#10;at handshake.go:107: calling [github.com/samber/oops.Errorf]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M152.4326,-52C152.4326,-52 36.2,-52 36.2,-52 30.2,-52 24.2,-46 24.2,-40 24.2,-40 24.2,-28 24.2,-28 24.2,-22 30.2,-16 36.2,-16 36.2,-16 152.4326,-16 152.4326,-16 158.4326,-16 164.4326,-22 164.4326,-28 164.4326,-28 164.4326,-40 164.4326,-40 164.4326,-46 158.4326,-52 152.4326,-52"/>
-<text text-anchor="middle" x="94.3163" y="-29.8" font-family="Verdana" font-size="14.00" fill="#000000">NewHandshakeState</text>
-</a>
-</g>
-</g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.NewHandshakeState&#45;&gt;github.com/samber/oops.Errorf -->
-<g id="edge6" class="edge">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.NewHandshakeState&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge6"><a xlink:title="at handshake.go:101: calling [github.com/samber/oops.Errorf]&#10;at handshake.go:107: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M164.0061,-52.1084C166.9555,-53.3343 169.8436,-54.6307 172.6326,-56 192.2937,-65.6526 237.1068,-100.2496 267.4276,-124.4066"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="265.5671,-127.4003 275.5624,-130.9138 269.9397,-121.934 265.5671,-127.4003"/>
-</a>
-</g>
-</g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/crypto/curve25519.GenerateKeyPair -->
 <g id="node3" class="node">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/crypto/curve25519.GenerateKeyPair</title>
-<g id="a_node3"><a xlink:title="github.com/go&#45;i2p/go&#45;i2p/lib/crypto/curve25519.GenerateKeyPair | defined in curve25519.go:24">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M346.2119,-86C346.2119,-86 249.4391,-86 249.4391,-86 243.4391,-86 237.4391,-80 237.4391,-74 237.4391,-74 237.4391,-62 237.4391,-62 237.4391,-56 243.4391,-50 249.4391,-50 249.4391,-50 346.2119,-50 346.2119,-50 352.2119,-50 358.2119,-56 358.2119,-62 358.2119,-62 358.2119,-74 358.2119,-74 358.2119,-80 352.2119,-86 346.2119,-86"/>
-<text text-anchor="middle" x="297.8255" y="-72.2" font-family="Verdana" font-size="14.00" fill="#000000">curve25519</text>
-<text text-anchor="middle" x="297.8255" y="-55.4" font-family="Verdana" font-size="14.00" fill="#000000">GenerateKeyPair</text>
+<title>github.com/samber/oops.Errorf</title>
+<g id="a_node3"><a xlink:title="github.com/samber/oops.Errorf | defined in oops.go:34">
+<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M346.2298,-887C346.2298,-887 311.8392,-887 311.8392,-887 305.8392,-887 299.8392,-881 299.8392,-875 299.8392,-875 299.8392,-863 299.8392,-863 299.8392,-857 305.8392,-851 311.8392,-851 311.8392,-851 346.2298,-851 346.2298,-851 352.2298,-851 358.2298,-857 358.2298,-863 358.2298,-863 358.2298,-875 358.2298,-875 358.2298,-881 352.2298,-887 346.2298,-887"/>
+<text text-anchor="middle" x="329.0345" y="-873.2" font-family="Verdana" font-size="14.00" fill="#000000">oops</text>
+<text text-anchor="middle" x="329.0345" y="-856.4" font-family="Verdana" font-size="14.00" fill="#000000">Errorf</text>
 </a>
 </g>
 </g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.NewHandshakeState&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/crypto/curve25519.GenerateKeyPair -->
-<g id="edge5" class="edge">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.NewHandshakeState&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/crypto/curve25519.GenerateKeyPair</title>
-<g id="a_edge5"><a xlink:title="at handshake.go:98: calling [github.com/go&#45;i2p/go&#45;i2p/lib/crypto/curve25519.GenerateKeyPair]">
-<path fill="none" stroke="#8b4513" d="M164.6376,-45.7485C184.8842,-49.1311 206.9719,-52.8212 227.2347,-56.2065"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="226.8909,-59.6975 237.331,-57.8933 228.0445,-52.7932 226.8909,-59.6975"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).WriteMessage -->
+<!-- github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NewNoiseKDF -->
 <g id="node4" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).WriteMessage</title>
-<g id="a_node4"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).WriteMessage | defined in methods.go:66&#10;at methods.go:67: calling [github.com/samber/oops.Errorf]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M134.665,-191C134.665,-191 53.9676,-191 53.9676,-191 47.9676,-191 41.9676,-185 41.9676,-179 41.9676,-179 41.9676,-167 41.9676,-167 41.9676,-161 47.9676,-155 53.9676,-155 53.9676,-155 134.665,-155 134.665,-155 140.665,-155 146.665,-161 146.665,-167 146.665,-167 146.665,-179 146.665,-179 146.665,-185 140.665,-191 134.665,-191"/>
-<text text-anchor="middle" x="94.3163" y="-168.8" font-family="Verdana" font-size="14.00" fill="#000000">WriteMessage</text>
+<title>github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NewNoiseKDF</title>
+<g id="a_node4"><a xlink:title="github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NewNoiseKDF | defined in kdf.go:17">
+<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M589.3411,-286C589.3411,-286 502.1811,-286 502.1811,-286 496.1811,-286 490.1811,-280 490.1811,-274 490.1811,-274 490.1811,-262 490.1811,-262 490.1811,-256 496.1811,-250 502.1811,-250 502.1811,-250 589.3411,-250 589.3411,-250 595.3411,-250 601.3411,-256 601.3411,-262 601.3411,-262 601.3411,-274 601.3411,-274 601.3411,-280 595.3411,-286 589.3411,-286"/>
+<text text-anchor="middle" x="545.7611" y="-272.2" font-family="Verdana" font-size="14.00" fill="#000000">kdf</text>
+<text text-anchor="middle" x="545.7611" y="-255.4" font-family="Verdana" font-size="14.00" fill="#000000">NewNoiseKDF</text>
 </a>
 </g>
 </g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).WriteMessage&#45;&gt;github.com/samber/oops.Errorf -->
-<g id="edge3" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).WriteMessage&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge3"><a xlink:title="at methods.go:67: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M146.725,-166.8194C181.5362,-162.7141 226.5141,-157.4098 258.3176,-153.6592"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="259.0431,-157.098 268.5644,-152.4508 258.2233,-150.1462 259.0431,-157.098"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).CompleteHandshake -->
+<!-- github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NewHandshakeState -->
 <g id="node5" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).CompleteHandshake</title>
-<g id="a_node5"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).CompleteHandshake | defined in methods.go:10&#10;at methods.go:13: calling [github.com/samber/oops.Errorf]&#10;at methods.go:17: calling [github.com/samber/oops.Errorf]&#10;at methods.go:21: calling [github.com/samber/oops.Errorf]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M152.4494,-252C152.4494,-252 36.1832,-252 36.1832,-252 30.1832,-252 24.1832,-246 24.1832,-240 24.1832,-240 24.1832,-228 24.1832,-228 24.1832,-222 30.1832,-216 36.1832,-216 36.1832,-216 152.4494,-216 152.4494,-216 158.4494,-216 164.4494,-222 164.4494,-228 164.4494,-228 164.4494,-240 164.4494,-240 164.4494,-246 158.4494,-252 152.4494,-252"/>
-<text text-anchor="middle" x="94.3163" y="-229.8" font-family="Verdana" font-size="14.00" fill="#000000">CompleteHandshake</text>
+<title>github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NewHandshakeState</title>
+<g id="a_node5"><a xlink:title="github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NewHandshakeState | defined in handshake.go:23&#10;at handshake.go:29: calling [github.com/flynn/noise.NewCipherSuite]&#10;at handshake.go:35: calling [github.com/flynn/noise.NewHandshakeState]">
+<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M149.7026,-147C149.7026,-147 33.47,-147 33.47,-147 27.47,-147 21.47,-141 21.47,-135 21.47,-135 21.47,-123 21.47,-123 21.47,-117 27.47,-111 33.47,-111 33.47,-111 149.7026,-111 149.7026,-111 155.7026,-111 161.7026,-117 161.7026,-123 161.7026,-123 161.7026,-135 161.7026,-135 161.7026,-141 155.7026,-147 149.7026,-147"/>
+<text text-anchor="middle" x="91.5863" y="-124.8" font-family="Verdana" font-size="14.00" fill="#000000">NewHandshakeState</text>
 </a>
 </g>
 </g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).CompleteHandshake&#45;&gt;github.com/samber/oops.Errorf -->
-<g id="edge4" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).CompleteHandshake&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge4"><a xlink:title="at methods.go:13: calling [github.com/samber/oops.Errorf]&#10;at methods.go:17: calling [github.com/samber/oops.Errorf]&#10;at methods.go:21: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M142.5048,-215.9594C152.499,-212.1007 162.9361,-207.9844 172.6326,-204 201.904,-191.972 234.6371,-177.5571 259.2897,-166.5026"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="260.9686,-169.5853 268.653,-162.2915 258.0973,-163.2013 260.9686,-169.5853"/>
+<!-- github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NewHandshakeState&#45;&gt;github.com/flynn/noise.NewCipherSuite -->
+<g id="edge10" class="edge">
+<title>github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NewHandshakeState&#45;&gt;github.com/flynn/noise.NewCipherSuite</title>
+<g id="a_edge10"><a xlink:title="at handshake.go:29: calling [github.com/flynn/noise.NewCipherSuite]">
+<path fill="none" stroke="#8b4513" d="M161.8648,-126.0403C192.8266,-124.7363 229.0943,-123.2089 259.921,-121.9107"/>
+<polygon fill="#8b4513" stroke="#8b4513" points="260.3074,-125.3976 270.1512,-121.4798 260.0127,-118.4038 260.3074,-125.3976"/>
 </a>
 </g>
 </g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).GenerateEphemeral -->
+<!-- github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NewHandshakeState&#45;&gt;github.com/flynn/noise.NewHandshakeState -->
+<g id="edge11" class="edge">
+<title>github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NewHandshakeState&#45;&gt;github.com/flynn/noise.NewHandshakeState</title>
+<g id="a_edge11"><a xlink:title="at handshake.go:35: calling [github.com/flynn/noise.NewHandshakeState]">
+<path fill="none" stroke="#8b4513" d="M147.8582,-110.9891C182.3312,-99.9553 226.6246,-85.7783 262.7866,-74.204"/>
+<polygon fill="#8b4513" stroke="#8b4513" points="264.2984,-77.395 272.7555,-71.0132 262.1645,-70.7282 264.2984,-77.395"/>
+</a>
+</g>
+</g>
+<!-- (*github.com/flynn/noise.HandshakeState).ReadMessage -->
 <g id="node6" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).GenerateEphemeral</title>
-<g id="a_node6"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).GenerateEphemeral | defined in methods.go:27&#10;at methods.go:31: calling [github.com/go&#45;i2p/go&#45;i2p/lib/crypto/curve25519.GenerateKeyPair]&#10;at methods.go:33: calling [github.com/samber/oops.Errorf]&#10;at methods.go:40: calling [github.com/samber/oops.Errorf]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M149.9708,-130C149.9708,-130 38.6618,-130 38.6618,-130 32.6618,-130 26.6618,-124 26.6618,-118 26.6618,-118 26.6618,-106 26.6618,-106 26.6618,-100 32.6618,-94 38.6618,-94 38.6618,-94 149.9708,-94 149.9708,-94 155.9708,-94 161.9708,-100 161.9708,-106 161.9708,-106 161.9708,-118 161.9708,-118 161.9708,-124 155.9708,-130 149.9708,-130"/>
-<text text-anchor="middle" x="94.3163" y="-107.8" font-family="Verdana" font-size="14.00" fill="#000000">GenerateEphemeral</text>
+<title>(*github.com/flynn/noise.HandshakeState).ReadMessage</title>
+<g id="a_node6"><a xlink:title="(*github.com/flynn/noise.HandshakeState).ReadMessage | defined in state.go:503">
+<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M367.7782,-799C367.7782,-799 290.2908,-799 290.2908,-799 284.2908,-799 278.2908,-793 278.2908,-787 278.2908,-787 278.2908,-775 278.2908,-775 278.2908,-769 284.2908,-763 290.2908,-763 290.2908,-763 367.7782,-763 367.7782,-763 373.7782,-763 379.7782,-769 379.7782,-775 379.7782,-775 379.7782,-787 379.7782,-787 379.7782,-793 373.7782,-799 367.7782,-799"/>
+<text text-anchor="middle" x="329.0345" y="-785.2" font-family="Verdana" font-size="14.00" fill="#000000">noise</text>
+<text text-anchor="middle" x="329.0345" y="-768.4" font-family="Verdana" font-size="14.00" fill="#000000">ReadMessage</text>
 </a>
 </g>
 </g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).GenerateEphemeral&#45;&gt;github.com/samber/oops.Errorf -->
+<!-- (*github.com/flynn/noise.HandshakeState).WriteMessage -->
+<g id="node7" class="node">
+<title>(*github.com/flynn/noise.HandshakeState).WriteMessage</title>
+<g id="a_node7"><a xlink:title="(*github.com/flynn/noise.HandshakeState).WriteMessage | defined in state.go:391">
+<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M369.3832,-677C369.3832,-677 288.6858,-677 288.6858,-677 282.6858,-677 276.6858,-671 276.6858,-665 276.6858,-665 276.6858,-653 276.6858,-653 276.6858,-647 282.6858,-641 288.6858,-641 288.6858,-641 369.3832,-641 369.3832,-641 375.3832,-641 381.3832,-647 381.3832,-653 381.3832,-653 381.3832,-665 381.3832,-665 381.3832,-671 375.3832,-677 369.3832,-677"/>
+<text text-anchor="middle" x="329.0345" y="-663.2" font-family="Verdana" font-size="14.00" fill="#000000">noise</text>
+<text text-anchor="middle" x="329.0345" y="-646.4" font-family="Verdana" font-size="14.00" fill="#000000">WriteMessage</text>
+</a>
+</g>
+</g>
+<!-- (*github.com/flynn/noise.HandshakeState).LocalEphemeral -->
+<g id="node8" class="node">
+<title>(*github.com/flynn/noise.HandshakeState).LocalEphemeral</title>
+<g id="a_node8"><a xlink:title="(*github.com/flynn/noise.HandshakeState).LocalEphemeral | defined in state.go:642">
+<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M375.0461,-738C375.0461,-738 283.0229,-738 283.0229,-738 277.0229,-738 271.0229,-732 271.0229,-726 271.0229,-726 271.0229,-714 271.0229,-714 271.0229,-708 277.0229,-702 283.0229,-702 283.0229,-702 375.0461,-702 375.0461,-702 381.0461,-702 387.0461,-708 387.0461,-714 387.0461,-714 387.0461,-726 387.0461,-726 387.0461,-732 381.0461,-738 375.0461,-738"/>
+<text text-anchor="middle" x="329.0345" y="-724.2" font-family="Verdana" font-size="14.00" fill="#000000">noise</text>
+<text text-anchor="middle" x="329.0345" y="-707.4" font-family="Verdana" font-size="14.00" fill="#000000">LocalEphemeral</text>
+</a>
+</g>
+</g>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.HandshakeBuilder).Build -->
+<g id="node9" class="node">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.HandshakeBuilder).Build</title>
+<g id="a_node9"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.HandshakeBuilder).Build | defined in handshake_builder.go:68&#10;at handshake_builder.go:80: calling [github.com/flynn/noise.NewHandshakeState]&#10;at handshake_builder.go:71: calling [github.com/flynn/noise.NewCipherSuite]">
+<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M107.2042,-86C107.2042,-86 75.9684,-86 75.9684,-86 69.9684,-86 63.9684,-80 63.9684,-74 63.9684,-74 63.9684,-62 63.9684,-62 63.9684,-56 69.9684,-50 75.9684,-50 75.9684,-50 107.2042,-50 107.2042,-50 113.2042,-50 119.2042,-56 119.2042,-62 119.2042,-62 119.2042,-74 119.2042,-74 119.2042,-80 113.2042,-86 107.2042,-86"/>
+<text text-anchor="middle" x="91.5863" y="-63.8" font-family="Verdana" font-size="14.00" fill="#000000">Build</text>
+</a>
+</g>
+</g>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.HandshakeBuilder).Build&#45;&gt;github.com/flynn/noise.NewCipherSuite -->
+<g id="edge8" class="edge">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.HandshakeBuilder).Build&#45;&gt;github.com/flynn/noise.NewCipherSuite</title>
+<g id="a_edge8"><a xlink:title="at handshake_builder.go:71: calling [github.com/flynn/noise.NewCipherSuite]">
+<path fill="none" stroke="#8b4513" d="M119.2893,-73.9502C153.6673,-81.334 213.4916,-94.1833 260.4738,-104.2743"/>
+<polygon fill="#8b4513" stroke="#8b4513" points="259.7786,-107.7047 270.2906,-106.3828 261.2486,-100.8608 259.7786,-107.7047"/>
+</a>
+</g>
+</g>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.HandshakeBuilder).Build&#45;&gt;github.com/flynn/noise.NewHandshakeState -->
+<g id="edge4" class="edge">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.HandshakeBuilder).Build&#45;&gt;github.com/flynn/noise.NewHandshakeState</title>
+<g id="a_edge4"><a xlink:title="at handshake_builder.go:80: calling [github.com/flynn/noise.NewHandshakeState]">
+<path fill="none" stroke="#8b4513" d="M119.2893,-66.25C150.8507,-64.2562 203.8595,-60.9075 248.6884,-58.0756"/>
+<polygon fill="#8b4513" stroke="#8b4513" points="248.9471,-61.5663 258.7065,-57.4427 248.5057,-54.5803 248.9471,-61.5663"/>
+</a>
+</g>
+</g>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).ReadMessage -->
+<g id="node10" class="node">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).ReadMessage</title>
+<g id="a_node10"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).ReadMessage | defined in handshake.go:103&#10;at handshake.go:110: calling [github.com/samber/oops.Errorf]&#10;at handshake.go:108: calling [(*github.com/flynn/noise.HandshakeState).ReadMessage]&#10;at handshake.go:117: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).updateHandshakeHash]">
+<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M130.33,-530C130.33,-530 52.8426,-530 52.8426,-530 46.8426,-530 40.8426,-524 40.8426,-518 40.8426,-518 40.8426,-506 40.8426,-506 40.8426,-500 46.8426,-494 52.8426,-494 52.8426,-494 130.33,-494 130.33,-494 136.33,-494 142.33,-500 142.33,-506 142.33,-506 142.33,-518 142.33,-518 142.33,-524 136.33,-530 130.33,-530"/>
+<text text-anchor="middle" x="91.5863" y="-507.8" font-family="Verdana" font-size="14.00" fill="#000000">ReadMessage</text>
+</a>
+</g>
+</g>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).ReadMessage&#45;&gt;github.com/samber/oops.Errorf -->
+<g id="edge5" class="edge">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).ReadMessage&#45;&gt;github.com/samber/oops.Errorf</title>
+<g id="a_edge5"><a xlink:title="at handshake.go:110: calling [github.com/samber/oops.Errorf]">
+<path fill="none" stroke="#8b4513" d="M142.4863,-523.662C152.6284,-528.166 162.2608,-534.3942 169.1452,-543 245.9073,-638.9554 138.4507,-718.2349 212.8942,-816 231.5042,-840.4402 264.0068,-853.9517 289.9035,-861.2043"/>
+<polygon fill="#8b4513" stroke="#8b4513" points="289.2611,-864.6533 299.8193,-863.7725 291.0163,-857.8769 289.2611,-864.6533"/>
+</a>
+</g>
+</g>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).ReadMessage&#45;&gt;(*github.com/flynn/noise.HandshakeState).ReadMessage -->
+<g id="edge14" class="edge">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).ReadMessage&#45;&gt;(*github.com/flynn/noise.HandshakeState).ReadMessage</title>
+<g id="a_edge14"><a xlink:title="at handshake.go:108: calling [(*github.com/flynn/noise.HandshakeState).ReadMessage]">
+<path fill="none" stroke="#8b4513" d="M142.639,-524.0426C152.6481,-528.5206 162.1864,-534.6421 169.1452,-543 232.3755,-618.9437 142.0626,-692.0913 212.8942,-761 227.447,-775.1578 248.1688,-781.3447 268.0902,-783.6129"/>
+<polygon fill="#8b4513" stroke="#8b4513" points="267.8289,-787.1032 278.0852,-784.4465 268.4107,-780.1274 267.8289,-787.1032"/>
+</a>
+</g>
+</g>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).updateHandshakeHash -->
+<g id="node11" class="node">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).updateHandshakeHash</title>
+<g id="a_node11"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).updateHandshakeHash | defined in handshake.go:205&#10;at handshake.go:253: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).SetHash]&#10;at handshake.go:214: calling [github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NewNoiseKDF]&#10;at handshake.go:230: calling [github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NewNoiseKDF]&#10;at handshake.go:246: calling [github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NewNoiseKDF]">
+<path fill="#add8e6" stroke="#000000" stroke-width=".5" d="M393.3154,-408C393.3154,-408 264.7536,-408 264.7536,-408 258.7536,-408 252.7536,-402 252.7536,-396 252.7536,-396 252.7536,-384 252.7536,-384 252.7536,-378 258.7536,-372 264.7536,-372 264.7536,-372 393.3154,-372 393.3154,-372 399.3154,-372 405.3154,-378 405.3154,-384 405.3154,-384 405.3154,-396 405.3154,-396 405.3154,-402 399.3154,-408 393.3154,-408"/>
+<text text-anchor="middle" x="329.0345" y="-385.8" font-family="Verdana" font-size="14.00" fill="#000000">updateHandshakeHash</text>
+</a>
+</g>
+</g>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).ReadMessage&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).updateHandshakeHash -->
+<g id="edge16" class="edge">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).ReadMessage&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).updateHandshakeHash</title>
+<g id="a_edge16"><a xlink:title="at handshake.go:117: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).updateHandshakeHash]">
+<path fill="none" stroke="#000000" d="M141.7159,-493.9063C150.9446,-490.2108 160.4168,-486.1691 169.1452,-482 212.5978,-461.245 260.1659,-433.1323 292.0244,-413.4653"/>
+<polygon fill="#000000" stroke="#000000" points="293.9274,-416.4035 300.577,-408.1553 290.2351,-410.4565 293.9274,-416.4035"/>
+</a>
+</g>
+</g>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).updateHandshakeHash&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NewNoiseKDF -->
+<g id="edge15" class="edge">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).updateHandshakeHash&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NewNoiseKDF</title>
+<g id="a_edge15"><a xlink:title="at handshake.go:214: calling [github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NewNoiseKDF]&#10;at handshake.go:230: calling [github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NewNoiseKDF]&#10;at handshake.go:246: calling [github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NewNoiseKDF]">
+<path fill="none" stroke="#8b4513" d="M404.3549,-371.9134C407.3693,-370.6852 410.3211,-369.3819 413.1748,-368 434.6728,-357.5895 483.885,-318.7633 515.93,-292.666"/>
+<polygon fill="#8b4513" stroke="#8b4513" points="518.5515,-295.0436 524.0776,-286.0041 514.1205,-289.6246 518.5515,-295.0436"/>
+</a>
+</g>
+</g>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).SetHash -->
+<g id="node18" class="node">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).SetHash</title>
+<g id="a_node18"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).SetHash | defined in kdf.go:106">
+<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M568.9155,-408C568.9155,-408 522.6067,-408 522.6067,-408 516.6067,-408 510.6067,-402 510.6067,-396 510.6067,-396 510.6067,-384 510.6067,-384 510.6067,-378 516.6067,-372 522.6067,-372 522.6067,-372 568.9155,-372 568.9155,-372 574.9155,-372 580.9155,-378 580.9155,-384 580.9155,-384 580.9155,-396 580.9155,-396 580.9155,-402 574.9155,-408 568.9155,-408"/>
+<text text-anchor="middle" x="545.7611" y="-394.2" font-family="Verdana" font-size="14.00" fill="#000000">kdf</text>
+<text text-anchor="middle" x="545.7611" y="-377.4" font-family="Verdana" font-size="14.00" fill="#000000">SetHash</text>
+</a>
+</g>
+</g>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).updateHandshakeHash&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).SetHash -->
 <g id="edge2" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).GenerateEphemeral&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge2"><a xlink:title="at methods.go:33: calling [github.com/samber/oops.Errorf]&#10;at methods.go:40: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M162.0819,-124.3205C194.1733,-130.155 231.3605,-136.916 258.689,-141.8846"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="258.1842,-145.3501 268.649,-143.6954 259.4364,-138.463 258.1842,-145.3501"/>
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).updateHandshakeHash&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).SetHash</title>
+<g id="a_edge2"><a xlink:title="at handshake.go:253: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).SetHash]">
+<path fill="none" stroke="#8b4513" d="M405.4442,-390C437.2148,-390 473.0099,-390 500.4945,-390"/>
+<polygon fill="#8b4513" stroke="#8b4513" points="500.5957,-393.5001 510.5957,-390 500.5956,-386.5001 500.5957,-393.5001"/>
 </a>
 </g>
 </g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).GenerateEphemeral&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/crypto/curve25519.GenerateKeyPair -->
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).GetHandshakeHash -->
+<g id="node12" class="node">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).GetHandshakeHash</title>
+<g id="a_node12"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).GetHandshakeHash | defined in handshake.go:146&#10;at handshake.go:151: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).GetHandshakeHash]">
+<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M147.259,-347C147.259,-347 35.9136,-347 35.9136,-347 29.9136,-347 23.9136,-341 23.9136,-335 23.9136,-335 23.9136,-323 23.9136,-323 23.9136,-317 29.9136,-311 35.9136,-311 35.9136,-311 147.259,-311 147.259,-311 153.259,-311 159.259,-317 159.259,-323 159.259,-323 159.259,-335 159.259,-335 159.259,-341 153.259,-347 147.259,-347"/>
+<text text-anchor="middle" x="91.5863" y="-324.8" font-family="Verdana" font-size="14.00" fill="#000000">GetHandshakeHash</text>
+</a>
+</g>
+</g>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).GetHandshakeHash -->
+<g id="node19" class="node">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).GetHandshakeHash</title>
+<g id="a_node19"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).GetHandshakeHash | defined in kdf.go:68">
+<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M601.4338,-530C601.4338,-530 490.0884,-530 490.0884,-530 484.0884,-530 478.0884,-524 478.0884,-518 478.0884,-518 478.0884,-506 478.0884,-506 478.0884,-500 484.0884,-494 490.0884,-494 490.0884,-494 601.4338,-494 601.4338,-494 607.4338,-494 613.4338,-500 613.4338,-506 613.4338,-506 613.4338,-518 613.4338,-518 613.4338,-524 607.4338,-530 601.4338,-530"/>
+<text text-anchor="middle" x="545.7611" y="-516.2" font-family="Verdana" font-size="14.00" fill="#000000">kdf</text>
+<text text-anchor="middle" x="545.7611" y="-499.4" font-family="Verdana" font-size="14.00" fill="#000000">GetHandshakeHash</text>
+</a>
+</g>
+</g>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).GetHandshakeHash&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).GetHandshakeHash -->
+<g id="edge9" class="edge">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).GetHandshakeHash&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).GetHandshakeHash</title>
+<g id="a_edge9"><a xlink:title="at handshake.go:151: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).GetHandshakeHash]">
+<path fill="none" stroke="#8b4513" d="M150.8224,-347.0007C157.4798,-350.6122 163.7834,-354.9065 169.1452,-360 202.847,-392.0152 176.0134,-426.7053 212.8942,-455 285.9784,-511.0696 394.7292,-519.7867 467.8419,-518.1546"/>
+<polygon fill="#8b4513" stroke="#8b4513" points="468.0213,-521.651 477.9144,-517.8595 467.8162,-514.654 468.0213,-521.651"/>
+</a>
+</g>
+</g>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).WriteMessage -->
+<g id="node13" class="node">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).WriteMessage</title>
+<g id="a_node13"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).WriteMessage | defined in handshake.go:73&#10;at handshake.go:87: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).updateHandshakeHash]&#10;at handshake.go:78: calling [(*github.com/flynn/noise.HandshakeState).WriteMessage]&#10;at handshake.go:80: calling [github.com/samber/oops.Errorf]&#10;at handshake.go:94: calling [github.com/samber/oops.Errorf]">
+<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M131.935,-408C131.935,-408 51.2376,-408 51.2376,-408 45.2376,-408 39.2376,-402 39.2376,-396 39.2376,-396 39.2376,-384 39.2376,-384 39.2376,-378 45.2376,-372 51.2376,-372 51.2376,-372 131.935,-372 131.935,-372 137.935,-372 143.935,-378 143.935,-384 143.935,-384 143.935,-396 143.935,-396 143.935,-402 137.935,-408 131.935,-408"/>
+<text text-anchor="middle" x="91.5863" y="-385.8" font-family="Verdana" font-size="14.00" fill="#000000">WriteMessage</text>
+</a>
+</g>
+</g>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).WriteMessage&#45;&gt;github.com/samber/oops.Errorf -->
+<g id="edge18" class="edge">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).WriteMessage&#45;&gt;github.com/samber/oops.Errorf</title>
+<g id="a_edge18"><a xlink:title="at handshake.go:80: calling [github.com/samber/oops.Errorf]&#10;at handshake.go:94: calling [github.com/samber/oops.Errorf]">
+<path fill="none" stroke="#8b4513" d="M144.2102,-402.287C153.7525,-406.7349 162.7051,-412.7823 169.1452,-421 255.7877,-531.5579 176.3498,-598.3738 212.8942,-734 225.1336,-779.4239 220.7244,-797.6745 252.8942,-832 263.0841,-842.8727 277.1458,-850.9368 290.4142,-856.7116"/>
+<polygon fill="#8b4513" stroke="#8b4513" points="289.2851,-860.03 299.8686,-860.5194 291.9002,-853.5369 289.2851,-860.03"/>
+</a>
+</g>
+</g>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).WriteMessage&#45;&gt;(*github.com/flynn/noise.HandshakeState).WriteMessage -->
+<g id="edge17" class="edge">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).WriteMessage&#45;&gt;(*github.com/flynn/noise.HandshakeState).WriteMessage</title>
+<g id="a_edge17"><a xlink:title="at handshake.go:78: calling [(*github.com/flynn/noise.HandshakeState).WriteMessage]">
+<path fill="none" stroke="#8b4513" d="M144.0932,-404.5869C153.1948,-408.8148 162.0112,-414.1929 169.1452,-421 234.1509,-483.0268 195.665,-535.7333 252.8942,-605 262.5389,-616.6734 275.2864,-627.0192 287.5869,-635.4514"/>
+<polygon fill="#8b4513" stroke="#8b4513" points="285.7093,-638.4056 295.9876,-640.9762 289.5557,-632.5571 285.7093,-638.4056"/>
+</a>
+</g>
+</g>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).WriteMessage&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).updateHandshakeHash -->
+<g id="edge6" class="edge">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).WriteMessage&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).updateHandshakeHash</title>
+<g id="a_edge6"><a xlink:title="at handshake.go:87: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).updateHandshakeHash]">
+<path fill="none" stroke="#000000" d="M143.9893,-390C172.9515,-390 209.6666,-390 242.7439,-390"/>
+<polygon fill="#000000" stroke="#000000" points="242.8799,-393.5001 252.8799,-390 242.8799,-386.5001 242.8799,-393.5001"/>
+</a>
+</g>
+</g>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).GenerateEphemeral -->
+<g id="node14" class="node">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).GenerateEphemeral</title>
+<g id="a_node14"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).GenerateEphemeral | defined in handshake.go:57&#10;at handshake.go:64: calling [(*github.com/flynn/noise.HandshakeState).LocalEphemeral]">
+<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M147.2408,-469C147.2408,-469 35.9318,-469 35.9318,-469 29.9318,-469 23.9318,-463 23.9318,-457 23.9318,-457 23.9318,-445 23.9318,-445 23.9318,-439 29.9318,-433 35.9318,-433 35.9318,-433 147.2408,-433 147.2408,-433 153.2408,-433 159.2408,-439 159.2408,-445 159.2408,-445 159.2408,-457 159.2408,-457 159.2408,-463 153.2408,-469 147.2408,-469"/>
+<text text-anchor="middle" x="91.5863" y="-446.8" font-family="Verdana" font-size="14.00" fill="#000000">GenerateEphemeral</text>
+</a>
+</g>
+</g>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).GenerateEphemeral&#45;&gt;(*github.com/flynn/noise.HandshakeState).LocalEphemeral -->
+<g id="edge19" class="edge">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).GenerateEphemeral&#45;&gt;(*github.com/flynn/noise.HandshakeState).LocalEphemeral</title>
+<g id="a_edge19"><a xlink:title="at handshake.go:64: calling [(*github.com/flynn/noise.HandshakeState).LocalEphemeral]">
+<path fill="none" stroke="#8b4513" d="M151.8411,-469.1851C158.1682,-472.7494 164.1146,-476.9821 169.1452,-482 239.7023,-552.3785 182.1644,-619.7951 252.8942,-690 255.7066,-692.7916 258.81,-695.331 262.1076,-697.64"/>
+<polygon fill="#8b4513" stroke="#8b4513" points="260.3023,-700.6387 270.6491,-702.9175 263.9817,-694.6837 260.3023,-700.6387"/>
+</a>
+</g>
+</g>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).MixKey -->
+<g id="node15" class="node">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).MixKey</title>
+<g id="a_node15"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).MixKey | defined in handshake.go:191&#10;at handshake.go:198: calling [github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NewNoiseKDF]&#10;at handshake.go:201: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).MixKey]">
+<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M114.7435,-225C114.7435,-225 68.4291,-225 68.4291,-225 62.4291,-225 56.4291,-219 56.4291,-213 56.4291,-213 56.4291,-201 56.4291,-201 56.4291,-195 62.4291,-189 68.4291,-189 68.4291,-189 114.7435,-189 114.7435,-189 120.7435,-189 126.7435,-195 126.7435,-201 126.7435,-201 126.7435,-213 126.7435,-213 126.7435,-219 120.7435,-225 114.7435,-225"/>
+<text text-anchor="middle" x="91.5863" y="-202.8" font-family="Verdana" font-size="14.00" fill="#000000">MixKey</text>
+</a>
+</g>
+</g>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).MixKey&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NewNoiseKDF -->
+<g id="edge3" class="edge">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).MixKey&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NewNoiseKDF</title>
+<g id="a_edge3"><a xlink:title="at handshake.go:198: calling [github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NewNoiseKDF]">
+<path fill="none" stroke="#8b4513" d="M126.8467,-211.7358C202.7349,-221.9283 382.5514,-246.0794 480.0964,-259.1806"/>
+<polygon fill="#8b4513" stroke="#8b4513" points="479.7582,-262.6665 490.1352,-260.5289 480.6901,-255.7288 479.7582,-262.6665"/>
+</a>
+</g>
+</g>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).MixKey -->
+<g id="node20" class="node">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).MixKey</title>
+<g id="a_node20"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).MixKey | defined in kdf.go:29">
+<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M568.9183,-469C568.9183,-469 522.6039,-469 522.6039,-469 516.6039,-469 510.6039,-463 510.6039,-457 510.6039,-457 510.6039,-445 510.6039,-445 510.6039,-439 516.6039,-433 522.6039,-433 522.6039,-433 568.9183,-433 568.9183,-433 574.9183,-433 580.9183,-439 580.9183,-445 580.9183,-445 580.9183,-457 580.9183,-457 580.9183,-463 574.9183,-469 568.9183,-469"/>
+<text text-anchor="middle" x="545.7611" y="-455.2" font-family="Verdana" font-size="14.00" fill="#000000">kdf</text>
+<text text-anchor="middle" x="545.7611" y="-438.4" font-family="Verdana" font-size="14.00" fill="#000000">MixKey</text>
+</a>
+</g>
+</g>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).MixKey&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).MixKey -->
+<g id="edge20" class="edge">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).MixKey&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).MixKey</title>
+<g id="a_edge20"><a xlink:title="at handshake.go:201: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).MixKey]">
+<path fill="none" stroke="#8b4513" d="M126.868,-213.3664C141.945,-217.8309 158.4906,-225.3607 169.1452,-238 229.1911,-309.2306 141.1785,-383.5344 212.8942,-443 255.321,-478.1796 419.2307,-465.389 500.1035,-456.5729"/>
+<polygon fill="#8b4513" stroke="#8b4513" points="500.9264,-460.0028 510.4759,-455.4141 500.1492,-453.0461 500.9264,-460.0028"/>
+</a>
+</g>
+</g>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).SetPrologue -->
+<g id="node16" class="node">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).SetPrologue</title>
+<g id="a_node16"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).SetPrologue | defined in handshake.go:159&#10;at handshake.go:167: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).MixHash]&#10;at handshake.go:173: calling [github.com/samber/oops.Errorf]">
+<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M126.0235,-591C126.0235,-591 57.1491,-591 57.1491,-591 51.1491,-591 45.1491,-585 45.1491,-579 45.1491,-579 45.1491,-567 45.1491,-567 45.1491,-561 51.1491,-555 57.1491,-555 57.1491,-555 126.0235,-555 126.0235,-555 132.0235,-555 138.0235,-561 138.0235,-567 138.0235,-567 138.0235,-579 138.0235,-579 138.0235,-585 132.0235,-591 126.0235,-591"/>
+<text text-anchor="middle" x="91.5863" y="-568.8" font-family="Verdana" font-size="14.00" fill="#000000">SetPrologue</text>
+</a>
+</g>
+</g>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).SetPrologue&#45;&gt;github.com/samber/oops.Errorf -->
+<g id="edge13" class="edge">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).SetPrologue&#45;&gt;github.com/samber/oops.Errorf</title>
+<g id="a_edge13"><a xlink:title="at handshake.go:173: calling [github.com/samber/oops.Errorf]">
+<path fill="none" stroke="#8b4513" d="M93.9977,-591.3471C101.5233,-640.8158 129.3027,-777.7433 212.8942,-845 234.3698,-862.279 265.1457,-868.0494 289.6216,-869.6225"/>
+<polygon fill="#8b4513" stroke="#8b4513" points="289.5371,-873.1221 299.6801,-870.0611 289.8421,-866.1287 289.5371,-873.1221"/>
+</a>
+</g>
+</g>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).MixHash -->
+<g id="node21" class="node">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).MixHash</title>
+<g id="a_node21"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).MixHash | defined in kdf.go:55">
+<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M571.8622,-591C571.8622,-591 519.66,-591 519.66,-591 513.66,-591 507.66,-585 507.66,-579 507.66,-579 507.66,-567 507.66,-567 507.66,-561 513.66,-555 519.66,-555 519.66,-555 571.8622,-555 571.8622,-555 577.8622,-555 583.8622,-561 583.8622,-567 583.8622,-567 583.8622,-579 583.8622,-579 583.8622,-585 577.8622,-591 571.8622,-591"/>
+<text text-anchor="middle" x="545.7611" y="-577.2" font-family="Verdana" font-size="14.00" fill="#000000">kdf</text>
+<text text-anchor="middle" x="545.7611" y="-560.4" font-family="Verdana" font-size="14.00" fill="#000000">MixHash</text>
+</a>
+</g>
+</g>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).SetPrologue&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).MixHash -->
+<g id="edge12" class="edge">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).SetPrologue&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).MixHash</title>
+<g id="a_edge12"><a xlink:title="at handshake.go:167: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).MixHash]">
+<path fill="none" stroke="#8b4513" d="M95.3491,-591.2724C108.9911,-655.5529 157.9499,-869.4604 212.8942,-908 285.768,-959.1159 339.5566,-958.0378 413.1748,-908 518.0412,-836.7231 539.9658,-668.2717 544.5495,-601.235"/>
+<polygon fill="#8b4513" stroke="#8b4513" points="548.0574,-601.2088 545.1651,-591.0164 541.07,-600.7878 548.0574,-601.2088"/>
+</a>
+</g>
+</g>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).MixHash -->
+<g id="node17" class="node">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).MixHash</title>
+<g id="a_node17"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).MixHash | defined in handshake.go:177&#10;at handshake.go:184: calling [github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NewNoiseKDF]&#10;at handshake.go:187: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).MixHash]">
+<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M117.6874,-286C117.6874,-286 65.4852,-286 65.4852,-286 59.4852,-286 53.4852,-280 53.4852,-274 53.4852,-274 53.4852,-262 53.4852,-262 53.4852,-256 59.4852,-250 65.4852,-250 65.4852,-250 117.6874,-250 117.6874,-250 123.6874,-250 129.6874,-256 129.6874,-262 129.6874,-262 129.6874,-274 129.6874,-274 129.6874,-280 123.6874,-286 117.6874,-286"/>
+<text text-anchor="middle" x="91.5863" y="-263.8" font-family="Verdana" font-size="14.00" fill="#000000">MixHash</text>
+</a>
+</g>
+</g>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).MixHash&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NewNoiseKDF -->
 <g id="edge1" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).GenerateEphemeral&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/crypto/curve25519.GenerateKeyPair</title>
-<g id="a_edge1"><a xlink:title="at methods.go:31: calling [github.com/go&#45;i2p/go&#45;i2p/lib/crypto/curve25519.GenerateKeyPair]">
-<path fill="none" stroke="#8b4513" d="M162.0819,-97.3486C183.1436,-92.795 206.4003,-87.7667 227.6243,-83.178"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="228.5039,-86.5687 237.5384,-81.0345 227.0245,-79.7268 228.5039,-86.5687"/>
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).MixHash&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NewNoiseKDF</title>
+<g id="a_edge1"><a xlink:title="at handshake.go:184: calling [github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NewNoiseKDF]">
+<path fill="none" stroke="#8b4513" d="M129.9176,-268C207.3982,-268 383.4466,-268 479.7708,-268"/>
+<polygon fill="#8b4513" stroke="#8b4513" points="479.974,-271.5001 489.9739,-268 479.9739,-264.5001 479.974,-271.5001"/>
+</a>
+</g>
+</g>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).MixHash&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).MixHash -->
+<g id="edge7" class="edge">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).MixHash&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).MixHash</title>
+<g id="a_edge7"><a xlink:title="at handshake.go:187: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).MixHash]">
+<path fill="none" stroke="#8b4513" d="M129.9571,-274.9799C144.2947,-279.4953 159.4368,-286.8967 169.1452,-299 241.557,-389.2752 164.7271,-738.0358 252.8942,-813 280.0295,-836.0718 382.4983,-831.0994 413.1748,-813 492.1874,-766.382 527.3773,-653.936 539.9461,-601.1961"/>
+<polygon fill="#8b4513" stroke="#8b4513" points="543.4176,-601.7149 542.2287,-591.187 536.5928,-600.1585 543.4176,-601.7149"/>
 </a>
 </g>
 </g>
diff --git a/index.html b/index.html
index c940507..651018b 100644
--- a/index.html
+++ b/index.html
@@ -336,7 +336,7 @@ It is unsafe for production use, and intended only for debugging and testing pur
     </main>
     
     <footer class="page-footer">
-      <p>Generated on 2025-06-27 14:20:41 • <a href="https://github.com/go-i2p/go-i2p" target="_blank">View on GitHub</a></p>
+      <p>Generated on 2025-06-27 15:22:36 • <a href="https://github.com/go-i2p/go-i2p" target="_blank">View on GitHub</a></p>
     </footer>
   </div>
 </body>