From 6151ae7db5251436e9ece190eb3569d4aa882671 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Tue, 1 Jul 2014 20:08:32 +0200
Subject: Fixed key import for empty entries

---
 ethcrypto/keyring.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ethcrypto/keyring.go b/ethcrypto/keyring.go
index 277fa2134..d3399d13d 100644
--- a/ethcrypto/keyring.go
+++ b/ethcrypto/keyring.go
@@ -74,8 +74,12 @@ func NewKeyRingFromString(content string) (*KeyRing, error) {
 		} else if len(words) != 1 {
 			return nil, fmt.Errorf("Unrecognised key format")
 		}
-		secrets = append(secrets, ethutil.Hex2Bytes(secret))
+
+		if len(secret) != 0 {
+			secrets = append(secrets, ethutil.Hex2Bytes(secret))
+		}
 	}
+
 	return NewKeyRingFromSecrets(secrets)
 }
 
-- 
cgit v1.2.3