Merge 70f6749c92 into fe3f43a905

Point Olm and Megolm links at the new internal specification (#2242 )
Relates to: #1543 Signed-off-by: Johannes Marbach <n0-0ne+github@mailbox.org>
2026-04-28 21:34:09 +02:00 · 2025-11-01 20:10:43 +01:00 · 2025-10-31 13:52:15 +00:00 · 2025-10-31 11:02:16 +00:00 · 2025-09-11 02:19:33 +02:00 · 2025-09-11 02:19:33 +02:00
6 changed files with 13 additions and 11 deletions
--- a/changelogs/internal/newsfragments/2241.clarification
+++ b/changelogs/internal/newsfragments/2241.clarification
@ -0,0 +1 @@
+Inline Olm & Megolm specifications.
--- a/changelogs/internal/newsfragments/2242.clarification
+++ b/changelogs/internal/newsfragments/2242.clarification
@ -0,0 +1 @@
+Inline Olm & Megolm specifications.
--- a/changelogs/server_server/newsfragments/2191.clarification
+++ b/changelogs/server_server/newsfragments/2191.clarification
@ -0,0 +1 @@
+Clarify what the minimum_valid_until_ts field means when it is set in key queries.
--- a/content/client-server-api/modules/end_to_end_encryption.md
+++ b/content/client-server-api/modules/end_to_end_encryption.md
@ -1457,8 +1457,8 @@ readers without adding any useful extra information.
 ##### `m.olm.v1.curve25519-aes-sha2`

 The name `m.olm.v1.curve25519-aes-sha2` corresponds to version 1 of the
-Olm ratchet, as defined by the [Olm
-specification](http://matrix.org/docs/spec/olm.html). This uses:
+Olm ratchet, as defined by the [Olm specification](/olm-megolm/olm).
+This uses:

 -   Curve25519 for the initial key agreement.
 -   HKDF-SHA-256 for ratchet key derivation.
@ -1631,8 +1631,8 @@ This is due to a deprecation of the fields. See
 {{% changed-in v="1.3" %}}

 The name `m.megolm.v1.aes-sha2` corresponds to version 1 of the Megolm
-ratchet, as defined by the [Megolm
-specification](http://matrix.org/docs/spec/megolm.html). This uses:
+ratchet, as defined by the [Megolm specification](/olm-megolm/megolm).
+This uses:

 -   HMAC-SHA-256 for the hash ratchet.
 -   HKDF-SHA-256, AES-256 in CBC mode, and 8 byte truncated HMAC-SHA-256
--- a/data/api/server-server/keys_query.yaml
+++ b/data/api/server-server/keys_query.yaml
@ -34,8 +34,8 @@ paths:
        - in: query
          name: minimum_valid_until_ts
          description: |-
-            A millisecond POSIX timestamp in milliseconds indicating when the returned
-            certificates will need to be valid until to be useful to the requesting server.
+            A millisecond POSIX timestamp. The returned keys MUST be valid
+            until at least this timestamp.

            If not supplied, the current time as determined by the notary server is used.
          required: false
@ -98,9 +98,8 @@ paths:
                          type: integer
                          format: int64
                          description: |-
-                            A millisecond POSIX timestamp in milliseconds indicating when
-                            the returned certificates will need to be valid until to be
-                            useful to the requesting server.
+                            A millisecond POSIX timestamp. The returned keys
+                            MUST be valid until at least this timestamp.

                            If not supplied, the current time as determined by the notary
                            server is used.
--- a/layouts/docs/baseof.html
+++ b/layouts/docs/baseof.html
@ -13,8 +13,8 @@
  <head>
    {{ partial "head.html" . }}
    {{ if .Page.Store.Get "hasMath" }}
-      <link href="/css/katex.min.css" rel="preload" as="style">
-      <link href="/css/katex.min.css" rel="stylesheet">
+      <link href="{{ relURL "css/katex.min.css" }}" rel="preload" as="style">
+      <link href="{{ relURL "css/katex.min.css" }}" rel="stylesheet">
    {{ end }}
  </head>
  <body class="td-{{ .Kind }}{{ with .Page.Params.body_class }} {{ . }}{{ end }}">
Author	SHA1	Message	Date
famfo	46a0f40e36	Merge `70f6749c92` into `fe3f43a905`	2025-11-01 20:10:43 +01:00
Johannes Marbach	fe3f43a905	Point Olm and Megolm links at the new internal specification (#2242 ) Some checks failed Spec / 🔎 Validate OpenAPI specifications (push) Has been cancelled Details Spec / 🔎 Check Event schema examples (push) Has been cancelled Details Spec / 🔎 Check OpenAPI definitions examples (push) Has been cancelled Details Spec / 🔎 Check JSON Schemas inline examples (push) Has been cancelled Details Spec / ⚙️ Calculate baseURL for later jobs (push) Has been cancelled Details Spec / 📢 Run towncrier for changelog (push) Has been cancelled Details Spell Check / Spell Check with Typos (push) Has been cancelled Details Spec / 🐍 Build OpenAPI definitions (push) Has been cancelled Details Spec / 📖 Build the spec (push) Has been cancelled Details Spec / 🔎 Validate generated HTML (push) Has been cancelled Details Spec / 📖 Build the historical backup spec (push) Has been cancelled Details Relates to: #1543 Signed-off-by: Johannes Marbach <n0-0ne+github@mailbox.org>	2025-10-31 13:52:15 +00:00
Richard van der Hoff	4783619964	Fix broken link to katex CSS (#2241 ) Some checks are pending Spec / 🔎 Validate OpenAPI specifications (push) Waiting to run Details Spec / 🔎 Check Event schema examples (push) Waiting to run Details Spec / 🔎 Check OpenAPI definitions examples (push) Waiting to run Details Spec / 🔎 Check JSON Schemas inline examples (push) Waiting to run Details Spec / ⚙️ Calculate baseURL for later jobs (push) Waiting to run Details Spec / 🐍 Build OpenAPI definitions (push) Blocked by required conditions Details Spec / 📢 Run towncrier for changelog (push) Waiting to run Details Spec / 📖 Build the spec (push) Blocked by required conditions Details Spec / 🔎 Validate generated HTML (push) Blocked by required conditions Details Spec / 📖 Build the historical backup spec (push) Blocked by required conditions Details Spell Check / Spell Check with Typos (push) Waiting to run Details Followup to https://github.com/matrix-org/matrix-spec/pull/2226, which broke the build. These links to the static CSS are broken in the case that the spec is built for a subdirectory (such as `unstable`).	2025-10-31 11:02:16 +00:00
famfo	70f6749c92	changelogs/s2s: add minimum_valid_until_ts clarification	2025-09-11 02:19:33 +02:00
famfo	1583a12cec	s2s/keys: clarify minimum_valid_until_ts query Signed-off-by: famfo <famfo@famfo.xyz>	2025-09-11 02:19:33 +02:00
				`@ -0,0 +1 @@`
				`Clarify what the minimum_valid_until_ts field means when it is set in key queries.`