status-im/nimbus-eth1
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth1.git synced 2025-02-04 08:16:19 +00:00
Code Issues Projects Releases Wiki Activity

Add shh_generateSymKeyFromPassword implementation

Browse Source
This commit is contained in:
kdeme 2019-04-05 16:36:52 +02:00
parent d43f20c65a
commit 65908d5359
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nimbus/rpc/whisper.nim
View File

@ -1,8 +1,8 @@
import
json_rpc/rpcserver, rpc_types, hexstrings, tables, options, sequtils,
eth/[common, rlp, keys, p2p], eth/p2p/rlpx_protocols/whisper_protocol
eth/[common, rlp, keys, p2p], eth/p2p/rlpx_protocols/whisper_protocol,
nimcrypto/[sysrand, hmac, sha2, pbkdf2]
from nimcrypto/sysrand import randomBytes
from byteutils import hexToSeqByte, hexToByteArray
# Whisper RPC implemented mostly as in
@ -161,8 +161,16 @@ proc setupWhisperRPC*(node: EthereumNode, keys: WhisperKeys, rpcsrv: RpcServer)
## password: Password.
##
## Returns key identifier on success and an error on failure.
# TODO: implement, can use nimcrypto/pbkdf2
discard
## Warning: an empty string is used as salt because the shh RPC API does not
## allow for passing a salt. A very good password is necessary (calculate
## yourself what that means :))
var ctx: HMAC[sha256]
var symKey: SymKey
if pbkdf2(ctx, password, "", 65356, symKey) != sizeof(SymKey):
raise newException(ValueError, "Failed generating key")
result = generateRandomID().IdentifierStr
keys.symKeys.add(result.string, symKey)
rpcsrv.rpc("shh_hasSymKey") do(id: IdentifierStr) -> bool:
## Returns true if there is a key associated with the name string.

13
tests/test_rpc_whisper.nim
View File

@ -100,6 +100,19 @@ proc doTests =
waitFor(client.shh_hasSymKey(keyID2)) == false
waitFor(client.shh_deleteSymKey(keyID2)) == false
let keyID3 = waitFor client.shh_generateSymKeyFromPassword("password")
let keyID4 = waitFor client.shh_generateSymKeyFromPassword("password")
let keyID5 = waitFor client.shh_generateSymKeyFromPassword("nimbus!")
check:
waitFor(client.shh_getSymKey(keyID3)).string ==
waitFor(client.shh_getSymKey(keyID4)).string
waitFor(client.shh_getSymKey(keyID3)).string !=
waitFor(client.shh_getSymKey(keyID5)).string
waitFor(client.shh_hasSymKey(keyID3)) == true
waitFor(client.shh_deleteSymKey(keyID3)) == true
waitFor(client.shh_hasSymKey(keyID3)) == false
waitFor(client.shh_deleteSymKey(keyID3)) == false
test "shh symKey post and filter":
var options: WhisperFilterOptions
options.symKeyID = some(waitFor client.shh_newSymKey())