[openssl] master update

tmraz at fedoraproject.org tmraz at fedoraproject.org
Wed Jun 19 12:43:01 UTC 2019


The branch master has been updated
       via  1fa90bb3a9089f974e9b07f3e76a964bd2da6976 (commit)
      from  1ff030c0a6f0415577b07366861a41b101e6af92 (commit)


- Log -----------------------------------------------------------------
commit 1fa90bb3a9089f974e9b07f3e76a964bd2da6976
Author: Rebecca Cran <rebecca at bluestop.org>
Date:   Wed Jun 12 14:03:36 2019 -0600

    Fix UEFI build on FreeBSD by not including system headers
    
    CLA: trivial
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Ben Kaduk <kaduk at mit.edu>
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    (Merged from https://github.com/openssl/openssl/pull/9149)

-----------------------------------------------------------------------

Summary of changes:
 crypto/rand/rand_unix.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c
index 3a6e009..6161909 100644
--- a/crypto/rand/rand_unix.c
+++ b/crypto/rand/rand_unix.c
@@ -21,7 +21,7 @@
 #if defined(__linux)
 # include <asm/unistd.h>
 #endif
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) && !defined(OPENSSL_SYS_UEFI)
 # include <sys/types.h>
 # include <sys/sysctl.h>
 # include <sys/param.h>


More information about the openssl-commits mailing list