logos-messaging/noise
1
0
Fork 0
mirror of https://github.com/logos-messaging/noise.git synced 2026-01-03 22:53:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update authtext to match noise spec changes

Browse Source
This commit is contained in:
Jonathan Rudenberg 2014-07-13 23:00:24 -07:00
parent fe90ef5cb4
commit e0ed980c97
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
box/box.go
View File

@ -92,9 +92,9 @@ func (c *Crypter) EncryptBox(dst []byte, ephKey *Key, plaintext []byte, padLen i
c.ChainVar = cv2
dst = append(dst, ephKey.Public...)
dst = c.cipher(cc1).Encrypt(dst, c.Key.Public, ephKey.Public)
dst = c.cipher(cc1).Encrypt(dst, c.Key.Public, append(c.PeerKey.Public, ephKey.Public...))
c.cc.Reset(cc2)
return c.EncryptBody(dst, plaintext, dst[dstPrefixLen:], padLen), nil
return c.EncryptBody(dst, plaintext, append(c.PeerKey.Public, dst[dstPrefixLen:]...), padLen), nil
}
func (c *Crypter) BoxLen(n int) int {
@ -129,7 +129,7 @@ func (c *Crypter) DecryptBox(ciphertext []byte, kdfNum uint8) ([]byte, error) {
header := ciphertext[:(2*c.Cipher.DHLen())+c.Cipher.MACLen()]
ciphertext = ciphertext[len(header):]
senderPubKey, err := c.cipher(cc1).Decrypt(header[c.Cipher.DHLen():], ephPubKey)
senderPubKey, err := c.cipher(cc1).Decrypt(header[c.Cipher.DHLen():], append(c.Key.Public, ephPubKey...))
if err != nil {
return nil, err
}
@ -142,7 +142,7 @@ func (c *Crypter) DecryptBox(ciphertext []byte, kdfNum uint8) ([]byte, error) {
dh2 := c.Cipher.DH(c.Key.Private, senderPubKey)
cv2, cc2 := c.deriveKey(dh2, cv1, kdfNum+1)
c.ChainVar = cv2
body, err := c.cipher(cc2).Decrypt(ciphertext, header)
body, err := c.cipher(cc2).Decrypt(ciphertext, append(c.Key.Public, header...))
if err != nil {
return nil, err
}