Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

f5b50d08

Unverified Commit f5b50d08 authored 5 years ago by Erik Johnston Committed by GitHub 5 years ago

Downloads
- Plain Diff

Merge pull request #5895 from matrix-org/erikj/notary_key

Add config option to sign remote key query responses with a separate key.

parents e7577427 fe0ac98e

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

changelog.d/5895.feature 1 addition, 0 deletions

changelog.d/5895.feature
docs/sample_config.yaml 8 additions, 0 deletions

docs/sample_config.yaml
synapse/config/key.py 30 additions, 4 deletions

synapse/config/key.py
synapse/crypto/keyring.py 2 additions, 9 deletions

synapse/crypto/keyring.py
synapse/rest/key/v2/remote_key_resource.py 15 additions, 13 deletions

synapse/rest/key/v2/remote_key_resource.py

with 56 additions and 26 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment