Skip to content
Snippets Groups Projects

Bug 40358: Make OpenSSL 1.1.1l buildable for macOS

Merged Matthew Finkel requested to merge sysrqb/tor-browser-build:bug_40358_00 into maint-10.5
3 files
+ 42
0
Compare changes
  • Side-by-side
  • Inline
Files
3
From 8b9e95ae8a9d81b1942be28cba95c35f2303ee2d Mon Sep 17 00:00:00 2001
From: Matthew Finkel <sysrqb@torproject.org>
Date: Fri, 3 Sep 2021 20:48:53 +0000
Subject: [PATCH] Revert "apple getentropy removal"
This reverts commit b58ac9f1e3f828b5c65c9edd5bb86603a4886a26.
---
crypto/rand/rand_unix.c | 8 --------
1 file changed, 8 deletions(-)
diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c
index 43f1069d15..2dfced2052 100644
--- a/crypto/rand/rand_unix.c
+++ b/crypto/rand/rand_unix.c
@@ -34,9 +34,6 @@
#if defined(__OpenBSD__)
# include <sys/param.h>
#endif
-#if defined(__APPLE__)
-# include <CommonCrypto/CommonRandom.h>
-#endif
#if defined(OPENSSL_SYS_UNIX) || defined(__DJGPP__)
# include <sys/types.h>
@@ -381,11 +378,6 @@ static ssize_t syscall_random(void *buf, size_t buflen)
if (errno != ENOSYS)
return -1;
}
-# elif defined(__APPLE__)
- if (CCRandomGenerateBytes(buf, buflen) == kCCSuccess)
- return (ssize_t)buflen;
-
- return -1;
# else
union {
void *p;
--
2.25.1
Loading