Merge pull request shadowsocks#30 from hawkingrei/master

style: consistent code style
rd-code · Mar 31, 2017 · d34f7f6 · d34f7f6
2 parents 57ca340 + 14ae784
commit d34f7f6
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/shadowaead/cipher.go b/shadowaead/cipher.go
@@ -46,8 +46,7 @@ func (a *metaCipher) SaltSize() int {
 func (a *metaCipher) Encrypter(salt []byte) (cipher.AEAD, error) {
 	subkey := make([]byte, a.KeySize())
 	hkdfSHA1(a.psk, salt, []byte("ss-subkey"), subkey)
-	aead, err := a.makeAEAD(subkey)
-	return aead, err
+	return a.makeAEAD(subkey)
 }
 func (a *metaCipher) Decrypter(salt []byte) (cipher.AEAD, error) {
 	subkey := make([]byte, a.KeySize())