[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  5839185cdd9b339ff741da437d964a25e72a3fb6 (commit)
      from  b9d1ad32039a8203e79845eafc8acd199c20a807 (commit)


- Log -----------------------------------------------------------------
commit 5839185cdd9b339ff741da437d964a25e72a3fb6
Author: Andy Polyakov <appro at openssl.org>
Date:   Sun Feb 25 16:56:26 2018 +0100

    mem_sec.c: relax POSIX requirement.
    
    Even though mlock(2) was standardized in POSIX.1-2001, vendors did
    implement it prior that point.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5460)

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

Summary of changes:
 crypto/mem_sec.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/crypto/mem_sec.c b/crypto/mem_sec.c
index 4c01045..77bf165 100644
--- a/crypto/mem_sec.c
+++ b/crypto/mem_sec.c
@@ -22,7 +22,9 @@
 
 /* e_os.h includes unistd.h, which defines _POSIX_VERSION */
 #if !defined(OPENSSL_NO_SECURE_MEMORY) && defined(OPENSSL_SYS_UNIX) \
-    && defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L
+    && ( (defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L) \
+         || defined(__sun) || defined(__hpux) || defined(__sgi) \
+         || defined(__osf__) )
 # define IMPLEMENTED
 # include <stdlib.h>
 # include <assert.h>