diff --git a/docs/CONTRIBUTING.html b/docs/CONTRIBUTING.html
index 8a1d99d..67266ef 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-30 01:54:31 • <a href="https://github.com/go-i2p/go-i2p" target="_blank">View on GitHub</a></p>
+      <p>Generated on 2025-06-30 03:25:52 • <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 6b9703e..c0dce70 100644
--- a/docs/ROADMAP.html
+++ b/docs/ROADMAP.html
@@ -127,7 +127,7 @@
     </main>
     
     <footer class="page-footer">
-      <p>Generated on 2025-06-30 01:54:31 • <a href="https://github.com/go-i2p/go-i2p" target="_blank">View on GitHub</a></p>
+      <p>Generated on 2025-06-30 03:25:52 • <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 c57c92d..de74631 100644
--- a/docs/template.html
+++ b/docs/template.html
@@ -65,7 +65,7 @@
     </main>
     
     <footer class="page-footer">
-      <p>Generated on 2025-06-30 01:54:31 • <a href="https://github.com/go-i2p/go-i2p" target="_blank">View on GitHub</a></p>
+      <p>Generated on 2025-06-30 03:25:52 • <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..5126871 100644
--- a/images/exportable.svg
+++ b/images/exportable.svg
@@ -4,106 +4,41 @@
 <!-- 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="318pt" height="98pt"
+ viewBox="0.00 0.00 317.50 98.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 98)">
 <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,-98 317.505,-98 317.505,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,-90 309.505,-90 309.505,-8 8,-8"/>
+<text text-anchor="middle" x="158.7525" y="-69.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>
-</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/i2np/fuzz/header.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/i2np/fuzz/header.Fuzz</title>
+<g id="a_node1"><a xlink:title="github.com/go&#45;i2p/go&#45;i2p/lib/i2np/fuzz/header.Fuzz | defined in fuzz.go:5&#10;at fuzz.go:6: calling [github.com/go&#45;i2p/go&#45;i2p/lib/i2np.ReadI2NPNTCPHeader]">
+<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M58,-52C58,-52 28,-52 28,-52 22,-52 16,-46 16,-40 16,-40 16,-28 16,-28 16,-22 22,-16 28,-16 28,-16 58,-16 58,-16 64,-16 70,-22 70,-28 70,-28 70,-40 70,-40 70,-46 64,-52 58,-52"/>
+<text text-anchor="middle" x="43" y="-29.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/i2np.ReadI2NPNTCPHeader -->
 <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/i2np.ReadI2NPNTCPHeader</title>
+<g id="a_node2"><a xlink:title="github.com/go&#45;i2p/go&#45;i2p/lib/i2np.ReadI2NPNTCPHeader | defined in header.go:97">
+<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M289.2583,-52C289.2583,-52 155.2467,-52 155.2467,-52 149.2467,-52 143.2467,-46 143.2467,-40 143.2467,-40 143.2467,-28 143.2467,-28 143.2467,-22 149.2467,-16 155.2467,-16 155.2467,-16 289.2583,-16 289.2583,-16 295.2583,-16 301.2583,-22 301.2583,-28 301.2583,-28 301.2583,-40 301.2583,-40 301.2583,-46 295.2583,-52 289.2583,-52"/>
+<text text-anchor="middle" x="222.2525" y="-38.2" font-family="Verdana" font-size="14.00" fill="#000000">i2np</text>
+<text text-anchor="middle" x="222.2525" y="-21.4" font-family="Verdana" font-size="14.00" fill="#000000">ReadI2NPNTCPHeader</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 -->
+<!-- github.com/go&#45;i2p/go&#45;i2p/lib/i2np/fuzz/header.Fuzz&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/i2np.ReadI2NPNTCPHeader -->
 <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 -->
-<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"/>
-</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>
-</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"/>
+<title>github.com/go&#45;i2p/go&#45;i2p/lib/i2np/fuzz/header.Fuzz&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/i2np.ReadI2NPNTCPHeader</title>
+<g id="a_edge1"><a xlink:title="at fuzz.go:6: calling [github.com/go&#45;i2p/go&#45;i2p/lib/i2np.ReadI2NPNTCPHeader]">
+<path fill="none" stroke="#8b4513" d="M70.2246,-34C87.2023,-34 110.1106,-34 132.9875,-34"/>
+<polygon fill="#8b4513" stroke="#8b4513" points="133.1223,-37.5001 143.1222,-34 133.1222,-30.5001 133.1223,-37.5001"/>
 </a>
 </g>
 </g>
diff --git a/images/kdf.svg b/images/kdf.svg
index aa90c1f..e76bdfe 100644
--- a/images/kdf.svg
+++ b/images/kdf.svg
@@ -4,21 +4,21 @@
 <!-- Generated by graphviz version 2.40.1 (20161225.0304)
  -->
 <!-- Title: gocallvis Pages: 1 -->
-<svg width="305pt" height="201pt"
- viewBox="0.00 0.00 304.82 201.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 201)">
+<svg width="368pt" height="445pt"
+ viewBox="0.00 0.00 367.78 445.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 445)">
 <title>gocallvis</title>
-<polygon fill="#d3d3d3" stroke="transparent" points="0,0 0,-201 304.8248,-201 304.8248,0 0,0"/>
+<polygon fill="#d3d3d3" stroke="transparent" points="0,0 0,-445 367.7758,-445 367.7758,0 0,0"/>
 <g id="clust1" class="cluster">
 <title>cluster_focus</title>
-<polygon fill="#e6ecfa" stroke="#000000" stroke-width=".5" points="8,-8 8,-193 296.8248,-193 296.8248,-8 8,-8"/>
-<text text-anchor="middle" x="152.4124" y="-172.8" font-family="Arial" font-size="18.00" fill="#000000">kdf</text>
+<polygon fill="#e6ecfa" stroke="#000000" stroke-width=".5" points="8,-8 8,-437 359.7758,-437 359.7758,-8 8,-8"/>
+<text text-anchor="middle" x="183.8879" y="-416.8" font-family="Arial" font-size="18.00" fill="#000000">kdf</text>
 </g>
 <g id="clust2" class="cluster">
-<title>cluster_*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF</title>
-<g id="a_clust2"><a xlink:title="type: *github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF">
-<path fill="#b0c4de" stroke="#000000" stroke-width=".5" d="M28,-16C28,-16 153.6298,-16 153.6298,-16 159.6298,-16 165.6298,-22 165.6298,-28 165.6298,-28 165.6298,-143 165.6298,-143 165.6298,-149 159.6298,-155 153.6298,-155 153.6298,-155 28,-155 28,-155 22,-155 16,-149 16,-143 16,-143 16,-28 16,-28 16,-22 22,-16 28,-16"/>
-<text text-anchor="middle" x="90.8149" y="-24.5" font-family="Arial" font-size="15.00" fill="#222222">(*NoiseKDF)</text>
+<title>cluster_*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF</title>
+<g id="a_clust2"><a xlink:title="type: *github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF">
+<path fill="#b0c4de" stroke="#000000" stroke-width=".5" d="M28,-16C28,-16 216.5808,-16 216.5808,-16 222.5808,-16 228.5808,-22 228.5808,-28 228.5808,-28 228.5808,-387 228.5808,-387 228.5808,-393 222.5808,-399 216.5808,-399 216.5808,-399 28,-399 28,-399 22,-399 16,-393 16,-387 16,-387 16,-28 16,-28 16,-22 22,-16 28,-16"/>
+<text text-anchor="middle" x="122.2904" y="-24.5" font-family="Arial" font-size="15.00" fill="#222222">(*NTCP2KDF)</text>
 </a>
 </g>
 </g>
@@ -26,45 +26,117 @@
 <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="M276.9226,-107C276.9226,-107 242.532,-107 242.532,-107 236.532,-107 230.532,-101 230.532,-95 230.532,-95 230.532,-83 230.532,-83 230.532,-77 236.532,-71 242.532,-71 242.532,-71 276.9226,-71 276.9226,-71 282.9226,-71 288.9226,-77 288.9226,-83 288.9226,-83 288.9226,-95 288.9226,-95 288.9226,-101 282.9226,-107 276.9226,-107"/>
-<text text-anchor="middle" x="259.7273" y="-93.2" font-family="Verdana" font-size="14.00" fill="#000000">oops</text>
-<text text-anchor="middle" x="259.7273" y="-76.4" font-family="Verdana" font-size="14.00" fill="#000000">Errorf</text>
+<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M339.8736,-238C339.8736,-238 305.483,-238 305.483,-238 299.483,-238 293.483,-232 293.483,-226 293.483,-226 293.483,-214 293.483,-214 293.483,-208 299.483,-202 305.483,-202 305.483,-202 339.8736,-202 339.8736,-202 345.8736,-202 351.8736,-208 351.8736,-214 351.8736,-214 351.8736,-226 351.8736,-226 351.8736,-232 345.8736,-238 339.8736,-238"/>
+<text text-anchor="middle" x="322.6783" y="-224.2" font-family="Verdana" font-size="14.00" fill="#000000">oops</text>
+<text text-anchor="middle" x="322.6783" y="-207.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/noise/kdf.NoiseKDF).MixKey -->
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).DeriveSipHashKey -->
 <g id="node2" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).MixKey</title>
-<g id="a_node2"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).MixKey | defined in kdf.go:29&#10;at kdf.go:31: calling [github.com/samber/oops.Errorf]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M113.9721,-86C113.9721,-86 67.6577,-86 67.6577,-86 61.6577,-86 55.6577,-80 55.6577,-74 55.6577,-74 55.6577,-62 55.6577,-62 55.6577,-56 61.6577,-50 67.6577,-50 67.6577,-50 113.9721,-50 113.9721,-50 119.9721,-50 125.9721,-56 125.9721,-62 125.9721,-62 125.9721,-74 125.9721,-74 125.9721,-80 119.9721,-86 113.9721,-86"/>
-<text text-anchor="middle" x="90.8149" y="-63.8" font-family="Verdana" font-size="14.00" fill="#000000">MixKey</text>
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).DeriveSipHashKey</title>
+<g id="a_node2"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).DeriveSipHashKey | defined in kdf.go:112&#10;at kdf.go:116: calling [github.com/samber/oops.Errorf]&#10;at kdf.go:119: calling [github.com/samber/oops.Errorf]&#10;at kdf.go:126: calling [github.com/samber/oops.Errorf]&#10;at kdf.go:129: calling [github.com/samber/oops.Errorf]&#10;at kdf.go:135: calling [github.com/samber/oops.Errorf]">
+<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M176.6377,-86C176.6377,-86 67.9431,-86 67.9431,-86 61.9431,-86 55.9431,-80 55.9431,-74 55.9431,-74 55.9431,-62 55.9431,-62 55.9431,-56 61.9431,-50 67.9431,-50 67.9431,-50 176.6377,-50 176.6377,-50 182.6377,-50 188.6377,-56 188.6377,-62 188.6377,-62 188.6377,-74 188.6377,-74 188.6377,-80 182.6377,-86 176.6377,-86"/>
+<text text-anchor="middle" x="122.2904" y="-63.8" font-family="Verdana" font-size="14.00" fill="#000000">DeriveSipHashKey</text>
 </a>
 </g>
 </g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).MixKey&#45;&gt;github.com/samber/oops.Errorf -->
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).DeriveSipHashKey&#45;&gt;github.com/samber/oops.Errorf -->
 <g id="edge1" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).MixKey&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge1"><a xlink:title="at kdf.go:31: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M126.2245,-72.4023C153.7952,-75.83 192.0376,-80.5845 220.5284,-84.1266"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="220.1905,-87.6115 230.546,-85.372 221.0542,-80.6649 220.1905,-87.6115"/>
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).DeriveSipHashKey&#45;&gt;github.com/samber/oops.Errorf</title>
+<g id="a_edge1"><a xlink:title="at kdf.go:116: calling [github.com/samber/oops.Errorf]&#10;at kdf.go:119: calling [github.com/samber/oops.Errorf]&#10;at kdf.go:126: calling [github.com/samber/oops.Errorf]&#10;at kdf.go:129: calling [github.com/samber/oops.Errorf]&#10;at kdf.go:135: calling [github.com/samber/oops.Errorf]">
+<path fill="none" stroke="#8b4513" d="M188.6745,-80.4262C202.5959,-84.8824 216.6564,-90.8979 228.5808,-99 264.375,-123.3205 292.6637,-165.5676 308.539,-193.1531"/>
+<polygon fill="#8b4513" stroke="#8b4513" points="305.4981,-194.8862 313.4398,-201.899 311.6047,-191.4643 305.4981,-194.8862"/>
 </a>
 </g>
 </g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).DeriveSessionKeys -->
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).MixKey -->
 <g id="node3" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).DeriveSessionKeys</title>
-<g id="a_node3"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).DeriveSessionKeys | defined in kdf.go:73&#10;at kdf.go:77: calling [github.com/samber/oops.Errorf]&#10;at kdf.go:100: calling [github.com/samber/oops.Errorf]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M145.4452,-147C145.4452,-147 36.1846,-147 36.1846,-147 30.1846,-147 24.1846,-141 24.1846,-135 24.1846,-135 24.1846,-123 24.1846,-123 24.1846,-117 30.1846,-111 36.1846,-111 36.1846,-111 145.4452,-111 145.4452,-111 151.4452,-111 157.4452,-117 157.4452,-123 157.4452,-123 157.4452,-135 157.4452,-135 157.4452,-141 151.4452,-147 145.4452,-147"/>
-<text text-anchor="middle" x="90.8149" y="-124.8" font-family="Verdana" font-size="14.00" fill="#000000">DeriveSessionKeys</text>
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).MixKey</title>
+<g id="a_node3"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).MixKey | defined in kdf.go:37&#10;at kdf.go:39: calling [github.com/samber/oops.Errorf]&#10;at kdf.go:45: calling [github.com/samber/oops.Errorf]&#10;at kdf.go:52: calling [github.com/samber/oops.Errorf]&#10;at kdf.go:59: calling [github.com/samber/oops.Errorf]">
+<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M145.4476,-147C145.4476,-147 99.1332,-147 99.1332,-147 93.1332,-147 87.1332,-141 87.1332,-135 87.1332,-135 87.1332,-123 87.1332,-123 87.1332,-117 93.1332,-111 99.1332,-111 99.1332,-111 145.4476,-111 145.4476,-111 151.4476,-111 157.4476,-117 157.4476,-123 157.4476,-123 157.4476,-135 157.4476,-135 157.4476,-141 151.4476,-147 145.4476,-147"/>
+<text text-anchor="middle" x="122.2904" y="-124.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/kdf.NoiseKDF).DeriveSessionKeys&#45;&gt;github.com/samber/oops.Errorf -->
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).MixKey&#45;&gt;github.com/samber/oops.Errorf -->
 <g id="edge2" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).DeriveSessionKeys&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge2"><a xlink:title="at kdf.go:77: calling [github.com/samber/oops.Errorf]&#10;at kdf.go:100: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M157.5736,-113.1909C178.8924,-108.1424 201.7865,-102.7209 220.4867,-98.2925"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="221.4832,-101.6534 230.4075,-95.9432 219.8701,-94.8418 221.4832,-101.6534"/>
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).MixKey&#45;&gt;github.com/samber/oops.Errorf</title>
+<g id="a_edge2"><a xlink:title="at kdf.go:39: calling [github.com/samber/oops.Errorf]&#10;at kdf.go:45: calling [github.com/samber/oops.Errorf]&#10;at kdf.go:52: calling [github.com/samber/oops.Errorf]&#10;at kdf.go:59: calling [github.com/samber/oops.Errorf]">
+<path fill="none" stroke="#8b4513" d="M157.6506,-136.6371C178.7686,-141.8477 205.8225,-149.6805 228.5808,-160 250.2655,-169.8327 272.8149,-184.0515 290.4018,-196.1797"/>
+<polygon fill="#8b4513" stroke="#8b4513" points="288.4143,-199.0607 298.6112,-201.9371 292.4337,-193.3297 288.4143,-199.0607"/>
+</a>
+</g>
+</g>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).DeriveFramingKey -->
+<g id="node4" class="node">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).DeriveFramingKey</title>
+<g id="a_node4"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).DeriveFramingKey | defined in kdf.go:144&#10;at kdf.go:148: calling [github.com/samber/oops.Errorf]">
+<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M176.6377,-208C176.6377,-208 67.9431,-208 67.9431,-208 61.9431,-208 55.9431,-202 55.9431,-196 55.9431,-196 55.9431,-184 55.9431,-184 55.9431,-178 61.9431,-172 67.9431,-172 67.9431,-172 176.6377,-172 176.6377,-172 182.6377,-172 188.6377,-178 188.6377,-184 188.6377,-184 188.6377,-196 188.6377,-196 188.6377,-202 182.6377,-208 176.6377,-208"/>
+<text text-anchor="middle" x="122.2904" y="-185.8" font-family="Verdana" font-size="14.00" fill="#000000">DeriveFramingKey</text>
+</a>
+</g>
+</g>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).DeriveFramingKey&#45;&gt;github.com/samber/oops.Errorf -->
+<g id="edge3" class="edge">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).DeriveFramingKey&#45;&gt;github.com/samber/oops.Errorf</title>
+<g id="a_edge3"><a xlink:title="at kdf.go:148: calling [github.com/samber/oops.Errorf]">
+<path fill="none" stroke="#8b4513" d="M188.7383,-199.9479C220.0178,-204.6307 256.2655,-210.0574 283.1586,-214.0835"/>
+<polygon fill="#8b4513" stroke="#8b4513" points="282.9322,-217.5886 293.3403,-215.6078 283.9687,-210.6657 282.9322,-217.5886"/>
+</a>
+</g>
+</g>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).DeriveKeys -->
+<g id="node5" class="node">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).DeriveKeys</title>
+<g id="a_node5"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).DeriveKeys | defined in kdf.go:82&#10;at kdf.go:86: calling [github.com/samber/oops.Errorf]&#10;at kdf.go:93: calling [github.com/samber/oops.Errorf]">
+<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M155.6433,-269C155.6433,-269 88.9375,-269 88.9375,-269 82.9375,-269 76.9375,-263 76.9375,-257 76.9375,-257 76.9375,-245 76.9375,-245 76.9375,-239 82.9375,-233 88.9375,-233 88.9375,-233 155.6433,-233 155.6433,-233 161.6433,-233 167.6433,-239 167.6433,-245 167.6433,-245 167.6433,-257 167.6433,-257 167.6433,-263 161.6433,-269 155.6433,-269"/>
+<text text-anchor="middle" x="122.2904" y="-246.8" font-family="Verdana" font-size="14.00" fill="#000000">DeriveKeys</text>
+</a>
+</g>
+</g>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).DeriveKeys&#45;&gt;github.com/samber/oops.Errorf -->
+<g id="edge4" class="edge">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).DeriveKeys&#45;&gt;github.com/samber/oops.Errorf</title>
+<g id="a_edge4"><a xlink:title="at kdf.go:86: calling [github.com/samber/oops.Errorf]&#10;at kdf.go:93: calling [github.com/samber/oops.Errorf]">
+<path fill="none" stroke="#8b4513" d="M167.7615,-243.9656C202.5635,-238.5818 250.0718,-231.2322 283.2689,-226.0966"/>
+<polygon fill="#8b4513" stroke="#8b4513" points="284.1627,-229.5001 293.51,-224.5123 283.0925,-222.5824 284.1627,-229.5001"/>
+</a>
+</g>
+</g>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).DeriveHandshakeMessageKey -->
+<g id="node6" class="node">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).DeriveHandshakeMessageKey</title>
+<g id="a_node6"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).DeriveHandshakeMessageKey | defined in kdf.go:102&#10;at kdf.go:105: calling [github.com/samber/oops.Errorf]">
+<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M208.3716,-330C208.3716,-330 36.2092,-330 36.2092,-330 30.2092,-330 24.2092,-324 24.2092,-318 24.2092,-318 24.2092,-306 24.2092,-306 24.2092,-300 30.2092,-294 36.2092,-294 36.2092,-294 208.3716,-294 208.3716,-294 214.3716,-294 220.3716,-300 220.3716,-306 220.3716,-306 220.3716,-318 220.3716,-318 220.3716,-324 214.3716,-330 208.3716,-330"/>
+<text text-anchor="middle" x="122.2904" y="-307.8" font-family="Verdana" font-size="14.00" fill="#000000">DeriveHandshakeMessageKey</text>
+</a>
+</g>
+</g>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).DeriveHandshakeMessageKey&#45;&gt;github.com/samber/oops.Errorf -->
+<g id="edge5" class="edge">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).DeriveHandshakeMessageKey&#45;&gt;github.com/samber/oops.Errorf</title>
+<g id="a_edge5"><a xlink:title="at kdf.go:105: calling [github.com/samber/oops.Errorf]">
+<path fill="none" stroke="#8b4513" d="M197.3838,-293.9461C208.0475,-290.4824 218.7284,-286.5047 228.5808,-282 250.7515,-271.863 273.6334,-256.9048 291.2812,-244.2206"/>
+<polygon fill="#8b4513" stroke="#8b4513" points="293.495,-246.9377 299.4981,-238.2076 289.3611,-241.2886 293.495,-246.9377"/>
+</a>
+</g>
+</g>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).MixHash -->
+<g id="node7" class="node">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).MixHash</title>
+<g id="a_node7"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).MixHash | defined in kdf.go:68&#10;at kdf.go:71: calling [github.com/samber/oops.Errorf]&#10;at kdf.go:74: calling [github.com/samber/oops.Errorf]">
+<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M148.3915,-391C148.3915,-391 96.1893,-391 96.1893,-391 90.1893,-391 84.1893,-385 84.1893,-379 84.1893,-379 84.1893,-367 84.1893,-367 84.1893,-361 90.1893,-355 96.1893,-355 96.1893,-355 148.3915,-355 148.3915,-355 154.3915,-355 160.3915,-361 160.3915,-367 160.3915,-367 160.3915,-379 160.3915,-379 160.3915,-385 154.3915,-391 148.3915,-391"/>
+<text text-anchor="middle" x="122.2904" y="-368.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/ntcp/kdf.NTCP2KDF).MixHash&#45;&gt;github.com/samber/oops.Errorf -->
+<g id="edge6" class="edge">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).MixHash&#45;&gt;github.com/samber/oops.Errorf</title>
+<g id="a_edge6"><a xlink:title="at kdf.go:71: calling [github.com/samber/oops.Errorf]&#10;at kdf.go:74: calling [github.com/samber/oops.Errorf]">
+<path fill="none" stroke="#8b4513" d="M160.4585,-368.2914C181.9101,-364.2267 208.3545,-356.7315 228.5808,-343 264.954,-318.3064 293.2516,-274.9765 308.9503,-246.8921"/>
+<polygon fill="#8b4513" stroke="#8b4513" points="312.0825,-248.4584 313.7847,-238.0012 305.9328,-245.1145 312.0825,-248.4584"/>
 </a>
 </g>
 </g>
diff --git a/index.html b/index.html
index eef7fe8..74d52ea 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-30 01:54:31 • <a href="https://github.com/go-i2p/go-i2p" target="_blank">View on GitHub</a></p>
+      <p>Generated on 2025-06-30 03:25:52 • <a href="https://github.com/go-i2p/go-i2p" target="_blank">View on GitHub</a></p>
     </footer>
   </div>
 </body>