From 7f0ae1e344f676574a1e4c2861fe3af9bb11286f Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Fri, 5 Jul 2024 13:35:43 -0600 Subject: [PATCH 1/2] Ignore empty lines in Synapse signing keys --- homeserver_interop/synapse/signing_key.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/homeserver_interop/synapse/signing_key.go b/homeserver_interop/synapse/signing_key.go index b237f438..23c56f58 100644 --- a/homeserver_interop/synapse/signing_key.go +++ b/homeserver_interop/synapse/signing_key.go @@ -45,6 +45,9 @@ func DecodeAllSigningKeys(key io.Reader) ([]*homeserver_interop.SigningKey, erro } keys := make([]*homeserver_interop.SigningKey, 0) for i, line := range lines { + if line == "" { + continue + } parts := strings.Split(line, " ") if len(parts) != 3 { return nil, fmt.Errorf("i:%d - expected 3 parts to signing key, got %d", i, len(parts)) From ddd4329da2aa8cd3096c068fb143b5c812495e40 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Fri, 5 Jul 2024 13:37:41 -0600 Subject: [PATCH 2/2] changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f86975f..a319e061 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,7 +30,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), * JPEG thumbnails will now use sensible extensions. * Fixed directory permissions when exporting MMR to Synapse. * In some rare cases, memory usage may have leaked due to thumbnail error handling. This has been fixed. - +* Synapse signing keys with blank lines can now be decoded/combined with other keys. ## [1.3.4] - February 9, 2024