Browse Source

Fix bug introduced by metalinting...

pull/1782/head
Ethan Frey 7 years ago
parent
commit
0219ba2a63
1 changed files with 4 additions and 3 deletions
  1. +4
    -3
      keys/cryptostore/encoder.go

+ 4
- 3
keys/cryptostore/encoder.go View File

@ -39,11 +39,12 @@ func (e secretbox) Encrypt(privKey crypto.PrivKey, passphrase string) (saltBytes
return saltBytes, crypto.EncryptSymmetric(privKeyBytes, key), nil return saltBytes, crypto.EncryptSymmetric(privKeyBytes, key), nil
} }
func (e secretbox) Decrypt(saltBytes []byte, encBytes []byte, passphrase string) (crypto.PrivKey, error) {
func (e secretbox) Decrypt(saltBytes []byte, encBytes []byte, passphrase string) (privKey crypto.PrivKey, err error) {
privKeyBytes := encBytes privKeyBytes := encBytes
// NOTE: Some keys weren't encrypted with a passphrase and hence we have the conditional // NOTE: Some keys weren't encrypted with a passphrase and hence we have the conditional
if passphrase != "" { if passphrase != "" {
key, err := bcrypt.GenerateFromPassword(saltBytes, []byte(passphrase), 14) // TODO parameterize. 14 is good today (2016)
var key []byte
key, err = bcrypt.GenerateFromPassword(saltBytes, []byte(passphrase), 14) // TODO parameterize. 14 is good today (2016)
if err != nil { if err != nil {
return crypto.PrivKey{}, errors.Wrap(err, "Invalid Passphrase") return crypto.PrivKey{}, errors.Wrap(err, "Invalid Passphrase")
} }
@ -53,7 +54,7 @@ func (e secretbox) Decrypt(saltBytes []byte, encBytes []byte, passphrase string)
return crypto.PrivKey{}, errors.Wrap(err, "Invalid Passphrase") return crypto.PrivKey{}, errors.Wrap(err, "Invalid Passphrase")
} }
} }
privKey, err := crypto.PrivKeyFromBytes(privKeyBytes)
privKey, err = crypto.PrivKeyFromBytes(privKeyBytes)
if err != nil { if err != nil {
return crypto.PrivKey{}, errors.Wrap(err, "Private Key") return crypto.PrivKey{}, errors.Wrap(err, "Private Key")
} }


Loading…
Cancel
Save