[openssl-commits] [openssl] master update

[Ben Laurie]

The branch master has been updated
       via  34750dc25d74e3db4c1ba43cd219d3f4825e4c65 (commit)
      from  e1e088ec7f2f33c4c4ad31312d62c536441d4358 (commit)


- Log -----------------------------------------------------------------
commit 34750dc25d74e3db4c1ba43cd219d3f4825e4c65
Author: Ben Laurie <ben at links.org>
Date:   Fri Jul 31 09:49:20 2015 +0100

    Only define PAGE_SIZE if not already defined.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 crypto/sec_mem.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/crypto/sec_mem.c b/crypto/sec_mem.c
index 5bf8baa..a630cbc 100644
--- a/crypto/sec_mem.c
+++ b/crypto/sec_mem.c
@@ -26,7 +26,9 @@
 #define LOCK()      CRYPTO_w_lock(CRYPTO_LOCK_MALLOC)
 #define UNLOCK()    CRYPTO_w_unlock(CRYPTO_LOCK_MALLOC)
 #define CLEAR(p, s) OPENSSL_cleanse(p, s)
-#define PAGE_SIZE    4096
+#ifndef PAGE_SIZE
+# define PAGE_SIZE    4096
+#endif
 
 #ifdef IMPLEMENTED
 size_t secure_mem_used;