forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 10:22:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

clef: add json wrapping around encrypted master seed

Browse source
This commit is contained in:
Martin Holst Swende 2018-09-25 17:10:23 +02:00
parent d0e716bfaa
commit d17d5d2998
No known key found for this signature in database
GPG key ID: 683B438C05A5DDF0
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
cmd/clef/main.go
View file

@ -366,7 +366,7 @@ func signer(c *cli.Context) error {
configDir := c.GlobalString(configdirFlag.Name)
if stretchedKey, err := readMasterKey(c, ui); err != nil {
log.Info("No master seed provided, rules disabled")
log.Info("No master seed provided, rules disabled", "error", err)
} else {
if err != nil {
@ -551,7 +551,6 @@ func readMasterKey(ctx *cli.Context, ui core.SignerUI) ([]byte, error) {
if err != nil {
return nil, err
}
var password string
// If ui is not nil, get the password from ui.
if ui != nil {
@ -676,10 +675,15 @@ func getPassPhrase(prompt string, confirmation bool) string {
utils.Fatalf("Passphrases do not match")
}
}
//TODO add validation of password (exists already in a separate PR)
return password
}
type encryptedSeedStorage struct {
Description string `json:"description"`
Version int `json:"version"`
Params keystore.CryptoJSON `json:"params"`
}
// encryptSeed uses a similar scheme as the keystore uses, but with a different wrapping,
// to encrypt the master seed
func encryptSeed(seed []byte, auth []byte, scryptN, scryptP int) ([]byte, error) {
@ -687,16 +691,19 @@ func encryptSeed(seed []byte, auth []byte, scryptN, scryptP int) ([]byte, error)
if err != nil {
return nil, err
}
return json.Marshal(cryptoStruct)
return json.Marshal(&encryptedSeedStorage{"Clef seed", 1, cryptoStruct})
}
// decryptSeed decrypts the master seed
func decryptSeed(keyjson []byte, auth string) ([]byte, error) {
var cryptoStruct keystore.CryptoJSON
if err := json.Unmarshal(keyjson, &cryptoStruct); err != nil {
var encSeed encryptedSeedStorage
if err := json.Unmarshal(keyjson, &encSeed); err != nil {
return nil, err
}
seed, err := keystore.DecryptDataV3(cryptoStruct, auth)
if encSeed.Version != 1 {
log.Warn(fmt.Sprintf("unsupported encryption format of seed: %d, operation will likely fail", encSeed.Version))
}
seed, err := keystore.DecryptDataV3(encSeed.Params, auth)
if err != nil {
return nil, err
}