[openssl-commits] [openssl] master update

[bernd.edlinger at hotmail.de]

The branch master has been updated
       via  154d8c132fbe22a248f95e95ef21f1840451da62 (commit)
      from  7c24f9d21cddd2bb30167153b05168fee7e3cf0b (commit)


- Log -----------------------------------------------------------------
commit 154d8c132fbe22a248f95e95ef21f1840451da62
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Fri Jan 19 14:00:14 2018 +0100

    Add a configure option to opt-out secure memory
    
    ./config -DOPENSSL_NO_SECURE_MEMORY
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5113)

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

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

diff --git a/crypto/mem_sec.c b/crypto/mem_sec.c
index afd0c26..8f4ae9c 100644
--- a/crypto/mem_sec.c
+++ b/crypto/mem_sec.c
@@ -21,7 +21,7 @@
 #include <string.h>
 
 /* e_os.h includes unistd.h, which defines _POSIX_VERSION */
-#if defined(OPENSSL_SYS_UNIX) \
+#if !defined(OPENSSL_NO_SECURE_MEMORY) && defined(OPENSSL_SYS_UNIX) \
     && defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L
 # define IMPLEMENTED
 # include <stdlib.h>