fixing linting errors

This commit is contained in:
Dan Ballard 2018-06-27 09:19:38 -07:00
parent 21817f936d
commit f16cd86e20
1 changed files with 6 additions and 8 deletions

View File

@ -108,7 +108,7 @@ func encryptProfile(p *cwtchPeer, key [32]byte) []byte {
}
//decryptProfile decrypts the passed ciphertext into a cwtchPeer via the specified key.
func decryptProfile(ciphertext []byte, key [32]byte) (error, *cwtchPeer) {
func decryptProfile(ciphertext []byte, key [32]byte) (*cwtchPeer, error) {
var decryptNonce [24]byte
copy(decryptNonce[:], ciphertext[:24])
@ -117,12 +117,11 @@ func decryptProfile(ciphertext []byte, key [32]byte) (error, *cwtchPeer) {
cp := &cwtchPeer{}
err := json.Unmarshal(decrypted, &cp)
if err == nil {
return nil, cp
} else {
return err, nil
return cp, nil
}
return nil, err
}
return fmt.Errorf("Failed to decrypt"), nil
return nil, fmt.Errorf("Failed to decrypt")
}
func (cp *cwtchPeer) setup() {
@ -184,16 +183,15 @@ func LoadCwtchPeer(profilefile string, password string) (CwtchPeerInterface, err
copy(dkr[:], dk)
copy(salty[:], salt)
err, cp := decryptProfile(encryptedbytes, dkr)
cp, err := decryptProfile(encryptedbytes, dkr)
if err == nil {
cp.setup()
cp.profilefile = profilefile
cp.key = dkr
cp.salt = salty
return cp, nil
} else {
return nil, err
}
return nil, err
}
// ImportGroup intializes a group from an imported source rather than a peer invite