Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2026-03-08 12:34:09 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix typo

Browse source
This commit is contained in:
Andrew Morgan 2019-05-07 15:51:32 -07:00
parent 7c7bc677fb
commit c233535de0
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
specification/modules/end_to_end_encryption.rst
View file

@ -460,7 +460,7 @@ Keys can be manually exported from one device to an encrypted file, copied to
another device, and imported. The file is encrypted using a user-supplied another device, and imported. The file is encrypted using a user-supplied
passphrase, and is created as follows: passphrase, and is created as follows:
1. Encode the sessions a JSON object, formatted as described in `Key export 1. Encode the sessions as a JSON object, formatted as described in `Key export
format`_. format`_.
2. Generate a 512-bit key from the user-entered passphrase by computing 2. Generate a 512-bit key from the user-entered passphrase by computing
`PBKDF2`_\(HMAC-SHA-512, passphrase, S, N, 512), where S is a 128-bit `PBKDF2`_\(HMAC-SHA-512, passphrase, S, N, 512), where S is a 128-bit