roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

cmd/ethkey: support --passwordfile in generate command (#21183)

Browse Source
This commit is contained in:
libby kent 2020-06-08 18:55:51 +09:00 committed by GitHub
parent da06519347
commit 45b7535137
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/ethkey/changepassword.go
View File

@ -51,7 +51,7 @@ Change the password of a keyfile.`,
} }
// Decrypt key with passphrase. // Decrypt key with passphrase.
passphrase := getPassphrase(ctx) passphrase := getPassphrase(ctx, false)
key, err := keystore.DecryptKey(keyjson, passphrase) key, err := keystore.DecryptKey(keyjson, passphrase)
if err != nil { if err != nil {
utils.Fatalf("Error decrypting key: %v", err) utils.Fatalf("Error decrypting key: %v", err)

2
cmd/ethkey/generate.go
View File

@ -94,7 +94,7 @@ If you want to encrypt an existing private key, it can be specified by setting
} }
// Encrypt key with passphrase. // Encrypt key with passphrase.
passphrase := promptPassphrase(true) passphrase := getPassphrase(ctx, true)
scryptN, scryptP := keystore.StandardScryptN, keystore.StandardScryptP scryptN, scryptP := keystore.StandardScryptN, keystore.StandardScryptP
if ctx.Bool("lightkdf") { if ctx.Bool("lightkdf") {
scryptN, scryptP = keystore.LightScryptN, keystore.LightScryptP scryptN, scryptP = keystore.LightScryptN, keystore.LightScryptP

2
cmd/ethkey/inspect.go
View File

@ -60,7 +60,7 @@ make sure to use this feature with great caution!`,
} }
// Decrypt key with passphrase. // Decrypt key with passphrase.
passphrase := getPassphrase(ctx) passphrase := getPassphrase(ctx, false)
key, err := keystore.DecryptKey(keyjson, passphrase) key, err := keystore.DecryptKey(keyjson, passphrase)
if err != nil { if err != nil {
utils.Fatalf("Error decrypting key: %v", err) utils.Fatalf("Error decrypting key: %v", err)

2
cmd/ethkey/message.go
View File

@ -62,7 +62,7 @@ To sign a message contained in a file, use the --msgfile flag.
} }
// Decrypt key with passphrase. // Decrypt key with passphrase.
passphrase := getPassphrase(ctx) passphrase := getPassphrase(ctx, false)
key, err := keystore.DecryptKey(keyjson, passphrase) key, err := keystore.DecryptKey(keyjson, passphrase)
if err != nil { if err != nil {
utils.Fatalf("Error decrypting key: %v", err) utils.Fatalf("Error decrypting key: %v", err)

4
cmd/ethkey/utils.go
View File

@ -52,7 +52,7 @@ func promptPassphrase(confirmation bool) string {
// getPassphrase obtains a passphrase given by the user. It first checks the // getPassphrase obtains a passphrase given by the user. It first checks the
// --passfile command line flag and ultimately prompts the user for a // --passfile command line flag and ultimately prompts the user for a
// passphrase. // passphrase.
func getPassphrase(ctx *cli.Context) string { func getPassphrase(ctx *cli.Context, confirmation bool) string {
// Look for the --passwordfile flag. // Look for the --passwordfile flag.
passphraseFile := ctx.String(passphraseFlag.Name) passphraseFile := ctx.String(passphraseFlag.Name)
if passphraseFile != "" { if passphraseFile != "" {
@ -65,7 +65,7 @@ func getPassphrase(ctx *cli.Context) string {
} }
// Otherwise prompt the user for the passphrase. // Otherwise prompt the user for the passphrase.
return promptPassphrase(false) return promptPassphrase(confirmation)
} }
// signHash is a helper function that calculates a hash for the given message // signHash is a helper function that calculates a hash for the given message