From e332c0062228510f6bdcfd100e3c343803978edb Mon Sep 17 00:00:00 2001
From: zzz <zzz@i2pmail.org>
Date: Mon, 26 May 2025 11:06:30 -0400
Subject: [PATCH] spec updates

---
 i2p2www/pages/spec/index.html      |  9 +++++++--
 i2p2www/spec/cryptography.rst      | 23 +++++++++++++++++------
 i2p2www/spec/encryptedleaseset.rst |  4 ++--
 i2p2www/spec/filter-format.rst     |  4 ++--
 i2p2www/spec/geoip.rst             | 10 ++++++++--
 i2p2www/spec/tunnel-creation.rst   |  7 +++++--
 6 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/i2p2www/pages/spec/index.html b/i2p2www/pages/spec/index.html
index 09b35368..e1b12535 100644
--- a/i2p2www/pages/spec/index.html
+++ b/i2p2www/pages/spec/index.html
@@ -55,7 +55,6 @@ If you find any inaccuracies in the documents linked below, please
 Current specifications: These may eventually be migrated to the new format.
 
 <ul>
-<li><a href="{{ site_url('docs/how/elgamal-aes') }}">{{ _('ElGamal/AES+SessionTags') }}</a></li>
 <li><a href="{{ site_url('docs/api/i2pcontrol') }}">I2PControl</a></li>
 <li><a href="{{ site_url('docs/api/samv3') }}">SAM v3</a></li>
 <li><a href="{{ site_url('docs/applications/bittorrent') }}">{{ _('Bittorrent') }}</a></li>
@@ -65,8 +64,14 @@ Current specifications: These may eventually be migrated to the new format.
 Obsolete specifications:
 
 <ul>
-<li><a href="{{ site_url('docs/transport/ntcp') }}">NTCP</a></li>
 <li><a href="{{ site_url('docs/api/bob') }}">BOB</a></li>
+<li><a href="{{ site_url('docs/how/elgamal-aes') }}">{{ _('ElGamal/AES+SessionTags') }}</a></li>
+<li><a href="{{ site_url('docs/transport/ntcp') }}">NTCP 1</a></li>
+<li><a href="{{ site_url('docs/api/sam') }}">SAM v1</a></li>
+<li><a href="{{ site_url('docs/api/samv2') }}">SAM v2</a></li>
+<li><a href="{{ site_url('docs/transport/ssu') }}">SSU 1 (overview)</a></li>
+<li><a href="{{ spec_url('ssu') }}">SSU 1 (spec)</a></li>
+<li><a href="{{ spec_url('tunnel-creation') }}">Tunnel Creation (ElGamal)</a></li>
 </ul>
 
 {% endblock %}
diff --git a/i2p2www/spec/cryptography.rst b/i2p2www/spec/cryptography.rst
index 55c20b10..f93f3865 100644
--- a/i2p2www/spec/cryptography.rst
+++ b/i2p2www/spec/cryptography.rst
@@ -3,8 +3,8 @@ Low-level Cryptography Specification
 ====================================
 .. meta::
     :category: Design
-    :lastupdated: 2020-09
-    :accuratefor: 0.9.47
+    :lastupdated: 2025-05
+    :accuratefor: 0.9.66
 
 .. contents::
 
@@ -12,6 +12,18 @@ Low-level Cryptography Specification
 Overview
 ========
 
+NOTE: MOSTLY OBSOLETE -
+See the following documents for current specifications:
+
+- {{ spec_url('ecies') }}
+- {{ spec_url('encryptedleaseset') }}
+- {{ spec_url('ntcp2') }}
+- {{ spec_url('red25519') }}
+- {{ spec_url('ssu2') }}
+- {{ spec_url('tunnel-creation-ecies') }}
+
+
+
 This page specifies the low-level details of the cryptography in I2P.
 
 There are several cryptographic algorithms in use within I2P.
@@ -39,11 +51,10 @@ of ElGamal asymmetric encryption and AES symmetric encryption.
 Newer protocols NTCP2 and ECIES-X25519-AEAD-Ratchet
 use a combination of X25519 key exchange and ChaCha20/Poly1305 symmetric encryption.
 
+- ECIES-X25519-AEAD-Ratchet has replaced ElGamal/AES+SessionTags.
 - NTCP2 has replaced NTCP.
-- ECIES-X25519-AEAD-Ratchet design and implementation are complete,
-  and will replace ElGamal/AES+SessionTags in late 2020.
-- SSU2, using X25519 and ChaCha20/Poly1305, is scheduled for design in late 2020
-  to replace SSU in 2021.
+- SSU2 has replaced SSU.
+- X25519 tunnel creation has replaced ElGamal tunnel creation.
 
 
 Asymmetric Encryption
diff --git a/i2p2www/spec/encryptedleaseset.rst b/i2p2www/spec/encryptedleaseset.rst
index a7a7ba58..552ad85a 100644
--- a/i2p2www/spec/encryptedleaseset.rst
+++ b/i2p2www/spec/encryptedleaseset.rst
@@ -3,8 +3,8 @@ Encrypted LeaseSet Specification
 ================================
 .. meta::
     :category: Protocols
-    :lastupdated: June 2019
-    :accuratefor: 0.9.41
+    :lastupdated: 2025-05
+    :accuratefor: 0.9.66
 
 .. contents::
 
diff --git a/i2p2www/spec/filter-format.rst b/i2p2www/spec/filter-format.rst
index a7242199..9a1912aa 100644
--- a/i2p2www/spec/filter-format.rst
+++ b/i2p2www/spec/filter-format.rst
@@ -3,8 +3,8 @@ Access Filter Format Specification
 ==================================
 .. meta::
     :category: Formats
-    :lastupdated: April 2019
-    :accuratefor: 0.9.40
+    :lastupdated: 2025-05
+    :accuratefor: 0.9.66
 
 .. contents::
 
diff --git a/i2p2www/spec/geoip.rst b/i2p2www/spec/geoip.rst
index 23a6cf84..c0dd4892 100644
--- a/i2p2www/spec/geoip.rst
+++ b/i2p2www/spec/geoip.rst
@@ -3,8 +3,8 @@ GeoIP File Specification
 ========================
 .. meta::
     :category: Formats
-    :lastupdated: December 2013
-    :accuratefor: 0.9.9
+    :lastupdated: 2025-05
+    :accuratefor: 0.9.66
 
 .. contents::
 
@@ -12,6 +12,12 @@ GeoIP File Specification
 Overview
 ========
 
+NOTE: OBSOLETE - We now support three formats, in order of preference:
+
+- Maxmind geoip2 (GeoLite2-Country.mmdb) bundled with all installs except Debian packages and Android
+- Maxmind geoip1 (GeoIP.dat) in the Debian geoip-database package
+- The IPv4 Tor format (geoip.txt) and the custom IPv6 format (geoipv6.dat.gz) documented below, still supported but unused.
+
 This page specifies the format of the various GeoIP files,
 used by the router to look up a country for an IP.
 
diff --git a/i2p2www/spec/tunnel-creation.rst b/i2p2www/spec/tunnel-creation.rst
index 3f2fc47f..ff6371ee 100644
--- a/i2p2www/spec/tunnel-creation.rst
+++ b/i2p2www/spec/tunnel-creation.rst
@@ -3,8 +3,8 @@ Tunnel Creation Specification
 =============================
 .. meta::
     :category: Design
-    :lastupdated: July 2019
-    :accuratefor: 0.9.41
+    :lastupdated: 2025-05
+    :accuratefor: 0.9.66
 
 .. contents::
 
@@ -14,6 +14,9 @@ Tunnel Creation Specification
 Overview
 ========
 
+NOTE: OBSOLETE - This is the ElGamal tunnel build specification.
+See {{ spec_url('tunnel-creation-ecies') }} for the X25519 tunnel build specification.
+
 This document specifies the details of the encrypted tunnel build messages used
 to create tunnels using a "non-interactive telescoping" method.  See the tunnel
 build document [TUNNEL-IMPL]_ for an overview of the process, including peer