Unverified Commit 9f7492f0 authored by Georg Koppen's avatar Georg Koppen
Browse files

Bug 40401: Update OpenSSL to 1.1.1m 

OpenSSL 1.1.1m includes a fix for our #40358. We have to remove our
workaround otherwise compilation breaks. Hence, this commit fixes #40390
as well.
parent a0d781d4

projects/openssl/0001-Revert-apple-getentropy-removal.patch

deleted100644 → 0
+0 −39
Original line number Diff line number Diff line 
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

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 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

+2 −4
Original line number Diff line number Diff line 
# vim: filetype=yaml sw=2

version: 1.1.1l

version: 1.1.1m

filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'



var:
@@ -31,6 +31,4 @@ input_files: 
  - name: '[% c("var/compiler") %]'

    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") %]'
 
    sha256sum: f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96