vacp2p
/
nim-libp2p
mirror of https://github.com/vacp2p/nim-libp2p.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use results and no exceptions in chacha and curve25519 (#182)

This commit is contained in:
Giovanni Petrantoni 2020-05-19 17:22:49 +09:00 committed by GitHub
parent f8029e7359
commit c219100e64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libp2p/crypto/chacha20poly1305.nim
View File

@ -15,6 +15,8 @@
# RFC @ https://tools.ietf.org/html/rfc7539 # RFC @ https://tools.ietf.org/html/rfc7539
{.push raises: [Defect].}
import bearssl import bearssl
# have to do this due to a nim bug and raises[] on callbacks # have to do this due to a nim bug and raises[] on callbacks

19
libp2p/crypto/curve25519.nim
View File

@ -15,7 +15,11 @@
# RFC @ https://tools.ietf.org/html/rfc7748 # RFC @ https://tools.ietf.org/html/rfc7748
{.push raises: [Defect].}
import bearssl import bearssl
import stew/results
export results
const const
Curve25519KeySize* = 32 Curve25519KeySize* = 32
@ -24,7 +28,8 @@ type
Curve25519* = object Curve25519* = object
Curve25519Key* = array[Curve25519KeySize, byte] Curve25519Key* = array[Curve25519KeySize, byte]
pcuchar = ptr cuchar pcuchar = ptr cuchar
Curver25519RngError* = object of CatchableError Curve25519Error* = enum
Curver25519RngError
proc intoCurve25519Key*(s: openarray[byte]): Curve25519Key = proc intoCurve25519Key*(s: openarray[byte]): Curve25519Key =
assert s.len == Curve25519KeySize assert s.len == Curve25519KeySize
@ -100,12 +105,16 @@ proc mulgen*(_: type[Curve25519], dst: var Curve25519Key, point: Curve25519Key)
proc public*(private: Curve25519Key): Curve25519Key = proc public*(private: Curve25519Key): Curve25519Key =
Curve25519.mulgen(result, private) Curve25519.mulgen(result, private)
proc random*(_: type[Curve25519Key]): Curve25519Key = proc random*(_: type[Curve25519Key]): Result[Curve25519Key, Curve25519Error] =
var rng: BrHmacDrbgContext var rng: BrHmacDrbgContext
var res: Curve25519Key
let seeder = brPrngSeederSystem(nil) let seeder = brPrngSeederSystem(nil)
brHmacDrbgInit(addr rng, addr sha256Vtable, nil, 0) brHmacDrbgInit(addr rng, addr sha256Vtable, nil, 0)
if seeder(addr rng.vtable) == 0: if seeder(addr rng.vtable) == 0:
raise newException(ValueError, "Could not seed RNG") err(Curver25519RngError)
else:
let defaultBrEc = brEcGetDefault() let defaultBrEc = brEcGetDefault()
if brEcKeygen(addr rng.vtable, defaultBrEc, nil, addr result[0], EC_curve25519) != Curve25519KeySize: if brEcKeygen(addr rng.vtable, defaultBrEc, nil, addr res[0], EC_curve25519) != Curve25519KeySize:
raise newException(Curver25519RngError, "Could not generate random data") err(Curver25519RngError)
else:
ok(res)

2
libp2p/protocols/secure/noise.nim
View File

@ -88,7 +88,7 @@ type
# Utility # Utility
proc genKeyPair(): KeyPair = proc genKeyPair(): KeyPair =
result.privateKey = Curve25519Key.random() result.privateKey = Curve25519Key.random().tryGet()
result.publicKey = result.privateKey.public() result.publicKey = result.privateKey.public()
proc hashProtocol(name: string): MDigest[256] = proc hashProtocol(name: string): MDigest[256] =