diff options
| -rw-r--r-- | common/bytes.go | 12 | ||||
| -rw-r--r-- | crypto/crypto.go | 11 |
2 files changed, 9 insertions, 14 deletions
diff --git a/common/bytes.go b/common/bytes.go index ba180ac94..5bdacd810 100644 --- a/common/bytes.go +++ b/common/bytes.go @@ -147,18 +147,6 @@ func Hex2Bytes(str string) []byte { return h } -func HexBytes2Bytes(d []byte) []byte { - r := make([]byte, hex.DecodedLen(len(d))) - hex.Decode(r, d) - return r -} - -func Bytes2HexBytes(d []byte) []byte { - r := make([]byte, hex.EncodedLen(len(d))) - hex.Encode(r, d) - return r -} - func StringToByteFunc(str string, cb func(str string) []byte) (ret []byte) { if len(str) > 1 && str[0:2] == "0x" && !strings.Contains(str, "\n") { ret = Hex2Bytes(str[2:]) diff --git a/crypto/crypto.go b/crypto/crypto.go index 6e3ffbd4a..9865c87c4 100644 --- a/crypto/crypto.go +++ b/crypto/crypto.go @@ -130,13 +130,20 @@ func LoadECDSA(file string) (*ecdsa.PrivateKey, error) { if _, err := io.ReadFull(fd, buf); err != nil { return nil, err } - return ToECDSA(common.HexBytes2Bytes(buf)), nil + + key, err := hex.DecodeString(string(buf)) + if err != nil { + return nil, err + } + + return ToECDSA(key), nil } // SaveECDSA saves a secp256k1 private key to the given file with restrictive // permissions func SaveECDSA(file string, key *ecdsa.PrivateKey) error { - return ioutil.WriteFile(file, common.Bytes2HexBytes(FromECDSA(key)), 0600) + k := hex.EncodeToString(FromECDSA(key)) + return ioutil.WriteFile(file, []byte(k), 0600) } func GenerateKey() (*ecdsa.PrivateKey, error) { |