From: Andy Polyakov <appro@openssl.org>
Date: Sun, 24 Jun 2018 11:24:27 +0000 (+0200)
Subject: rand/rand_unix.c: mask getentropy ELF detection on HP-UX.
X-Git-Tag: OpenSSL_1_1_1-pre9~234
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8d58f0171e743ebda2b676016800f0a4cd66a1da;p=oweals%2Fopenssl.git

rand/rand_unix.c: mask getentropy ELF detection on HP-UX.

Unlike other ELF systems, HP-UX run-time linker fails to detect symbol
availability through weak declaration.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6583)
---

diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c
index fafa359d49..a545e08d8c 100644
--- a/crypto/rand/rand_unix.c
+++ b/crypto/rand/rand_unix.c
@@ -240,7 +240,7 @@ int syscall_random(void *buf, size_t buflen)
      * - Linux since 3.17 with glibc 2.25
      * - FreeBSD since 12.0 (1200061)
      */
-#  if defined(__GNUC__) && __GNUC__>=2 && defined(__ELF__)
+#  if defined(__GNUC__) && __GNUC__>=2 && defined(__ELF__) && !defined(__hpux)
     extern int getentropy(void *bufer, size_t length) __attribute__((weak));
 
     if (getentropy != NULL)