Merge branch 'fix-iv'

matrix-org · Apr 7, 2020 · be1669d · be1669d
2 parents 57f3c84 + b908b8e
commit be1669d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/changelogs/client_server/newsfragments/2492.clarification b/changelogs/client_server/newsfragments/2492.clarification
@@ -0,0 +1 @@
+Clarify the IV data type for encrypted files.
diff --git a/specification/modules/end_to_end_encryption.rst b/specification/modules/end_to_end_encryption.rst
@@ -277,7 +277,7 @@ Parameter Type             Description
 ========= ================ =====================================================
 url       string           **Required.** The URL to the file.
 key       JWK              **Required.** A `JSON Web Key`_ object.
-iv        string           **Required.** The Initialisation Vector used by
+iv        string           **Required.** The 128-bit unique counter block used by
                            AES-CTR, encoded as unpadded base64.
 hashes    {string: string} **Required.** A map from an algorithm name to a hash
                            of the ciphertext, encoded as unpadded base64. Clients