diff --git a/content/client-server-api/modules/end_to_end_encryption.md b/content/client-server-api/modules/end_to_end_encryption.md index 4dc69c95..d8d1051c 100644 --- a/content/client-server-api/modules/end_to_end_encryption.md +++ b/content/client-server-api/modules/end_to_end_encryption.md @@ -517,27 +517,27 @@ The process between Alice and Bob verifying each other would be: method supported by Alice's device. 7. Bob's device ensures it has a copy of Alice's device key. 8. Bob's device creates an ephemeral Curve25519 key pair - (*K**B**p**r**i**v**a**t**e*, *K**B**p**u**b**l**i**c*), + (*KBprivate*, *KBpublic*), and calculates the hash (using the chosen algorithm) of the public - key *K**B**p**u**b**l**i**c*. + key *KBpublic*. 9. Bob's device replies to Alice's device with an `m.key.verification.accept` message. 10. Alice's device receives Bob's message and stores the commitment hash for later use. 11. Alice's device creates an ephemeral Curve25519 key pair - (*K**A**p**r**i**v**a**t**e*, *K**A**p**u**b**l**i**c*) + (*KAprivate*, *KApublic*) and replies to Bob's device with an `m.key.verification.key`, sending only the public key - *K**A**p**u**b**l**i**c*. + *KApublic*. 12. Bob's device receives Alice's message and replies with its own `m.key.verification.key` message containing its public key - *K**B**p**u**b**l**i**c*. + *KBpublic*. 13. Alice's device receives Bob's message and verifies the commitment hash from earlier matches the hash of the key Bob's device just sent and the content of Alice's `m.key.verification.start` message. 14. Both Alice and Bob's devices perform an Elliptic-curve Diffie-Hellman - (*E**C**D**H*(*K**A**p**r**i**v**a**t**e*, *K**B**p**u**b**l**i**c*)), + (*ECDH(KAprivate*, *KBpublic*)), using the result as the shared secret. 15. Both Alice and Bob's devices display a SAS to their users, which is derived from the shared key using one of the methods in this @@ -711,13 +711,13 @@ to convert to decimal numbers (resulting in 3 numbers between 0 and 8191 inclusive each). Add 1000 to each calculated number. The bitwise operations to get the numbers given the 5 bytes -*B*0, *B*1, *B*2, *B*3, *B*4 +*B0*, *B1*, *B2*, *B3*, *B4* would be: -- First: (*B*0 ≪ 5|*B*1 ≫ 3) + 1000 +- First: (*B0* ≪ 5|*B1* ≫ 3) + 1000 - Second: - ((*B*1&0*x*7) ≪ 10|*B*2 ≪ 2|*B*3 ≫ 6) + 1000 -- Third: ((*B*3&0*x*3*F*) ≪ 7|*B*4 ≫ 1) + 1000 + ((*B1*&0x7) ≪ 10|*B2* ≪ 2|*B3* ≫ 6) + 1000 +- Third: ((*B3*&0x3F) ≪ 7|*B4* ≫ 1) + 1000 The digits are displayed to the user either with an appropriate separator, such as dashes, or with the numbers on individual lines.