Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
whqwjb
go-ethereum
提交
cda91ee1
G
go-ethereum
项目概览
whqwjb
/
go-ethereum
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
go-ethereum
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
cda91ee1
编写于
2月 16, 2016
作者:
P
Péter Szilágyi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
crypto: expose key decryption method to parse a string direclty
上级
66b148dd
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
45 addition
and
36 deletion
+45
-36
crypto/key_store_passphrase.go
crypto/key_store_passphrase.go
+37
-26
crypto/key_store_plain.go
crypto/key_store_plain.go
+8
-10
未找到文件。
crypto/key_store_passphrase.go
浏览文件 @
cda91ee1
...
...
@@ -75,15 +75,7 @@ func (ks keyStorePassphrase) GenerateNewKey(rand io.Reader, auth string) (key *K
}
func
(
ks
keyStorePassphrase
)
GetKey
(
keyAddr
common
.
Address
,
auth
string
)
(
key
*
Key
,
err
error
)
{
keyBytes
,
keyId
,
err
:=
decryptKeyFromFile
(
ks
.
keysDirPath
,
keyAddr
,
auth
)
if
err
==
nil
{
key
=
&
Key
{
Id
:
uuid
.
UUID
(
keyId
),
Address
:
keyAddr
,
PrivateKey
:
ToECDSA
(
keyBytes
),
}
}
return
return
decryptKeyFromFile
(
ks
.
keysDirPath
,
keyAddr
,
auth
)
}
func
(
ks
keyStorePassphrase
)
Cleanup
(
keyAddr
common
.
Address
)
(
err
error
)
{
...
...
@@ -145,39 +137,58 @@ func (ks keyStorePassphrase) StoreKey(key *Key, auth string) (err error) {
return
writeKeyFile
(
key
.
Address
,
ks
.
keysDirPath
,
keyJSON
)
}
func
(
ks
keyStorePassphrase
)
DeleteKey
(
keyAddr
common
.
Address
,
auth
string
)
(
err
error
)
{
func
(
ks
keyStorePassphrase
)
DeleteKey
(
keyAddr
common
.
Address
,
auth
string
)
error
{
// only delete if correct passphrase is given
_
,
_
,
err
=
decryptKeyFromFile
(
ks
.
keysDirPath
,
keyAddr
,
auth
)
if
err
!=
nil
{
if
_
,
err
:=
decryptKeyFromFile
(
ks
.
keysDirPath
,
keyAddr
,
auth
);
err
!=
nil
{
return
err
}
return
deleteKey
(
ks
.
keysDirPath
,
keyAddr
)
}
func
decryptKeyFromFile
(
keysDirPath
string
,
keyAddr
common
.
Address
,
auth
string
)
(
keyBytes
[]
byte
,
keyId
[]
byte
,
err
error
)
{
// DecryptKey decrypts a key from a json blob, returning the private key itself.
func
DecryptKey
(
keyjson
[]
byte
,
auth
string
)
(
*
Key
,
error
)
{
// Parse the json into a simple map to fetch the key version
m
:=
make
(
map
[
string
]
interface
{})
err
=
getKey
(
keysDirPath
,
keyAddr
,
&
m
)
if
err
!=
nil
{
return
if
err
:=
json
.
Unmarshal
(
keyjson
,
&
m
);
err
!=
nil
{
return
nil
,
err
}
// Depending on the version try to parse one way or another
var
(
keyBytes
,
keyId
[]
byte
err
error
)
v
:=
reflect
.
ValueOf
(
m
[
"version"
])
if
v
.
Kind
()
==
reflect
.
String
&&
v
.
String
()
==
"1"
{
k
:=
new
(
encryptedKeyJSONV1
)
err
=
getKey
(
keysDirPath
,
keyAddr
,
&
k
)
if
err
!=
nil
{
return
if
err
:=
json
.
Unmarshal
(
keyjson
,
k
);
err
!=
nil
{
return
nil
,
err
}
return
decryptKeyV1
(
k
,
auth
)
keyBytes
,
keyId
,
err
=
decryptKeyV1
(
k
,
auth
)
}
else
{
k
:=
new
(
encryptedKeyJSONV3
)
err
=
getKey
(
keysDirPath
,
keyAddr
,
&
k
)
if
err
!=
nil
{
return
if
err
:=
json
.
Unmarshal
(
keyjson
,
k
);
err
!=
nil
{
return
nil
,
err
}
return
decryptKeyV3
(
k
,
auth
)
keyBytes
,
keyId
,
err
=
decryptKeyV3
(
k
,
auth
)
}
// Handle any decryption errors and return the key
if
err
!=
nil
{
return
nil
,
err
}
key
:=
ToECDSA
(
keyBytes
)
return
&
Key
{
Id
:
uuid
.
UUID
(
keyId
),
Address
:
PubkeyToAddress
(
key
.
PublicKey
),
PrivateKey
:
key
,
},
nil
}
func
decryptKeyFromFile
(
keysDirPath
string
,
keyAddr
common
.
Address
,
auth
string
)
(
key
*
Key
,
err
error
)
{
keyjson
,
err
:=
getKeyFile
(
keysDirPath
,
keyAddr
)
if
err
!=
nil
{
return
nil
,
err
}
return
DecryptKey
(
keyjson
,
auth
)
}
func
decryptKeyV3
(
keyProtected
*
encryptedKeyJSONV3
,
auth
string
)
(
keyBytes
[]
byte
,
keyId
[]
byte
,
err
error
)
{
...
...
crypto/key_store_plain.go
浏览文件 @
cda91ee1
...
...
@@ -62,18 +62,16 @@ func GenerateNewKeyDefault(ks KeyStore, rand io.Reader, auth string) (key *Key,
return
key
,
err
}
func
(
ks
keyStorePlain
)
GetKey
(
keyAddr
common
.
Address
,
auth
string
)
(
key
*
Key
,
err
error
)
{
key
=
new
(
Key
)
err
=
getKey
(
ks
.
keysDirPath
,
keyAddr
,
key
)
return
}
func
getKey
(
keysDirPath
string
,
keyAddr
common
.
Address
,
content
interface
{})
(
err
error
)
{
fileContent
,
err
:=
getKeyFile
(
keysDirPath
,
keyAddr
)
func
(
ks
keyStorePlain
)
GetKey
(
keyAddr
common
.
Address
,
auth
string
)
(
*
Key
,
error
)
{
keyjson
,
err
:=
getKeyFile
(
ks
.
keysDirPath
,
keyAddr
)
if
err
!=
nil
{
return
return
nil
,
err
}
key
:=
new
(
Key
)
if
err
:=
json
.
Unmarshal
(
keyjson
,
key
);
err
!=
nil
{
return
nil
,
err
}
return
json
.
Unmarshal
(
fileContent
,
content
)
return
key
,
nil
}
func
(
ks
keyStorePlain
)
GetKeyAddresses
()
(
addresses
[]
common
.
Address
,
err
error
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录