status-im/nim-eth-p2p
2
0
Fork 0
mirror of https://github.com/status-im/nim-eth-p2p.git synced 2025-02-04 11:03:57 +00:00
Code Issues Projects Releases Wiki Activity

Fix auth.nim to work with latest nim-rlp.

Browse Source
This commit is contained in:
cheatfate 2018-03-28 10:24:41 +03:00
parent 2cebd96cbe
commit f6210fcf09
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -17,4 +17,4 @@ before_script:
- cd ..
script:
- nimble install -y
- nimble test
- nimble tests

24
ethp2p/auth.nim
View File

@ -334,7 +334,7 @@ proc decodeAuthEip8Message*(h: var Handshake, msg: ptr byte,
return(EciesError)
try:
var reader = rlpFromBytes(initBytesRange(output))
var reader = rlpFromBytes(output.toRange())
if not reader.isList() or reader.listLen() < 4:
return(InvalidAuth)
if reader.listElem(0).blobLen != SignatureLength:
@ -351,10 +351,10 @@ proc decodeAuthEip8Message*(h: var Handshake, msg: ptr byte,
var nonceBr = reader.listElem(2).toBytes()
var versionBr = reader.listElem(3).toBytes()
if recoverPublicKey(addr output[pubkeyBr.ibegin], PublicKeyLength,
if recoverPublicKey(pubkeyBr.baseAddr, PublicKeyLength,
pubkey) != EccStatus.Success:
return(InvalidPubKey)
copyMem(addr nonce[0], addr output[nonceBr.ibegin], KeyLength)
copyMem(addr nonce[0], nonceBr.baseAddr, KeyLength)
if ecdhAgree(h.host.seckey, pubkey, secret) != EccStatus.Success:
return(EcdhError)
@ -362,14 +362,14 @@ proc decodeAuthEip8Message*(h: var Handshake, msg: ptr byte,
var xornonce = nonce
xornonce.sxor(secret)
if recoverSignatureKey(addr output[signatureBr.ibegin], SignatureLength,
if recoverSignatureKey(signatureBr.baseAddr, SignatureLength,
addr xornonce[0],
h.remoteEPubkey) != EccStatus.Success:
return(SignatureError)
h.initiatorNonce = nonce
h.remoteHPubkey = pubkey
h.version = output[versionBr.ibegin]
h.version = cast[ptr byte](versionBr.baseAddr)[]
result = Success
except:
return(RlpError)
@ -394,7 +394,7 @@ proc decodeAuthAckEip8Message(h: var Handshake, msg: ptr byte,
return(EciesError)
try:
var reader = rlpFromBytes(initBytesRange(output))
var reader = rlpFromBytes(output.toRange())
if not reader.isList() or reader.listLen() < 3:
return(InvalidAck)
if reader.listElem(0).blobLen != PublicKeyLength:
@ -403,15 +403,15 @@ proc decodeAuthAckEip8Message(h: var Handshake, msg: ptr byte,
return(InvalidAck)
if reader.listElem(2).blobLen != 1:
return(InvalidAck)
var pubkeyBr = reader.listElem(0).toBytes()
var nonceBr = reader.listElem(1).toBytes()
var versionBr = reader.listElem(2).toBytes()
let pubkeyBr = reader.listElem(0).toBytes()
let nonceBr = reader.listElem(1).toBytes()
let versionBr = reader.listElem(2).toBytes()
if recoverPublicKey(addr output[pubkeyBr.ibegin], PublicKeyLength,
if recoverPublicKey(pubkeyBr.baseAddr, PublicKeyLength,
h.remoteEPubkey) != EccStatus.Success:
return(InvalidPubKey)
copyMem(addr h.responderNonce[0], addr output[nonceBr.ibegin], KeyLength)
h.version = output[versionBr.ibegin]
copyMem(addr h.responderNonce[0], nonceBr.baseAddr, KeyLength)
h.version = cast[ptr byte](versionBr.baseAddr)[]
result = Success
except:
return(RlpError)