diff options
| author | obscuren <geffobscura@gmail.com> | 2015-04-09 19:24:08 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-04-09 19:24:08 +0800 |
| commit | c6b25a40464edcb3de992f016bcaef59bb75fa7e (patch) | |
| tree | 46e2af5e39f5f29e039768c1e95617979db60706 /cmd/geth | |
| parent | 8d059e54f1cac3cb7a44d9eb62336c514156b8d3 (diff) | |
| parent | 558683d10cb059a55b181d94d82c2c7292f96680 (diff) | |
| download | dexon-c6b25a40464edcb3de992f016bcaef59bb75fa7e.tar dexon-c6b25a40464edcb3de992f016bcaef59bb75fa7e.tar.gz dexon-c6b25a40464edcb3de992f016bcaef59bb75fa7e.tar.bz2 dexon-c6b25a40464edcb3de992f016bcaef59bb75fa7e.tar.lz dexon-c6b25a40464edcb3de992f016bcaef59bb75fa7e.tar.xz dexon-c6b25a40464edcb3de992f016bcaef59bb75fa7e.tar.zst dexon-c6b25a40464edcb3de992f016bcaef59bb75fa7e.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Diffstat (limited to 'cmd/geth')
| -rw-r--r-- | cmd/geth/main.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 9437f8eb4..02964dadf 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -149,8 +149,7 @@ password to file or expose in any other way. Imports an unencrypted private key from <keyfile> and creates a new account. Prints the address. -The keyfile is assumed to contain an unencrypted private key in canonical EC -raw bytes format. +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. |