Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2026-02-25 07:23:42 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #1989 from matrix-org/anoa/typo2

Browse source 
Add missing 'as'
This commit is contained in:
Travis Ralston 2019-05-07 23:06:46 -06:00 committed by GitHub
parent 947fa57183 abd770419b
commit c54a5fc3df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelogs/client_server/newsfragments/1989.clarification Normal file
View file

@ -0,0 +1 @@
Fix various spelling mistakes throughout the specification.

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