Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

c94ab597

Commit c94ab597 authored 7 years ago by Richard van der Hoff Committed by GitHub 7 years ago

Downloads
- Plain Diff

Merge pull request #2459 from matrix-org/rav/keyring_cleanups

Clean up Keyring code

parents 9864efa5 6de74ea6

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

synapse/crypto/keyring.py 126 additions, 99 deletions

synapse/crypto/keyring.py
synapse/federation/federation_base.py 59 additions, 57 deletions

synapse/federation/federation_base.py
synapse/federation/federation_client.py 4 additions, 4 deletions

synapse/federation/federation_client.py
synapse/storage/keys.py 24 additions, 17 deletions

synapse/storage/keys.py
tests/crypto/test_keyring.py 140 additions, 37 deletions

tests/crypto/test_keyring.py

with 353 additions and 214 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