cwtch.im
/
cwtch
16
20
Fork 16
Code Issues 10 Pull Requests 2 Releases 163 Wiki Activity

Merge branch 'fix-lint' of dan/cwtch into master

This commit is contained in:
Sarah Jamie Lewis 2018-06-27 16:53:02 +00:00 committed by Gogs
parent 9ab582750f f16cd86e20
commit 8a1fb3ccc2
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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