summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorBernd Edlinger <bernd.edlinger@hotmail.de>2018-01-19 14:00:14 +0100
committerBernd Edlinger <bernd.edlinger@hotmail.de>2018-01-21 16:08:30 +0100
commit154d8c132fbe22a248f95e95ef21f1840451da62 (patch)
tree6555a217c4aebd20a18752e1f8768571a9a936fe /crypto
parentUpdate the license end year (diff)
downloadopenssl-154d8c132fbe22a248f95e95ef21f1840451da62.tar.xz
openssl-154d8c132fbe22a248f95e95ef21f1840451da62.zip
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)
Diffstat (limited to 'crypto')
-rw-r--r--crypto/mem_sec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/mem_sec.c b/crypto/mem_sec.c
index afd0c26bea..8f4ae9c94a 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>