Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve comment formatting

This commit is contained in:
Mark Haines 2016-10-12 14:45:13 +01:00
parent 6e9f3ab415
commit 0af6213019
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
synapse/config/tls.py
View File

@ -109,7 +109,7 @@ class TlsConfig(Config):
# fingerprints of a new certificate and wait for the caches on other # fingerprints of a new certificate and wait for the caches on other
# servers to expire before deploying it. # servers to expire before deploying it.
tls_fingerprints: [] tls_fingerprints: []
#- {"sha256": "<base64_encoded_sha256_fingerprint>"} # tls_fingerprints: [{"sha256": "<base64_encoded_sha256_fingerprint>"}]
""" % locals() """ % locals()
def read_tls_certificate(self, cert_path): def read_tls_certificate(self, cert_path):

9
synapse/rest/key/v2/local_key_resource.py
View File

@ -46,9 +46,12 @@ class LocalKey(Resource):
"expired_ts": # integer posix timestamp when the key expired. "expired_ts": # integer posix timestamp when the key expired.
"key": # base64 encoded NACL verification key. "key": # base64 encoded NACL verification key.
} }
} },
"tls_fingerprints": # Fingerprints of the TLS certs this server uses. "tls_fingerprints": [ # Fingerprints of the TLS certs this server uses.
- {"sha256": "..."} {
"sha256": # base64 encoded sha256 fingerprint of the X509 cert
},
],
"signatures": { "signatures": {
"this.server.example.com": { "this.server.example.com": {
"algorithm:version": # NACL signature for this server "algorithm:version": # NACL signature for this server