diff options
author | Mark Haines <mjark@negativecurvature.net> | 2014-10-14 10:06:04 +0100 |
---|---|---|
committer | Mark Haines <mjark@negativecurvature.net> | 2014-10-14 10:06:04 +0100 |
commit | 636a0dbde7082a485c0d4ac58137ecb75f7f23fe (patch) | |
tree | 780ad4589dbde7e0fab416496faee5f3c351d169 /synapse/storage/schema/keys.sql | |
parent | Replace on_send_callback with something a bit clearer so that we can sign mes... (diff) | |
parent | typoe (diff) | |
download | synapse-636a0dbde7082a485c0d4ac58137ecb75f7f23fe.tar.xz |
Merge pull request #8 from matrix-org/server2server_signing
Server2server signing
Diffstat (limited to 'synapse/storage/schema/keys.sql')
-rw-r--r-- | synapse/storage/schema/keys.sql | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/synapse/storage/schema/keys.sql b/synapse/storage/schema/keys.sql index 706a1a03ff..9bf2068d84 100644 --- a/synapse/storage/schema/keys.sql +++ b/synapse/storage/schema/keys.sql @@ -14,17 +14,18 @@ */ CREATE TABLE IF NOT EXISTS server_tls_certificates( server_name TEXT, -- Server name. - key_server TEXT, -- Which key server the certificate was fetched from. + fingerprint TEXT, -- Certificate fingerprint. + from_server TEXT, -- Which key server the certificate was fetched from. ts_added_ms INTEGER, -- When the certifcate was added. tls_certificate BLOB, -- DER encoded x509 certificate. - CONSTRAINT uniqueness UNIQUE (server_name) + CONSTRAINT uniqueness UNIQUE (server_name, fingerprint) ); CREATE TABLE IF NOT EXISTS server_signature_keys( server_name TEXT, -- Server name. - key_version TEXT, -- Key version. - key_server TEXT, -- Which key server the key was fetched form. + key_id TEXT, -- Key version. + from_server TEXT, -- Which key server the key was fetched form. ts_added_ms INTEGER, -- When the key was added. - verification_key BLOB, -- NACL verification key. - CONSTRAINT uniqueness UNIQUE (server_name, key_version) + verify_key BLOB, -- NACL verification key. + CONSTRAINT uniqueness UNIQUE (server_name, key_id) ); |