Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
The Tor Project
Applications
tor-browser-build
Commits
269b0bf6
Unverified
Commit
269b0bf6
authored
Sep 03, 2021
by
Matthew Finkel
Browse files
Bug 40358: Make OpenSSL 1.1.1l buildable for macOS
parent
9cc5fc9e
Changes
3
Hide whitespace changes
Inline
Side-by-side
projects/openssl/0001-Revert-apple-getentropy-removal.patch
0 → 100644
View file @
269b0bf6
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
projects/openssl/build
View file @
269b0bf6
...
...
@@ -12,6 +12,7 @@ export CC='gcc -m32'
# Tricking OpenSSL into using our clang as cross-compiler
ln
-
s
$
clangdir
/
bin
/
clang
$
clangdir
/
bin
/
x86_64
-
apple
-
darwin
-
cc
export
CC
=
"cc [% c("
var
/
FLAGS
") %]"
patch
-
p1
<
$
rootdir
/
0001
-
Revert
-
apple
-
getentropy
-
removal
.
patch
[
%
END
-%
]
export
SOURCE_DATE_EPOCH
=
'[% c("timestamp") %]'
.
/
Configure
[
%
c
(
'var/configure_opts'
)
%
]
...
...
projects/openssl/config
View file @
269b0bf6
...
...
@@ -32,3 +32,5 @@ input_files:
project
:
'
[%
c("var/compiler")
%]'
-
URL
:
'
https://www.openssl.org/source/openssl-[%
c("version")
%].tar.gz'
sha256sum
:
0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1
-
filename
:
0001-Revert-apple-getentropy-removal.patch
enable
:
'
[%
c("var/osx")
%]'
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment