Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions accounts/keystore/keystore.go
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,15 @@ func (ks *KeyStore) Import(keyJSON []byte, passphrase, newPassphrase string) (ac
return ks.importKey(key, newPassphrase)
}

// ExportECDSA exports as an unencrypted key.
func (ks *KeyStore) ExportECDSA(a accounts.Account, passphrase string) (priv *ecdsa.PrivateKey, err error) {
_, key, err := ks.getDecryptedKey(a, passphrase)
if err != nil {
return nil, err
}
return key.PrivateKey, nil
}

// ImportECDSA stores the given key into the key directory, encrypting it with the passphrase.
func (ks *KeyStore) ImportECDSA(priv *ecdsa.PrivateKey, passphrase string) (accounts.Account, error) {
key := newKeyFromECDSA(priv)
Expand Down
11 changes: 10 additions & 1 deletion mobile/accounts.go
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,15 @@ func (ks *KeyStore) ExportKey(account *Account, passphrase, newPassphrase string
return ks.keystore.Export(account.account, passphrase, newPassphrase)
}

// ExportECDSA exports as an unencrypted key.
func (ks *KeyStore) ExportECDSAKey(account *Account, passphrase string) (key []byte, _ error) {
priv, err := ks.keystore.ExportECDSA(account.account, passphrase)
if err != nil {
return nil, err
}
return crypto.FromECDSA(priv), nil
}

// ImportKey stores the given encrypted JSON key into the key directory.
func (ks *KeyStore) ImportKey(keyJSON []byte, passphrase, newPassphrase string) (account *Account, _ error) {
acc, err := ks.keystore.Import(common.CopyBytes(keyJSON), passphrase, newPassphrase)
Expand All @@ -197,7 +206,7 @@ func (ks *KeyStore) ImportKey(keyJSON []byte, passphrase, newPassphrase string)
return &Account{acc}, nil
}

// ImportECDSAKey stores the given encrypted JSON key into the key directory.
// ImportECDSAKey stores the given key into the key directory, encrypting it with the passphrase.
func (ks *KeyStore) ImportECDSAKey(key []byte, passphrase string) (account *Account, _ error) {
privkey, err := crypto.ToECDSA(common.CopyBytes(key))
if err != nil {
Expand Down