summary refs log tree commit diff
path: root/synapse/crypto
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-10-17 16:50:04 +0100
committerMark Haines <mark.haines@matrix.org>2014-10-17 16:50:04 +0100
commitc5cec1cc77029c21f0117c318c522ab320de3923 (patch)
treee7d3a36d1db4935f306f4354bed59bfc92ea2828 /synapse/crypto
parentmove 'age' into 'meta' subdict so that it is clearer that it is not part of t... (diff)
downloadsynapse-c5cec1cc77029c21f0117c318c522ab320de3923.tar.xz
Rename 'meta' to 'unsigned'
Diffstat (limited to 'synapse/crypto')
-rw-r--r--synapse/crypto/event_signing.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/crypto/event_signing.py b/synapse/crypto/event_signing.py
index 32d60bd30a..a236f7d708 100644
--- a/synapse/crypto/event_signing.py
+++ b/synapse/crypto/event_signing.py
@@ -47,7 +47,9 @@ def check_event_pdu_content_hash(pdu, hash_algorithm=hashlib.sha256):
 
 def _compute_content_hash(pdu, hash_algorithm):
     pdu_json = pdu.get_dict()
-    pdu_json.pop("meta", None)
+    #TODO: Make "age_ts" key internal
+    pdu_json.pop("age_ts")
+    pdu_json.pop("unsigned", None)
     pdu_json.pop("signatures", None)
     hashes = pdu_json.pop("hashes", {})
     pdu_json_bytes = encode_canonical_json(pdu_json)