logos-messaging/noise
1
0
Fork 0
mirror of https://github.com/logos-messaging/noise.git synced 2026-01-02 14:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove four allocs by embedding chacha20.Cipher

Browse Source
This commit is contained in:
Jonathan Rudenberg 2014-07-14 22:57:30 -07:00
parent 8f09b6f6b7
commit 23f8d99470
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
box/box.go
View File

@ -12,7 +12,7 @@ import (
"code.google.com/p/go.crypto/curve25519"
"code.google.com/p/go.crypto/poly1305"
"github.com/codahale/chacha20"
"github.com/titanous/chacha20"
)
type Ciphersuite interface {
@ -229,6 +229,7 @@ func (noise255) NewCipher(cc []byte) CipherContext {
type noise255ctx struct {
cc []byte
keystream [168]byte
cipher chacha20.Cipher
}
func (n *noise255ctx) Reset(cc []byte) {
@ -239,8 +240,7 @@ func (n *noise255ctx) key() (cipher.Stream, []byte) {
cipherKey := n.cc[:32]
iv := n.cc[32:40]
c, err := chacha20.NewCipher(cipherKey, iv)
if err != nil {
if err := n.cipher.Initialize(cipherKey, iv); err != nil {
panic(err)
}
@ -248,9 +248,9 @@ func (n *noise255ctx) key() (cipher.Stream, []byte) {
for i := range keystream {
n.keystream[i] = 0
}
c.XORKeyStream(keystream, keystream)
n.cipher.XORKeyStream(keystream, keystream)
return c, keystream
return &n.cipher, keystream
}
func (n *noise255ctx) rekey() {
@ -259,8 +259,7 @@ func (n *noise255ctx) rekey() {
for i := range iv {
iv[i] ^= 0xff
}
c, err := chacha20.NewCipher(cipherKey, iv)
if err != nil {
if err := n.cipher.Initialize(cipherKey, iv); err != nil {
panic(err)
}
@ -268,7 +267,7 @@ func (n *noise255ctx) rekey() {
for i := range ks {
ks[i] = 0
}
c.XORKeyStream(ks, ks)
n.cipher.XORKeyStream(ks, ks)
n.cc = ks[64:]
}