Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
tor-browser-build
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
The Tor Project
Applications
tor-browser-build
Merge requests
!339
Bug 40358: Make OpenSSL 1.1.1l buildable for macOS
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Bug 40358: Make OpenSSL 1.1.1l buildable for macOS
sysrqb/tor-browser-build:bug_40358_00
into
maint-10.5
Overview
0
Commits
1
Changes
3
Merged
Matthew Finkel
requested to merge
sysrqb/tor-browser-build:bug_40358_00
into
maint-10.5
3 years ago
Overview
0
Commits
1
Changes
3
Expand
Closes
#40358 (closed)
0
0
Merge request reports
Compare
maint-10.5
maint-10.5 (base)
and
latest version
latest version
269b0bf6
1 commit,
3 years ago
3 files
+
42
−
0
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
3
Search (e.g. *.vue) (Ctrl+P)
projects/openssl/0001-Revert-apple-getentropy-removal.patch
0 → 100644
+
39
−
0
Options
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