From 1f8290ca44df31cc4c4b68b30eef412476ed24e0 Mon Sep 17 00:00:00 2001
From: Gustav Simonsson <gustav.simonsson@gmail.com>
Date: Tue, 20 Jan 2015 23:55:13 +0100
Subject: Add ImportPreSaleKey

* ImportPreSaleKey takes a KeyStore, a presale key JSON (e.g. file content)
  and a password string. It stores the key in the given key store.
* Refactored common AES decryption and moved some functions to crypto.go
---
 crypto/key.go | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'crypto/key.go')

diff --git a/crypto/key.go b/crypto/key.go
index d371ad4dc..ca29b691f 100644
--- a/crypto/key.go
+++ b/crypto/key.go
@@ -57,7 +57,7 @@ type encryptedKeyJSON struct {
 
 func (k *Key) Address() []byte {
 	pubBytes := FromECDSAPub(&k.PrivateKey.PublicKey)
-	return Sha3(pubBytes)[12:]
+	return Sha3(pubBytes[1:])[12:]
 }
 
 func (k *Key) MarshalJSON() (j []byte, err error) {
@@ -99,9 +99,10 @@ func NewKey(rand io.Reader) *Key {
 	privateKeyMarshalled := elliptic.Marshal(S256(), x, y)
 	privateKeyECDSA := ToECDSA(privateKeyMarshalled)
 
-	key := new(Key)
 	id := uuid.NewRandom()
-	key.Id = &id
-	key.PrivateKey = privateKeyECDSA
+	key := &Key{
+		Id:         &id,
+		PrivateKey: privateKeyECDSA,
+	}
 	return key
 }
-- 
cgit v1.2.3