[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  ab9c0d28610ce4ed4185bae325b03e2da5dd76fe (commit)
       via  014cc4b27a7f8ed0cf23a3c9d1fdbf44e41b7993 (commit)
      from  9cbcea7e68f0e805109d7d253c31f02ba37b3b2b (commit)


- Log -----------------------------------------------------------------
commit ab9c0d28610ce4ed4185bae325b03e2da5dd76fe
Author: Andy Polyakov <appro at openssl.org>
Date:   Fri Mar 2 16:50:41 2018 +0100

    test/ctype_internal_test.c: portability fixup.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Ben Kaduk <kaduk at mit.edu>
    (Merged from https://github.com/openssl/openssl/pull/5493)

commit 014cc4b27a7f8ed0cf23a3c9d1fdbf44e41b7993
Author: Andy Polyakov <appro at openssl.org>
Date:   Fri Mar 2 16:50:11 2018 +0100

    mem_sec.c: portability fixup.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Ben Kaduk <kaduk at mit.edu>
    (Merged from https://github.com/openssl/openssl/pull/5493)

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

Summary of changes:
 crypto/mem_sec.c           | 3 +++
 test/ctype_internal_test.c | 8 +++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/crypto/mem_sec.c b/crypto/mem_sec.c
index 77bf165..ab4d137 100644
--- a/crypto/mem_sec.c
+++ b/crypto/mem_sec.c
@@ -45,6 +45,9 @@
 #ifndef PAGE_SIZE
 # define PAGE_SIZE    4096
 #endif
+#if !defined(MAP_ANON) && defined(MAP_ANONYMOUS)
+# define MAP_ANON MAP_ANONYMOUS
+#endif
 
 #ifdef IMPLEMENTED
 static size_t secure_mem_used;
diff --git a/test/ctype_internal_test.c b/test/ctype_internal_test.c
index 9cb2321..f1e392e 100644
--- a/test/ctype_internal_test.c
+++ b/test/ctype_internal_test.c
@@ -15,10 +15,10 @@
 
 /*
  * Even though the VMS C RTL claims to be C99 compatible, it's not entirely
- * so far (C RTL version 8.4).  For the sake of these tests, we therefore
- * define our own.
+ * so far (C RTL version 8.4). Same applies to OSF. For the sake of these
+ * tests, we therefore define our own.
  */
-#if defined(__VMS) && __CRTL_VER <= 80400000
+#if (defined(__VMS) && __CRTL_VER <= 80400000) || defined(__osf__)
 static int isblank(int c)
 {
     return c == ' ' || c == '\t';
@@ -35,7 +35,9 @@ static int test_ctype_chars(int n)
 
     return TEST_int_eq(isalpha(n) != 0, ossl_isalpha(n) != 0)
            && TEST_int_eq(isalnum(n) != 0, ossl_isalnum(n) != 0)
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
            && TEST_int_eq(isblank(n) != 0, ossl_isblank(n) != 0)
+#endif
            && TEST_int_eq(iscntrl(n) != 0, ossl_iscntrl(n) != 0)
            && TEST_int_eq(isdigit(n) != 0, ossl_isdigit(n) != 0)
            && TEST_int_eq(isgraph(n) != 0, ossl_isgraph(n) != 0)