External/grumble
1
0
Fork 1
mirror of https://github.com/mumble-voip/grumble.git synced 2025-12-19 21:59:59 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #12 from mkrautz/cryptstate-drop-null-cryptomode

Browse source 
pkg/cryptstate: remove NULL crypto mode.
This commit is contained in:
Mikkel Krautz 2016-10-15 19:21:38 +02:00 • committed by GitHub
commit defccdcdf9
2 changed files with 0 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pkg/cryptstate/cryptstate.go
View file

@ -58,8 +58,6 @@ func createMode(mode string) (CryptoMode, error) {
return &ocb2Mode{}, nil return &ocb2Mode{}, nil
case "XSalsa20-Poly1305": case "XSalsa20-Poly1305":
return &secretBoxMode{}, nil return &secretBoxMode{}, nil
case "NULL":
return &nullMode{}, nil
} }
return nil, errors.New("cryptstate: no such CryptoMode") return nil, errors.New("cryptstate: no such CryptoMode")
} }

26
pkg/cryptstate/cryptstate_test.go
View file

@ -160,29 +160,3 @@ func TestXSalsa20Poly1305Decrypt(t *testing.T) {
t.Fatalf("mismatch! got\n%x\n, expected\n%x", dst, expected) t.Fatalf("mismatch! got\n%x\n, expected\n%x", dst, expected)
} }
} }
func TestNullEncrypt(t *testing.T) {
cs := CryptState{}
cs.SetKey("NULL", []byte{}, []byte{1}, []byte{1})
msg := []byte("HelloWorld")
dst := make([]byte, len(msg)+cs.Overhead())
cs.Encrypt(dst, msg)
if !bytes.Equal(dst[1:], msg) {
t.Fatalf("mismatch! got\n%x\n, expected\n%x", dst, msg)
}
}
func TestNullDecrypt(t *testing.T) {
cs := CryptState{}
cs.SetKey("NULL", []byte{}, []byte{1}, []byte{1})
msg := []byte{2}
msg = append(msg, []byte("HelloWorld")...)
dst := make([]byte, len(msg)-cs.Overhead())
err := cs.Decrypt(dst, msg)
if err != nil {
t.Fatalf("%v", err)
}
if !bytes.Equal(dst, msg[1:]) {
t.Fatalf("mismatch! got\n%x\n, expected\n%x", dst, msg)
}
}