[tor-commits] [tor-browser-build/master] Bug 40358: Make OpenSSL 1.1.1l buildable for macOS

[sysrqb at torproject.org]

commit 1f70c2f56b61030edb8b4ecf09031011d7ee7f41
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Fri Sep 3 20:51:55 2021 +0000

    Bug 40358: Make OpenSSL 1.1.1l buildable for macOS
---
 .../0001-Revert-apple-getentropy-removal.patch     | 39 ++++++++++++++++++++++
 projects/openssl/build                             |  1 +
 projects/openssl/config                            |  2 ++
 3 files changed, 42 insertions(+)

diff --git a/projects/openssl/0001-Revert-apple-getentropy-removal.patch b/projects/openssl/0001-Revert-apple-getentropy-removal.patch
new file mode 100644
index 0000000..d101203
--- /dev/null
+++ b/projects/openssl/0001-Revert-apple-getentropy-removal.patch
@@ -0,0 +1,39 @@
+From 8b9e95ae8a9d81b1942be28cba95c35f2303ee2d Mon Sep 17 00:00:00 2001
+From: Matthew Finkel <sysrqb at 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
+
diff --git a/projects/openssl/build b/projects/openssl/build
index f8c4cbf..bf0b16f 100644
--- a/projects/openssl/build
+++ b/projects/openssl/build
@@ -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') %]
diff --git a/projects/openssl/config b/projects/openssl/config
index 09a8407..96dbfbf 100644
--- a/projects/openssl/config
+++ b/projects/openssl/config
@@ -32,3 +32,5 @@ input_files:
     project: '[% c("var/compiler") %]'
   - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz'
     sha256sum: 892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5
+  - filename: 0001-Revert-apple-getentropy-removal.patch
+    enable: '[% c("var/osx") %]'