1
0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-06-27 01:45:23 +00:00

refine chacha20 initialization

This commit is contained in:
v2ray 2016-07-23 13:04:44 +02:00
parent 128e866021
commit e304e2761d
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169

View File

@ -6,24 +6,16 @@ import (
"github.com/aead/chacha20"
)
func makeNonce(nonce *[chacha20.NonceSize]byte, iv []byte) {
// NewChaCha20Stream creates a new Chacha/20 cipher stream. Caller must ensure that key is 32-bytes long and iv is either 8 or 12 bytes.
func NewChaCha20Stream(key []byte, iv []byte) cipher.Stream {
var keyArray [32]byte
var nonce [12]byte
copy(keyArray[:], key)
switch len(iv) {
case 8:
copy(nonce[4:], iv)
case 12:
copy(nonce[:], iv)
default:
panic("bad nonce length")
}
}
func NewChaCha20Stream(key []byte, iv []byte) cipher.Stream {
var Key [32]byte
var Nonce [12]byte
if len(key) != 32 {
panic("bad key length")
}
copy(Key[:], key)
makeNonce(&Nonce, iv)
return chacha20.NewCipher(&Nonce, &Key)
return chacha20.NewCipher(&nonce, &keyArray)
}