lbt/I2P_Website
1
0
Fork 0
forked from I2P_Developers/i2p.www
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prop 144 minor updates

Browse Source
This commit is contained in:
zzz
2019-07-08 13:26:26 +00:00
parent 495619463d
commit 195322d5b8
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
i2p2www/spec/proposals/144-ecies-x25519-aead-ratchet.rst
View File

@@ -5,7 +5,7 @@ ECIES-X25519-AEAD-Ratchet
:author: zzz, chisana :author: zzz, chisana
:created: 2018-11-22 :created: 2018-11-22
:thread: http://zzz.i2p/topics/2639 :thread: http://zzz.i2p/topics/2639
:lastupdated: 2019-06-24 :lastupdated: 2019-07-08
:status: Open :status: Open
.. contents:: .. contents::
@@ -745,7 +745,7 @@ Encrypted:
Public Key :: 32 bytes, little endian, Elligator2, cleartext Public Key :: 32 bytes, little endian, Elligator2, cleartext
Ephemeral Key Section encrypted data :: 40 bytes Flags Section encrypted data :: 40 bytes
Payload Section encrypted data :: remaining data minus 16 bytes Payload Section encrypted data :: remaining data minus 16 bytes
@@ -770,7 +770,7 @@ each message, including retransmissions.
Ephemeral Key Section Decrypted data Ephemeral Key Section Decrypted data
```````````````````````````````````` ````````````````````````````````````
Ephemeral Key Section contains: Ephemeral Key Section contains flags and a key:
.. raw:: html .. raw:: html
@@ -896,6 +896,7 @@ KDF for Ephemeral Key Section Encrypted Contents
sharedSecret = DH(ask, bpk) = DH(bsk, apk) sharedSecret = DH(ask, bpk) = DH(bsk, apk)
// MixKey(DH())
// ChaChaPoly parameters to encrypt/decrypt // ChaChaPoly parameters to encrypt/decrypt
keydata = HKDF(INITIAL_ROOT_KEY, sharedSecret, "NewSessionTmpKey", 64) keydata = HKDF(INITIAL_ROOT_KEY, sharedSecret, "NewSessionTmpKey", 64)
chainKey = keydata[0:31] chainKey = keydata[0:31]
@@ -912,6 +913,10 @@ KDF for Static Key Section Encrypted Contents
Only present if indicated in Ephemeral Key Section flags. Only present if indicated in Ephemeral Key Section flags.
TODO we can't really use the chainKey from above, or
else we won't end up with the same key from multiple
new session messages.
.. raw:: html .. raw:: html
@@ -928,6 +933,7 @@ Only present if indicated in Ephemeral Key Section flags.
sharedSecret = DH(ask, bpk) = DH(bsk, apk) sharedSecret = DH(ask, bpk) = DH(bsk, apk)
// MixKey(DH())
// ChaChaPoly parameters to encrypt/decrypt // ChaChaPoly parameters to encrypt/decrypt
// chainKey from Ephemeral Key Section // chainKey from Ephemeral Key Section
keydata = HKDF(chainKey, sharedSecret, "EphemperalPart2x", 64) keydata = HKDF(chainKey, sharedSecret, "EphemperalPart2x", 64)
@@ -962,6 +968,7 @@ KDF for Payload Section Encrypted Contents
sharedSecret = DH(ask, bpk) = DH(bsk, apk) sharedSecret = DH(ask, bpk) = DH(bsk, apk)
// MixKey(DH())
// ChaChaPoly parameters to encrypt/decrypt // ChaChaPoly parameters to encrypt/decrypt
// chainKey from Static Key Section (if present) // chainKey from Static Key Section (if present)
// or Ephemeral Key Section (if Static Key Section not present) // or Ephemeral Key Section (if Static Key Section not present)
@@ -1619,7 +1626,6 @@ the following blocks are required, in the following order:
- DateTime (type 0) - DateTime (type 0)
- Options (type 5) - Options (type 5)
- Message Number (type 6) - Message Number (type 6)
- New Key (type 7)
Other allowed blocks: Other allowed blocks: