Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

crypto: improve error messages in LoadECDSA #20718

Merged
merged 12 commits into from
Apr 8, 2020
Merged

crypto: improve error messages in LoadECDSA #20718

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f39afd5
Specific error message when the private key to be imported is too short
adamschmideg Feb 26, 2020
0a22d23
Use fmt.Errorf
adamschmideg Feb 26, 2020
745f0fd
goimports fix
adamschmideg Feb 26, 2020
ae3c77b
Check file size before reading it into memory
adamschmideg Mar 3, 2020
a66d88e
Improve wording of error message
adamschmideg Mar 3, 2020
fe0bc49
Allow newline after account
adamschmideg Mar 4, 2020
3db06e4
More idiomatic way to check for trailing whitespace
adamschmideg Mar 4, 2020
969c671
Use canonical table-driven test format
adamschmideg Mar 17, 2020
3d3d5bb
Formatting, oh my
adamschmideg Mar 17, 2020
b4916e6
Use string literals, no magic
adamschmideg Mar 17, 2020
b68c0f5
crypto: improve LoadECDSA
fjl Apr 7, 2020
0d574ee
cmd/geth: simplify TestAccountImport
fjl Apr 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 44 additions & 0 deletions cmd/geth/accountcmd_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,50 @@ Path of the secret key file: .*UTC--.+--[0-9a-f]{40}
`)
}

func hexadecimal(count int) string {
chars := "0123456789abcdef"
var sb strings.Builder
for i := 0; i < count; i++ {
c := string(chars[i%len(chars)])
sb.WriteString(c)
}
return sb.String()
}

func TestAccountImport(t *testing.T) {
dir := tmpdir(t)
keyfile := filepath.Join(dir, "key.prv")
key := hexadecimal(64)
if err := ioutil.WriteFile(keyfile, []byte(key), 0644); err != nil {
t.Error(err)
}
geth := runGeth(t, "account", "import", keyfile)
defer geth.ExpectExit()
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.
Password: {{.InputLine "foobar"}}
Repeat password: {{.InputLine "foobar"}}
`)
geth.ExpectRegexp(`
Address: {[0-9a-f]{40}}
`)
}

func TestAccountImportTooShort(t *testing.T) {
dir := tmpdir(t)
keyfile := filepath.Join(dir, "key.prv")
key := hexadecimal(40)
if err := ioutil.WriteFile(keyfile, []byte(key), 0644); err != nil {
t.Error(err)
}
geth := runGeth(t, "account", "import", keyfile)
defer geth.ExpectExit()
geth.Expect(`
Fatal: Failed to load the private key: expected 64 hexa characters, got 40
`)
}

func TestAccountNewBadRepeat(t *testing.T) {
geth := runGeth(t, "account", "new", "--lightkdf")
defer geth.ExpectExit()
Expand Down
10 changes: 3 additions & 7 deletions crypto/crypto.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,8 @@ import (
"encoding/hex"
"errors"
"fmt"
"io"
"io/ioutil"
"math/big"
"os"

"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/math"
Expand Down Expand Up @@ -166,14 +164,12 @@ func HexToECDSA(hexkey string) (*ecdsa.PrivateKey, error) {

// LoadECDSA loads a secp256k1 private key from the given file.
func LoadECDSA(file string) (*ecdsa.PrivateKey, error) {
buf := make([]byte, 64)
fd, err := os.Open(file)
buf, err := ioutil.ReadFile(file)
if err != nil {
return nil, err
}
defer fd.Close()
if _, err := io.ReadFull(fd, buf); err != nil {
return nil, err
if len(buf) != 64 {
return nil, fmt.Errorf("expected 64 hexa characters, got %v", len(buf))
}

key, err := hex.DecodeString(string(buf))
Expand Down