mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-07-22 08:51:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Backport #20466 - macOS use SecRandomCopyBytes instead of getentropy (#21389)

Browse Source 
* On macOS use SecRandomCopyBytes instead of getentropy (which is only available on macOS 10.12+)

* Change passL to passl

---------

Co-authored-by: Clay Sweetser <Varriount@users.noreply.github.com>
Co-authored-by: ringabout <43030857+ringabout@users.noreply.github.com>
This commit is contained in:
Matt Haggard
2023-03-02 14:26:04 -05:00
committed by GitHub
parent 1cdce314a7
commit 5c36f24da2
1 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/std/sysrand.nim
View File

@@ -20,7 +20,7 @@
## | :--- | ----: |
## | Windows | `BCryptGenRandom`_ |
## | Linux | `getrandom`_ |
## | MacOSX | `getentropy`_ |
## | MacOSX | `SecRandomCopyBytes`_ |
## | iOS | `SecRandomCopyBytes`_ |
## | OpenBSD | `getentropy openbsd`_ |
## | FreeBSD | `getrandom freebsd`_ |
@@ -63,7 +63,7 @@ when defined(posix):
import posix
const
batchImplOS = defined(freebsd) or defined(openbsd) or defined(zephyr) or (defined(macosx) and not defined(ios))
batchImplOS = defined(freebsd) or defined(openbsd) or defined(zephyr)
batchSize {.used.} = 256
when batchImplOS:
@@ -228,8 +228,8 @@ elif defined(freebsd):
proc getRandomImpl(p: pointer, size: int): int {.inline.} =
result = getrandom(p, csize_t(size), 0)
elif defined(ios):
{.passL: "-framework Security".}
elif defined(ios) or defined(macosx):
{.passl: "-framework Security".}
const errSecSuccess = 0 ## No error.
@@ -251,19 +251,6 @@ elif defined(ios):
result = secRandomCopyBytes(nil, csize_t(size), addr dest[0])
elif defined(macosx):
const sysrandomHeader = """#include <Availability.h>
#include <sys/random.h>
"""
proc getentropy(p: pointer, size: csize_t): cint {.importc: "getentropy", header: sysrandomHeader.}
# getentropy() fills a buffer with random data, which can be used as input
# for process-context pseudorandom generators like arc4random(3).
# The maximum buffer size permitted is 256 bytes.
proc getRandomImpl(p: pointer, size: int): int {.inline.} =
result = getentropy(p, csize_t(size)).int
else:
template urandomImpl(result: var int, dest: var openArray[byte]) =
let size = dest.len