mirror of
https://github.com/status-im/nim-websock.git
synced 2025-02-16 03:16:42 +00:00
Remove newRng (#132)
This commit is contained in:
parent
acbe30e9ca
commit
cf8b8ce235
@ -121,7 +121,7 @@ suite "Decode frame extensions flow":
|
|||||||
var
|
var
|
||||||
address: TransportAddress
|
address: TransportAddress
|
||||||
server: StreamServer
|
server: StreamServer
|
||||||
maskKey = genMaskKey(newRng())
|
maskKey = genMaskKey(HmacDrbgContext.new())
|
||||||
transport: StreamTransport
|
transport: StreamTransport
|
||||||
reader: AsyncStreamReader
|
reader: AsyncStreamReader
|
||||||
frame: Frame
|
frame: Frame
|
||||||
|
@ -806,7 +806,7 @@ suite "Test Payload":
|
|||||||
address = initTAddress("127.0.0.1:8888"),
|
address = initTAddress("127.0.0.1:8888"),
|
||||||
frameSize = maxFrameSize)
|
frameSize = maxFrameSize)
|
||||||
|
|
||||||
let maskKey = genMaskKey(newRng())
|
let maskKey = genMaskKey(HmacDrbgContext.new())
|
||||||
await session.stream.writer.write(
|
await session.stream.writer.write(
|
||||||
(await Frame(
|
(await Frame(
|
||||||
fin: false,
|
fin: false,
|
||||||
@ -866,7 +866,7 @@ suite "Test Payload":
|
|||||||
pong = true
|
pong = true
|
||||||
)
|
)
|
||||||
|
|
||||||
let maskKey = genMaskKey(newRng())
|
let maskKey = genMaskKey(HmacDrbgContext.new())
|
||||||
await session.stream.writer.write(
|
await session.stream.writer.write(
|
||||||
(await Frame(
|
(await Frame(
|
||||||
fin: false,
|
fin: false,
|
||||||
|
@ -13,13 +13,7 @@ export rand
|
|||||||
## Random helpers: similar as in stdlib, but with HmacDrbgContext rng
|
## Random helpers: similar as in stdlib, but with HmacDrbgContext rng
|
||||||
const randMax = 18_446_744_073_709_551_615'u64
|
const randMax = 18_446_744_073_709_551_615'u64
|
||||||
|
|
||||||
type
|
type Rng* = ref HmacDrbgContext
|
||||||
Rng* = ref HmacDrbgContext
|
|
||||||
|
|
||||||
proc newRng*(): Rng =
|
|
||||||
# You should only create one instance of the RNG per application / library
|
|
||||||
# Ref is used so that it can be shared between components
|
|
||||||
HmacDrbgContext.new()
|
|
||||||
|
|
||||||
proc rand*(rng: Rng, max: Natural): int =
|
proc rand*(rng: Rng, max: Natural): int =
|
||||||
if max == 0: return 0
|
if max == 0: return 0
|
||||||
|
@ -120,7 +120,7 @@ proc connect*(
|
|||||||
rng: Rng = nil): Future[WSSession] {.async.} =
|
rng: Rng = nil): Future[WSSession] {.async.} =
|
||||||
|
|
||||||
let
|
let
|
||||||
rng = if isNil(rng): newRng() else: rng
|
rng = if isNil(rng): HmacDrbgContext.new() else: rng
|
||||||
key = Base64Pad.encode(genWebSecKey(rng))
|
key = Base64Pad.encode(genWebSecKey(rng))
|
||||||
hostname = if hostName.len > 0: hostName else: $host
|
hostname = if hostName.len > 0: hostName else: $host
|
||||||
|
|
||||||
@ -364,7 +364,7 @@ proc new*(
|
|||||||
return WSServer(
|
return WSServer(
|
||||||
protocols: @protos,
|
protocols: @protos,
|
||||||
masked: false,
|
masked: false,
|
||||||
rng: if isNil(rng): newRng() else: rng,
|
rng: if isNil(rng): HmacDrbgContext.new() else: rng,
|
||||||
frameSize: frameSize,
|
frameSize: frameSize,
|
||||||
factories: @factories,
|
factories: @factories,
|
||||||
onPing: onPing,
|
onPing: onPing,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user