From 36994e4e0b2be1362f99048d08b907628088e2bb Mon Sep 17 00:00:00 2001 From: SjonHortensius Date: Mon, 12 Aug 2019 11:00:38 +0200 Subject: [PATCH] all: replace passPHRASE with passWORD in user interactions (#19932) * Ref #19906 - replace passPHRASE with passWORD in any user interactions this skips doccomments and variablenames to minimize impact. It does however include a rename of the `ethkey` `changepassphrase` parameter * console: fix JavaScript error capitalization --- accounts/errors.go | 2 +- accounts/external/backend.go | 6 +-- accounts/keystore/keystore.go | 2 +- accounts/keystore/plain_test.go | 2 +- accounts/keystore/testdata/keystore/README | 2 +- cmd/clef/README.md | 4 +- cmd/clef/main.go | 12 ++--- cmd/clef/tutorial.md | 16 +++---- cmd/ethkey/README.md | 12 ++--- ...{changepassphrase.go => changepassword.go} | 14 +++--- cmd/ethkey/main.go | 2 +- cmd/ethkey/message_test.go | 6 +-- cmd/ethkey/utils.go | 12 ++--- cmd/geth/accountcmd.go | 30 ++++++------ cmd/geth/accountcmd_test.go | 48 +++++++++---------- cmd/puppeth/wizard_faucet.go | 2 +- cmd/puppeth/wizard_node.go | 2 +- cmd/wnode/main.go | 2 +- console/bridge.go | 12 ++--- 19 files changed, 94 insertions(+), 94 deletions(-) rename cmd/ethkey/{changepassphrase.go => changepassword.go} (86%) diff --git a/accounts/errors.go b/accounts/errors.go index 40b21ed17..2fed35f9d 100644 --- a/accounts/errors.go +++ b/accounts/errors.go @@ -35,7 +35,7 @@ var ErrNotSupported = errors.New("not supported") // ErrInvalidPassphrase is returned when a decryption operation receives a bad // passphrase. -var ErrInvalidPassphrase = errors.New("invalid passphrase") +var ErrInvalidPassphrase = errors.New("invalid password") // ErrWalletAlreadyOpen is returned if a wallet is attempted to be opened the // second time. diff --git a/accounts/external/backend.go b/accounts/external/backend.go index 371273762..6089ca984 100644 --- a/accounts/external/backend.go +++ b/accounts/external/backend.go @@ -204,14 +204,14 @@ func (api *ExternalSigner) SignTx(account accounts.Account, tx *types.Transactio } func (api *ExternalSigner) SignTextWithPassphrase(account accounts.Account, passphrase string, text []byte) ([]byte, error) { - return []byte{}, fmt.Errorf("passphrase-operations not supported on external signers") + return []byte{}, fmt.Errorf("password-operations not supported on external signers") } func (api *ExternalSigner) SignTxWithPassphrase(account accounts.Account, passphrase string, tx *types.Transaction, chainID *big.Int) (*types.Transaction, error) { - return nil, fmt.Errorf("passphrase-operations not supported on external signers") + return nil, fmt.Errorf("password-operations not supported on external signers") } func (api *ExternalSigner) SignDataWithPassphrase(account accounts.Account, passphrase, mimeType string, data []byte) ([]byte, error) { - return nil, fmt.Errorf("passphrase-operations not supported on external signers") + return nil, fmt.Errorf("password-operations not supported on external signers") } func (api *ExternalSigner) listAccounts() ([]common.Address, error) { diff --git a/accounts/keystore/keystore.go b/accounts/keystore/keystore.go index 434e03504..5b55175b1 100644 --- a/accounts/keystore/keystore.go +++ b/accounts/keystore/keystore.go @@ -43,7 +43,7 @@ import ( var ( ErrLocked = accounts.NewAuthNeededError("password or unlock") ErrNoMatch = errors.New("no key for given address or file") - ErrDecrypt = errors.New("could not decrypt key with given passphrase") + ErrDecrypt = errors.New("could not decrypt key with given password") ) // KeyStoreType is the reflect type of a keystore backend. diff --git a/accounts/keystore/plain_test.go b/accounts/keystore/plain_test.go index 32852a0ad..b83192583 100644 --- a/accounts/keystore/plain_test.go +++ b/accounts/keystore/plain_test.go @@ -96,7 +96,7 @@ func TestKeyStorePassphraseDecryptionFail(t *testing.T) { t.Fatal(err) } if _, err = ks.GetKey(k1.Address, account.URL.Path, "bar"); err != ErrDecrypt { - t.Fatalf("wrong error for invalid passphrase\ngot %q\nwant %q", err, ErrDecrypt) + t.Fatalf("wrong error for invalid password\ngot %q\nwant %q", err, ErrDecrypt) } } diff --git a/accounts/keystore/testdata/keystore/README b/accounts/keystore/testdata/keystore/README index a5a86f964..6af9ac3f1 100644 --- a/accounts/keystore/testdata/keystore/README +++ b/accounts/keystore/testdata/keystore/README @@ -1,5 +1,5 @@ This directory contains accounts for testing. -The passphrase that unlocks them is "foobar". +The password that unlocks them is "foobar". The "good" key files which are supposed to be loadable are: diff --git a/cmd/clef/README.md b/cmd/clef/README.md index eeaee0908..89eb1e8c0 100644 --- a/cmd/clef/README.md +++ b/cmd/clef/README.md @@ -566,8 +566,8 @@ Response ### account_export #### Export account from keystore - Export a private key from the keystore. The exported private key is encrypted with the original passphrase. When the - key is imported later this passphrase is required. + Export a private key from the keystore. The exported private key is encrypted with the original password. When the + key is imported later this password is required. #### Arguments - account [address]: export private key that is associated with this account diff --git a/cmd/clef/main.go b/cmd/clef/main.go index 5567fb8f5..88d9eaaa5 100644 --- a/cmd/clef/main.go +++ b/cmd/clef/main.go @@ -335,7 +335,7 @@ func setCredential(ctx *cli.Context) error { utils.Fatalf("Invalid address specified: %s", addr) } address := common.HexToAddress(addr) - password := getPassPhrase("Please enter a passphrase to store for this address:", true) + password := getPassPhrase("Please enter a password to store for this address:", true) fmt.Println() stretchedKey, err := readMasterKey(ctx, nil) @@ -845,17 +845,17 @@ func testExternalUI(api *core.SignerAPI) { // TODO: there are many `getPassPhrase` functions, it will be better to abstract them into one. func getPassPhrase(prompt string, confirmation bool) string { fmt.Println(prompt) - password, err := console.Stdin.PromptPassword("Passphrase: ") + password, err := console.Stdin.PromptPassword("Password: ") if err != nil { - utils.Fatalf("Failed to read passphrase: %v", err) + utils.Fatalf("Failed to read password: %v", err) } if confirmation { - confirm, err := console.Stdin.PromptPassword("Repeat passphrase: ") + confirm, err := console.Stdin.PromptPassword("Repeat password: ") if err != nil { - utils.Fatalf("Failed to read passphrase confirmation: %v", err) + utils.Fatalf("Failed to read password confirmation: %v", err) } if password != confirm { - utils.Fatalf("Passphrases do not match") + utils.Fatalf("Passwords do not match") } } return password diff --git a/cmd/clef/tutorial.md b/cmd/clef/tutorial.md index 422946dbd..2fc8b1698 100644 --- a/cmd/clef/tutorial.md +++ b/cmd/clef/tutorial.md @@ -22,8 +22,8 @@ Enter 'ok' to proceed: The master seed of clef will be locked with a password. Please specify a password. Do not forget this password! -Passphrase: -Repeat passphrase: +Password: +Repeat password: A master seed has been generated into /home/martin/.clef/masterseed.json @@ -124,7 +124,7 @@ $ sha256sum rules.js $ clef attest 645b58e4f945e24d0221714ff29f6aa8e860382ced43490529db1695f5fcc71c Decrypt master seed of clef -Passphrase: +Password: INFO [07-01|13:25:03.290] Ruleset attestation updated sha256=645b58e4f945e24d0221714ff29f6aa8e860382ced43490529db1695f5fcc71c ``` @@ -193,12 +193,12 @@ In order to make more useful rules - like signing transactions - the signer need ```text $ clef setpw 0xd9c9cd5f6779558b6e0ed4e6acf6b1947e7fa1f3 -Please enter a passphrase to store for this address: -Passphrase: -Repeat passphrase: +Please enter a password to store for this address: +Password: +Repeat password: Decrypt master seed of clef -Passphrase: +Passpword: INFO [07-01|14:05:56.031] Credential store updated key=0xd9c9cd5f6779558b6e0ed4e6acf6b1947e7fa1f3 ``` @@ -237,7 +237,7 @@ f163a1738b649259bb9b369c593fdc4c6b6f86cc87e343c3ba58faee03c2a178 rules.js $ clef attest f163a1738b649259bb9b369c593fdc4c6b6f86cc87e343c3ba58faee03c2a178 Decrypt master seed of clef -Passphrase: +Password: INFO [07-01|14:11:28.509] Ruleset attestation updated sha256=f163a1738b649259bb9b369c593fdc4c6b6f86cc87e343c3ba58faee03c2a178 ``` diff --git a/cmd/ethkey/README.md b/cmd/ethkey/README.md index 48d3c9e9b..bfddd1467 100644 --- a/cmd/ethkey/README.md +++ b/cmd/ethkey/README.md @@ -35,18 +35,18 @@ It is possible to refer to a file containing the message. To sign a message contained in a file, use the --msgfile flag. -### `ethkey changepassphrase ` +### `ethkey changepassword ` -Change the passphrase of a keyfile. +Change the password of a keyfile. use the `--newpasswordfile` to point to the new password file. -## Passphrases +## Passwords For every command that uses a keyfile, you will be prompted to provide the -passphrase for decrypting the keyfile. To avoid this message, it is possible -to pass the passphrase by using the `--passwordfile` flag pointing to a file that -contains the passphrase. +password for decrypting the keyfile. To avoid this message, it is possible +to pass the password by using the `--passwordfile` flag pointing to a file that +contains the password. ## JSON diff --git a/cmd/ethkey/changepassphrase.go b/cmd/ethkey/changepassword.go similarity index 86% rename from cmd/ethkey/changepassphrase.go rename to cmd/ethkey/changepassword.go index 5d8e8af64..5689c2661 100644 --- a/cmd/ethkey/changepassphrase.go +++ b/cmd/ethkey/changepassword.go @@ -28,15 +28,15 @@ import ( var newPassphraseFlag = cli.StringFlag{ Name: "newpasswordfile", - Usage: "the file that contains the new passphrase for the keyfile", + Usage: "the file that contains the new password for the keyfile", } var commandChangePassphrase = cli.Command{ - Name: "changepassphrase", - Usage: "change the passphrase on a keyfile", + Name: "changepassword", + Usage: "change the password on a keyfile", ArgsUsage: "", Description: ` -Change the passphrase of a keyfile.`, +Change the password of a keyfile.`, Flags: []cli.Flag{ passphraseFlag, newPassphraseFlag, @@ -58,12 +58,12 @@ Change the passphrase of a keyfile.`, } // Get a new passphrase. - fmt.Println("Please provide a new passphrase") + fmt.Println("Please provide a new password") var newPhrase string if passFile := ctx.String(newPassphraseFlag.Name); passFile != "" { content, err := ioutil.ReadFile(passFile) if err != nil { - utils.Fatalf("Failed to read new passphrase file '%s': %v", passFile, err) + utils.Fatalf("Failed to read new password file '%s': %v", passFile, err) } newPhrase = strings.TrimRight(string(content), "\r\n") } else { @@ -73,7 +73,7 @@ Change the passphrase of a keyfile.`, // Encrypt the key with the new passphrase. newJson, err := keystore.EncryptKey(key, newPhrase, keystore.StandardScryptN, keystore.StandardScryptP) if err != nil { - utils.Fatalf("Error encrypting with new passphrase: %v", err) + utils.Fatalf("Error encrypting with new password: %v", err) } // Then write the new keyfile in place of the old one. diff --git a/cmd/ethkey/main.go b/cmd/ethkey/main.go index a8399ad7c..5b545d5f9 100644 --- a/cmd/ethkey/main.go +++ b/cmd/ethkey/main.go @@ -49,7 +49,7 @@ func init() { var ( passphraseFlag = cli.StringFlag{ Name: "passwordfile", - Usage: "the file that contains the passphrase for the keyfile", + Usage: "the file that contains the password for the keyfile", } jsonFlag = cli.BoolFlag{ Name: "json", diff --git a/cmd/ethkey/message_test.go b/cmd/ethkey/message_test.go index 39352b1d2..e9e8eeeaf 100644 --- a/cmd/ethkey/message_test.go +++ b/cmd/ethkey/message_test.go @@ -37,8 +37,8 @@ func TestMessageSignVerify(t *testing.T) { generate := runEthkey(t, "generate", keyfile) generate.Expect(` !! Unsupported terminal, password will be echoed. -Passphrase: {{.InputLine "foobar"}} -Repeat passphrase: {{.InputLine "foobar"}} +Password: {{.InputLine "foobar"}} +Repeat password: {{.InputLine "foobar"}} `) _, matches := generate.ExpectRegexp(`Address: (0x[0-9a-fA-F]{40})\n`) address := matches[1] @@ -48,7 +48,7 @@ Repeat passphrase: {{.InputLine "foobar"}} sign := runEthkey(t, "signmessage", keyfile, message) sign.Expect(` !! Unsupported terminal, password will be echoed. -Passphrase: {{.InputLine "foobar"}} +Password: {{.InputLine "foobar"}} `) _, matches = sign.ExpectRegexp(`Signature: ([0-9a-f]+)\n`) signature := matches[1] diff --git a/cmd/ethkey/utils.go b/cmd/ethkey/utils.go index 6f60ebaf1..c6cf5c25a 100644 --- a/cmd/ethkey/utils.go +++ b/cmd/ethkey/utils.go @@ -31,18 +31,18 @@ import ( // promptPassphrase prompts the user for a passphrase. Set confirmation to true // to require the user to confirm the passphrase. func promptPassphrase(confirmation bool) string { - passphrase, err := console.Stdin.PromptPassword("Passphrase: ") + passphrase, err := console.Stdin.PromptPassword("Password: ") if err != nil { - utils.Fatalf("Failed to read passphrase: %v", err) + utils.Fatalf("Failed to read password: %v", err) } if confirmation { - confirm, err := console.Stdin.PromptPassword("Repeat passphrase: ") + confirm, err := console.Stdin.PromptPassword("Repeat password: ") if err != nil { - utils.Fatalf("Failed to read passphrase confirmation: %v", err) + utils.Fatalf("Failed to read password confirmation: %v", err) } if passphrase != confirm { - utils.Fatalf("Passphrases do not match") + utils.Fatalf("Passwords do not match") } } @@ -58,7 +58,7 @@ func getPassphrase(ctx *cli.Context) string { if passphraseFile != "" { content, err := ioutil.ReadFile(passphraseFile) if err != nil { - utils.Fatalf("Failed to read passphrase file '%s': %v", + utils.Fatalf("Failed to read password file '%s': %v", passphraseFile, err) } return strings.TrimRight(string(content), "\r\n") diff --git a/cmd/geth/accountcmd.go b/cmd/geth/accountcmd.go index 8fd149cac..bf0e58318 100644 --- a/cmd/geth/accountcmd.go +++ b/cmd/geth/accountcmd.go @@ -116,11 +116,11 @@ Print a short summary of all accounts`, Creates a new account and prints the address. -The account is saved in encrypted format, you are prompted for a passphrase. +The account is saved in encrypted format, you are prompted for a password. -You must remember this passphrase to unlock your account in the future. +You must remember this password to unlock your account in the future. -For non-interactive use the passphrase can be specified with the --password flag: +For non-interactive use the password can be specified with the --password flag: Note, this is meant to be used for testing only, it is a bad idea to save your password to file or expose in any other way. @@ -142,12 +142,12 @@ password to file or expose in any other way. Update an existing account. The account is saved in the newest version in encrypted format, you are prompted -for a passphrase to unlock the account and another to save the updated file. +for a password to unlock the account and another to save the updated file. This same command can therefore be used to migrate an account of a deprecated format to the newest format or change the password for an account. -For non-interactive use the passphrase can be specified with the --password flag: +For non-interactive use the password can be specified with the --password flag: geth account update [options]
@@ -174,11 +174,11 @@ Prints the address. The keyfile is assumed to contain an unencrypted private key in hexadecimal format. -The account is saved in encrypted format, you are prompted for a passphrase. +The account is saved in encrypted format, you are prompted for a password. -You must remember this passphrase to unlock your account in the future. +You must remember this password to unlock your account in the future. -For non-interactive use the passphrase can be specified with the -password flag: +For non-interactive use the password can be specified with the -password flag: geth account import [options] @@ -247,17 +247,17 @@ func getPassPhrase(prompt string, confirmation bool, i int, passwords []string) if prompt != "" { fmt.Println(prompt) } - password, err := console.Stdin.PromptPassword("Passphrase: ") + password, err := console.Stdin.PromptPassword("Password: ") if err != nil { - utils.Fatalf("Failed to read passphrase: %v", err) + utils.Fatalf("Failed to read password: %v", err) } if confirmation { - confirm, err := console.Stdin.PromptPassword("Repeat passphrase: ") + confirm, err := console.Stdin.PromptPassword("Repeat password: ") if err != nil { - utils.Fatalf("Failed to read passphrase confirmation: %v", err) + utils.Fatalf("Failed to read password confirmation: %v", err) } if password != confirm { - utils.Fatalf("Passphrases do not match") + utils.Fatalf("Passwords do not match") } } return password @@ -268,7 +268,7 @@ func ambiguousAddrRecovery(ks *keystore.KeyStore, err *keystore.AmbiguousAddrErr for _, a := range err.Matches { fmt.Println(" ", a.URL) } - fmt.Println("Testing your passphrase against all of them...") + fmt.Println("Testing your password against all of them...") var match *accounts.Account for _, a := range err.Matches { if err := ks.Unlock(a, auth); err == nil { @@ -279,7 +279,7 @@ func ambiguousAddrRecovery(ks *keystore.KeyStore, err *keystore.AmbiguousAddrErr if match == nil { utils.Fatalf("None of the listed files could be unlocked.") } - fmt.Printf("Your passphrase unlocked %s\n", match.URL) + fmt.Printf("Your password unlocked %s\n", match.URL) fmt.Println("In order to avoid this warning, you need to remove the following duplicate key files:") for _, a := range err.Matches { if a != *match { diff --git a/cmd/geth/accountcmd_test.go b/cmd/geth/accountcmd_test.go index 6c97f0ddc..186db3c6b 100644 --- a/cmd/geth/accountcmd_test.go +++ b/cmd/geth/accountcmd_test.go @@ -72,8 +72,8 @@ func TestAccountNew(t *testing.T) { geth.Expect(` Your new account is locked with a password. Please give a password. Do not forget this password. !! Unsupported terminal, password will be echoed. -Passphrase: {{.InputLine "foobar"}} -Repeat passphrase: {{.InputLine "foobar"}} +Password: {{.InputLine "foobar"}} +Repeat password: {{.InputLine "foobar"}} Your new key was generated `) @@ -94,9 +94,9 @@ func TestAccountNewBadRepeat(t *testing.T) { geth.Expect(` Your new account is locked with a password. Please give a password. Do not forget this password. !! Unsupported terminal, password will be echoed. -Passphrase: {{.InputLine "something"}} -Repeat passphrase: {{.InputLine "something else"}} -Fatal: Passphrases do not match +Password: {{.InputLine "something"}} +Repeat password: {{.InputLine "something else"}} +Fatal: Passwords do not match `) } @@ -109,10 +109,10 @@ func TestAccountUpdate(t *testing.T) { geth.Expect(` Unlocking account f466859ead1932d743d622cb74fc058882e8648a | Attempt 1/3 !! Unsupported terminal, password will be echoed. -Passphrase: {{.InputLine "foobar"}} +Password: {{.InputLine "foobar"}} Please give a new password. Do not forget this password. -Passphrase: {{.InputLine "foobar2"}} -Repeat passphrase: {{.InputLine "foobar2"}} +Password: {{.InputLine "foobar2"}} +Repeat password: {{.InputLine "foobar2"}} `) } @@ -121,7 +121,7 @@ func TestWalletImport(t *testing.T) { defer geth.ExpectExit() geth.Expect(` !! Unsupported terminal, password will be echoed. -Passphrase: {{.InputLine "foo"}} +Password: {{.InputLine "foo"}} Address: {d4584b5f6229b7be90727b0fc8c6b91bb427821f} `) @@ -136,8 +136,8 @@ func TestWalletImportBadPassword(t *testing.T) { defer geth.ExpectExit() geth.Expect(` !! Unsupported terminal, password will be echoed. -Passphrase: {{.InputLine "wrong"}} -Fatal: could not decrypt key with given passphrase +Password: {{.InputLine "wrong"}} +Fatal: could not decrypt key with given password `) } @@ -150,7 +150,7 @@ func TestUnlockFlag(t *testing.T) { geth.Expect(` Unlocking account f466859ead1932d743d622cb74fc058882e8648a | Attempt 1/3 !! Unsupported terminal, password will be echoed. -Passphrase: {{.InputLine "foobar"}} +Password: {{.InputLine "foobar"}} `) geth.ExpectExit() @@ -174,12 +174,12 @@ func TestUnlockFlagWrongPassword(t *testing.T) { geth.Expect(` Unlocking account f466859ead1932d743d622cb74fc058882e8648a | Attempt 1/3 !! Unsupported terminal, password will be echoed. -Passphrase: {{.InputLine "wrong1"}} +Password: {{.InputLine "wrong1"}} Unlocking account f466859ead1932d743d622cb74fc058882e8648a | Attempt 2/3 -Passphrase: {{.InputLine "wrong2"}} +Password: {{.InputLine "wrong2"}} Unlocking account f466859ead1932d743d622cb74fc058882e8648a | Attempt 3/3 -Passphrase: {{.InputLine "wrong3"}} -Fatal: Failed to unlock account f466859ead1932d743d622cb74fc058882e8648a (could not decrypt key with given passphrase) +Password: {{.InputLine "wrong3"}} +Fatal: Failed to unlock account f466859ead1932d743d622cb74fc058882e8648a (could not decrypt key with given password) `) } @@ -193,9 +193,9 @@ func TestUnlockFlagMultiIndex(t *testing.T) { geth.Expect(` Unlocking account 0 | Attempt 1/3 !! Unsupported terminal, password will be echoed. -Passphrase: {{.InputLine "foobar"}} +Password: {{.InputLine "foobar"}} Unlocking account 2 | Attempt 1/3 -Passphrase: {{.InputLine "foobar"}} +Password: {{.InputLine "foobar"}} `) geth.ExpectExit() @@ -238,7 +238,7 @@ func TestUnlockFlagPasswordFileWrongPassword(t *testing.T) { "--password", "testdata/wrong-passwords.txt", "--unlock", "0,2") defer geth.ExpectExit() geth.Expect(` -Fatal: Failed to unlock account 0 (could not decrypt key with given passphrase) +Fatal: Failed to unlock account 0 (could not decrypt key with given password) `) } @@ -258,12 +258,12 @@ func TestUnlockFlagAmbiguous(t *testing.T) { geth.Expect(` Unlocking account f466859ead1932d743d622cb74fc058882e8648a | Attempt 1/3 !! Unsupported terminal, password will be echoed. -Passphrase: {{.InputLine "foobar"}} +Password: {{.InputLine "foobar"}} Multiple key files exist for address f466859ead1932d743d622cb74fc058882e8648a: keystore://{{keypath "1"}} keystore://{{keypath "2"}} -Testing your passphrase against all of them... -Your passphrase unlocked keystore://{{keypath "1"}} +Testing your password against all of them... +Your password unlocked keystore://{{keypath "1"}} In order to avoid this warning, you need to remove the following duplicate key files: keystore://{{keypath "2"}} `) @@ -295,11 +295,11 @@ func TestUnlockFlagAmbiguousWrongPassword(t *testing.T) { geth.Expect(` Unlocking account f466859ead1932d743d622cb74fc058882e8648a | Attempt 1/3 !! Unsupported terminal, password will be echoed. -Passphrase: {{.InputLine "wrong"}} +Password: {{.InputLine "wrong"}} Multiple key files exist for address f466859ead1932d743d622cb74fc058882e8648a: keystore://{{keypath "1"}} keystore://{{keypath "2"}} -Testing your passphrase against all of them... +Testing your password against all of them... Fatal: None of the listed files could be unlocked. `) geth.ExpectExit() diff --git a/cmd/puppeth/wizard_faucet.go b/cmd/puppeth/wizard_faucet.go index 9068c1d30..9f753ad68 100644 --- a/cmd/puppeth/wizard_faucet.go +++ b/cmd/puppeth/wizard_faucet.go @@ -147,7 +147,7 @@ func (w *wizard) deployFaucet() { infos.node.keyPass = w.readPassword() if _, err := keystore.DecryptKey([]byte(infos.node.keyJSON), infos.node.keyPass); err != nil { - log.Error("Failed to decrypt key with given passphrase") + log.Error("Failed to decrypt key with given password") infos.node.keyJSON = "" infos.node.keyPass = "" } diff --git a/cmd/puppeth/wizard_node.go b/cmd/puppeth/wizard_node.go index e37297f6d..2bae33214 100644 --- a/cmd/puppeth/wizard_node.go +++ b/cmd/puppeth/wizard_node.go @@ -142,7 +142,7 @@ func (w *wizard) deployNode(boot bool) { infos.keyPass = w.readPassword() if _, err := keystore.DecryptKey([]byte(infos.keyJSON), infos.keyPass); err != nil { - log.Error("Failed to decrypt key with given passphrase") + log.Error("Failed to decrypt key with given password") return } } diff --git a/cmd/wnode/main.go b/cmd/wnode/main.go index 99cf84ec1..49736d732 100644 --- a/cmd/wnode/main.go +++ b/cmd/wnode/main.go @@ -356,7 +356,7 @@ func configureNode() { if len(symPass) == 0 { symPass, err = console.Stdin.PromptPassword("Please enter the password for symmetric encryption: ") if err != nil { - utils.Fatalf("Failed to read passphrase: %v", err) + utils.Fatalf("Failed to read password: %v", err) } } diff --git a/console/bridge.go b/console/bridge.go index bb14abca2..c7a67a685 100644 --- a/console/bridge.go +++ b/console/bridge.go @@ -59,14 +59,14 @@ func (b *bridge) NewAccount(call otto.FunctionCall) (response otto.Value) { switch { // No password was specified, prompt the user for it case len(call.ArgumentList) == 0: - if password, err = b.prompter.PromptPassword("Passphrase: "); err != nil { + if password, err = b.prompter.PromptPassword("Password: "); err != nil { throwJSException(err.Error()) } - if confirm, err = b.prompter.PromptPassword("Repeat passphrase: "); err != nil { + if confirm, err = b.prompter.PromptPassword("Repeat password: "); err != nil { throwJSException(err.Error()) } if password != confirm { - throwJSException("passphrases don't match!") + throwJSException("passwords don't match!") } // A single string password was specified, use that @@ -180,7 +180,7 @@ func (b *bridge) OpenWallet(call otto.FunctionCall) (response otto.Value) { func (b *bridge) readPassphraseAndReopenWallet(call otto.FunctionCall) (otto.Value, error) { var passwd otto.Value wallet := call.Argument(0) - if input, err := b.prompter.PromptPassword("Please enter your passphrase: "); err != nil { + if input, err := b.prompter.PromptPassword("Please enter your password: "); err != nil { throwJSException(err.Error()) } else { passwd, _ = otto.ToValue(input) @@ -223,7 +223,7 @@ func (b *bridge) UnlockAccount(call otto.FunctionCall) (response otto.Value) { if call.Argument(1).IsUndefined() || call.Argument(1).IsNull() { fmt.Fprintf(b.printer, "Unlock account %s\n", account) - if input, err := b.prompter.PromptPassword("Passphrase: "); err != nil { + if input, err := b.prompter.PromptPassword("Password: "); err != nil { throwJSException(err.Error()) } else { passwd, _ = otto.ToValue(input) @@ -270,7 +270,7 @@ func (b *bridge) Sign(call otto.FunctionCall) (response otto.Value) { // if the password is not given or null ask the user and ensure password is a string if passwd.IsUndefined() || passwd.IsNull() { fmt.Fprintf(b.printer, "Give password for account %s\n", account) - if input, err := b.prompter.PromptPassword("Passphrase: "); err != nil { + if input, err := b.prompter.PromptPassword("Password: "); err != nil { throwJSException(err.Error()) } else { passwd, _ = otto.ToValue(input)