device: remove redundant return statements

More staticcheck fixes:

$ staticcheck ./... | grep S1023
device/noise-helpers.go:45:2: redundant return statement (S1023)
device/noise-helpers.go:54:2: redundant return statement (S1023)
device/noise-helpers.go:64:2: redundant return statement (S1023)

Signed-off-by: Matt Layher <mdlayher@gmail.com>
This commit is contained in:
Matt Layher 2019-06-03 16:25:32 -04:00 committed by Jason A. Donenfeld
parent 8d76ac8cc4
commit 43a4589043

View file

@ -42,7 +42,6 @@ func HMAC2(sum *[blake2s.Size]byte, key, in0, in1 []byte) {
func KDF1(t0 *[blake2s.Size]byte, key, input []byte) { func KDF1(t0 *[blake2s.Size]byte, key, input []byte) {
HMAC1(t0, key, input) HMAC1(t0, key, input)
HMAC1(t0, t0[:], []byte{0x1}) HMAC1(t0, t0[:], []byte{0x1})
return
} }
func KDF2(t0, t1 *[blake2s.Size]byte, key, input []byte) { func KDF2(t0, t1 *[blake2s.Size]byte, key, input []byte) {
@ -51,7 +50,6 @@ func KDF2(t0, t1 *[blake2s.Size]byte, key, input []byte) {
HMAC1(t0, prk[:], []byte{0x1}) HMAC1(t0, prk[:], []byte{0x1})
HMAC2(t1, prk[:], t0[:], []byte{0x2}) HMAC2(t1, prk[:], t0[:], []byte{0x2})
setZero(prk[:]) setZero(prk[:])
return
} }
func KDF3(t0, t1, t2 *[blake2s.Size]byte, key, input []byte) { func KDF3(t0, t1, t2 *[blake2s.Size]byte, key, input []byte) {
@ -61,7 +59,6 @@ func KDF3(t0, t1, t2 *[blake2s.Size]byte, key, input []byte) {
HMAC2(t1, prk[:], t0[:], []byte{0x2}) HMAC2(t1, prk[:], t0[:], []byte{0x2})
HMAC2(t2, prk[:], t1[:], []byte{0x3}) HMAC2(t2, prk[:], t1[:], []byte{0x3})
setZero(prk[:]) setZero(prk[:])
return
} }
func isZero(val []byte) bool { func isZero(val []byte) bool {