Merge pull request #1830 from matrix-org/travis/spec/x509-wk

Specify .well-known s2s discovery and X.509 validation
2019-02-01 08:36:55 -07:00 · 2019-02-01 08:36:55 -07:00 · 41e50d553e
commit 41e50d553e
parent df01acc6e2 6421582bf2
5 changed files with 158 additions and 47 deletions
--- a/api/server-server/examples/server_key.json
+++ b/api/server-server/examples/server_key.json
@ -16,8 +16,5 @@
            "ed25519:auto2": "VGhpcyBzaG91bGQgYWN0dWFsbHkgYmUgYSBzaWduYXR1cmU"
        }
    },
-    "tls_fingerprints": [{
-        "sha256": "VGhpcyBpcyBoYXNoIHdoaWNoIHNob3VsZCBiZSBieXRlcw"
-    }],
    "valid_until_ts": 1652262000000
-}
+}