From b49945ee29636bf9cc3a832a5cc8a6c0c9a25341 Mon Sep 17 00:00:00 2001 From: dimssu Date: Sun, 7 Dec 2025 19:59:24 +0530 Subject: [PATCH] Merge 'Cryptography' category into 'Encryption' Fixes #2822 The 'Cryptography' and 'Encryption' blog categories were equivalent and redundant. This commit merges them by changing the blog posts using 'Cryptography' to use 'Encryption' instead. Signed-off-by: dimssu --- content/blog/2024/08/2024-08-28-libolm-deprecation.md | 2 +- content/blog/2025/11/2025-11-19-exclude-insecure-devices.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/content/blog/2024/08/2024-08-28-libolm-deprecation.md b/content/blog/2024/08/2024-08-28-libolm-deprecation.md index 5b09a029c3..7b9d010deb 100644 --- a/content/blog/2024/08/2024-08-28-libolm-deprecation.md +++ b/content/blog/2024/08/2024-08-28-libolm-deprecation.md @@ -4,7 +4,7 @@ title = "Libolm Deprecation" [taxonomies] author = ["Neil Johnson"] -category = ["Cryptography"] +category = ["Encryption"] +++ It’s been a few weeks since we announced the [deprecation of libolm](https://gitlab.matrix.org/matrix-org/olm/-/blob/master/README.md?ref\_type=heads\#important-libolm-is-now-deprecated). Since then, we’ve fielded some questions on the subject and thought it would be helpful to collect this context in a blog post. diff --git a/content/blog/2025/11/2025-11-19-exclude-insecure-devices.md b/content/blog/2025/11/2025-11-19-exclude-insecure-devices.md index 95896b442b..f98fa1c068 100644 --- a/content/blog/2025/11/2025-11-19-exclude-insecure-devices.md +++ b/content/blog/2025/11/2025-11-19-exclude-insecure-devices.md @@ -4,7 +4,7 @@ title = '"Exclude insecure devices" is coming' [taxonomies] author = ["Richard van der Hoff"] -category = ["Cryptography", "Encryption", "Spec"] +category = ["Encryption", "Spec"] +++ The Spec Core Team would like to remind everyone that, now that [MSC4153](https://github.com/matrix-org/matrix-spec-proposals/pull/4153) has been accepted, the Matrix spec recommends that “Encrypted to-device messages SHOULD NOT be sent to non-cross-signed devices”.