c4ea921876
- cli: add passwordfile flag - cli: change unlock flag only takes account - cli: with unlock you are prompted for password or use passfile with password flag - cli: unlockAccount used in normal client start (run) and accountExport - cli: getPassword used in accountCreate and accountImport - accounts: Manager.Import, Manager.Export - crypto: SaveECDSA (to complement LoadECDSA) to save to file - crypto: NewKeyFromECDSA added (used in accountImport and New = generated constructor)
112 lines
2.5 KiB
Go
112 lines
2.5 KiB
Go
/*
|
|
This file is part of go-ethereum
|
|
|
|
go-ethereum is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU Lesser General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
go-ethereum is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public License
|
|
along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
/**
|
|
* @authors
|
|
* Gustav Simonsson <gustav.simonsson@gmail.com>
|
|
* @date 2015
|
|
*
|
|
*/
|
|
|
|
package crypto
|
|
|
|
import (
|
|
"bytes"
|
|
"crypto/ecdsa"
|
|
"encoding/json"
|
|
"io"
|
|
|
|
"code.google.com/p/go-uuid/uuid"
|
|
)
|
|
|
|
type Key struct {
|
|
Id uuid.UUID // Version 4 "random" for unique id not derived from key data
|
|
// to simplify lookups we also store the address
|
|
Address []byte
|
|
// we only store privkey as pubkey/address can be derived from it
|
|
// privkey in this struct is always in plaintext
|
|
PrivateKey *ecdsa.PrivateKey
|
|
}
|
|
|
|
type plainKeyJSON struct {
|
|
Id []byte
|
|
Address []byte
|
|
PrivateKey []byte
|
|
}
|
|
|
|
type cipherJSON struct {
|
|
Salt []byte
|
|
IV []byte
|
|
CipherText []byte
|
|
}
|
|
|
|
type encryptedKeyJSON struct {
|
|
Id []byte
|
|
Address []byte
|
|
Crypto cipherJSON
|
|
}
|
|
|
|
func (k *Key) MarshalJSON() (j []byte, err error) {
|
|
jStruct := plainKeyJSON{
|
|
k.Id,
|
|
k.Address,
|
|
FromECDSA(k.PrivateKey),
|
|
}
|
|
j, err = json.Marshal(jStruct)
|
|
return j, err
|
|
}
|
|
|
|
func (k *Key) UnmarshalJSON(j []byte) (err error) {
|
|
keyJSON := new(plainKeyJSON)
|
|
err = json.Unmarshal(j, &keyJSON)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
u := new(uuid.UUID)
|
|
*u = keyJSON.Id
|
|
k.Id = *u
|
|
k.Address = keyJSON.Address
|
|
k.PrivateKey = ToECDSA(keyJSON.PrivateKey)
|
|
|
|
return err
|
|
}
|
|
|
|
func NewKeyFromECDSA(privateKeyECDSA *ecdsa.PrivateKey) *Key {
|
|
id := uuid.NewRandom()
|
|
key := &Key{
|
|
Id: id,
|
|
Address: PubkeyToAddress(privateKeyECDSA.PublicKey),
|
|
PrivateKey: privateKeyECDSA,
|
|
}
|
|
return key
|
|
}
|
|
|
|
func NewKey(rand io.Reader) *Key {
|
|
randBytes := make([]byte, 64)
|
|
_, err := rand.Read(randBytes)
|
|
if err != nil {
|
|
panic("key generation: could not read from random source: " + err.Error())
|
|
}
|
|
reader := bytes.NewReader(randBytes)
|
|
privateKeyECDSA, err := ecdsa.GenerateKey(S256(), reader)
|
|
if err != nil {
|
|
panic("key generation: ecdsa.GenerateKey failed: " + err.Error())
|
|
}
|
|
|
|
return NewKeyFromECDSA(privateKeyECDSA)
|
|
}
|