diff options
| author | Jeremiah Gowdy <jeremiah@gowdy.me> | 2020-10-18 14:12:35 -0700 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2020-10-22 12:11:35 +1000 |
| commit | f31ac320012c9aa1540034288ea94f6c80924aa3 (patch) | |
| tree | d2d8fe1277101793a728f2493ac34aff9b1fc16f /e_os.h | |
| parent | 0934cf4834059cf2d6e3b7e4106d5e04f50ed7f5 (diff) | |
| download | openssl-new-f31ac320012c9aa1540034288ea94f6c80924aa3.tar.gz | |
Implement OpenSSL secure memory for Windows
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/13172)
Diffstat (limited to 'e_os.h')
| -rw-r--r-- | e_os.h | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -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 |