From f31ac320012c9aa1540034288ea94f6c80924aa3 Mon Sep 17 00:00:00 2001 From: Jeremiah Gowdy Date: Sun, 18 Oct 2020 14:12:35 -0700 Subject: Implement OpenSSL secure memory for Windows Reviewed-by: Matt Caswell Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/13172) --- e_os.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'e_os.h') diff --git a/e_os.h b/e_os.h index 979be9b2b1..3e7a13f94d 100644 --- a/e_os.h +++ b/e_os.h @@ -359,10 +359,11 @@ inline int nssgetpid(); # ifndef OPENSSL_NO_SECURE_MEMORY /* unistd.h defines _POSIX_VERSION */ -# if defined(OPENSSL_SYS_UNIX) \ - && ( (defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L) \ - || defined(__sun) || defined(__hpux) || defined(__sgi) \ - || defined(__osf__) ) +# if (defined(OPENSSL_SYS_UNIX) \ + && ( (defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L) \ + || defined(__sun) || defined(__hpux) || defined(__sgi) \ + || defined(__osf__) )) \ + || defined(_WIN32) /* secure memory is implemented */ # else # define OPENSSL_NO_SECURE_MEMORY -- cgit v1.2.3