replace version number literals with constants to make grepping easier

This commit is contained in:
Lucas Clemente
2016-06-03 11:09:48 +02:00
parent 556bf2fe4b
commit 240946dfde
13 changed files with 75 additions and 67 deletions

View File

@@ -44,7 +44,7 @@ func DeriveKeysChacha20(version protocol.VersionNumber, forwardSecure bool, shar
return nil, err
}
if !forwardSecure && version >= protocol.VersionNumber(33) {
if !forwardSecure && version >= protocol.Version33 {
if err := diversify(myKey, myIV, divNonce); err != nil {
return nil, err
}

View File

@@ -10,7 +10,7 @@ import (
var _ = Describe("KeyDerivation", func() {
It("derives non-fs keys", func() {
aead, err := DeriveKeysChacha20(
32,
protocol.Version32,
false,
[]byte("0123456789012345678901"),
[]byte("nonce"),
@@ -29,7 +29,7 @@ var _ = Describe("KeyDerivation", func() {
It("derives fs keys", func() {
aead, err := DeriveKeysChacha20(
32,
protocol.Version32,
true,
[]byte("0123456789012345678901"),
[]byte("nonce"),
@@ -48,7 +48,7 @@ var _ = Describe("KeyDerivation", func() {
It("does not use diversification nonces in FS key derivation", func() {
aead, err := DeriveKeysChacha20(
33,
protocol.Version33,
true,
[]byte("0123456789012345678901"),
[]byte("nonce"),
@@ -67,7 +67,7 @@ var _ = Describe("KeyDerivation", func() {
It("uses diversification nonces in initial key derivation", func() {
aead, err := DeriveKeysChacha20(
33,
protocol.Version33,
false,
[]byte("0123456789012345678901"),
[]byte("nonce"),