fix nim-lang#17370

ringabout · Mar 14, 2021 · c467017 · c467017
1 parent d1e0932
commit c467017
Showing 1 changed file with 15 additions and 13 deletions.
diff --git a/lib/std/sysrand.nim b/lib/std/sysrand.nim
@@ -20,7 +20,7 @@
 ## | :---         | ----:       |
 ## | Windows | `BCryptGenRandom`_ |
 ## | Linux | `getrandom`_ |
-## | MacOSX | `getentropy`_ |
+## | MacOSX | `SecRandomCopyBytes`_ |
 ## | IOS | `SecRandomCopyBytes`_ |
 ## | OpenBSD | `getentropy openbsd`_ |
 ## | FreeBSD | `getrandom freebsd`_ |
@@ -58,7 +58,7 @@ when defined(posix):
   import std/posix
 
 const
-  batchImplOS = defined(freebsd) or defined(openbsd) or (defined(macosx) and not defined(ios))
+  batchImplOS = defined(freebsd) or defined(openbsd)
   batchSize {.used.} = 256
 
 when batchImplOS:
@@ -214,7 +214,7 @@ elif defined(freebsd):
   proc getRandomImpl(p: pointer, size: int): int {.inline.} =
     result = getrandom(p, csize_t(size), 0)
 
-elif defined(ios):
+elif defined(macosx):
   {.passL: "-framework Security".}
 
   const errSecSuccess = 0 ## No error.
@@ -237,18 +237,20 @@ elif defined(ios):
 
     result = secRandomCopyBytes(nil, csize_t(size), addr dest[0])
 
-elif defined(macosx):
-  const sysrandomHeader = """#include <Availability.h>
-#include <sys/random.h>
-"""
+  # when macosx version which is more than 10.12 become common, use the implementation below
+  # and don't forget to define (defined(macosx) and not defined(osx))
 
-  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.
+  #   const sysrandomHeader = """#include <Availability.h>
+  # #include <sys/random.h>
+  # """
 
-  proc getRandomImpl(p: pointer, size: int): int {.inline.} =
-    result = getentropy(p, csize_t(size)).int
+  #   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]) =