From: Bernd Edlinger <bernd.edlinger@hotmail.de>
Date: Fri, 19 Jan 2018 13:00:14 +0000 (+0100)
Subject: Add a configure option to opt-out secure memory
X-Git-Tag: OpenSSL_1_1_0h~119
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=42999a230f893d63a17dd9aca4f8df5c860fc836;p=oweals%2Fopenssl.git

Add a configure option to opt-out secure memory

./config -DOPENSSL_NO_SECURE_MEMORY

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

(cherry picked from commit 154d8c132fbe22a248f95e95ef21f1840451da62)
---

diff --git a/crypto/mem_sec.c b/crypto/mem_sec.c
index b26ba20a62..b626b3d396 100644
--- a/crypto/mem_sec.c
+++ b/crypto/mem_sec.c
@@ -25,7 +25,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>