[openssl] master update

[bernd.edlinger at hotmail.de]

The branch master has been updated
       via  35f6fe7ac4fbde98d4fd6af968dfe320011bbe1e (commit)
      from  62cc845fc955c8d4de7b703f57bfd8e5854f00f4 (commit)


- Log -----------------------------------------------------------------
commit 35f6fe7ac4fbde98d4fd6af968dfe320011bbe1e
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Mon Jul 29 12:26:06 2019 +0200

    Fix BIO_printf format warnings
    
    [extended tests]
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/9479)

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

Summary of changes:
 crypto/x509/pcy_tree.c   | 2 +-
 ssl/record/ssl3_record.c | 2 +-
 test/sparse_array_test.c | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/crypto/x509/pcy_tree.c b/crypto/x509/pcy_tree.c
index 0c5887c25a..5d4c6bd839 100644
--- a/crypto/x509/pcy_tree.c
+++ b/crypto/x509/pcy_tree.c
@@ -49,7 +49,7 @@ static void tree_print(BIO *channel,
         curr++;
 
     BIO_printf(channel, "Level print after %s\n", str);
-    BIO_printf(channel, "Printing Up to Level %ld\n",
+    BIO_printf(channel, "Printing Up to Level %zd\n",
                curr - tree->levels);
     for (plev = tree->levels; plev != curr; plev++) {
         int i;
diff --git a/ssl/record/ssl3_record.c b/ssl/record/ssl3_record.c
index d32516e26d..c5614dc08e 100644
--- a/ssl/record/ssl3_record.c
+++ b/ssl/record/ssl3_record.c
@@ -1703,7 +1703,7 @@ int dtls1_process_record(SSL *s, DTLS1_BITMAP *bitmap)
         return 0;
     }
     OSSL_TRACE_BEGIN(TLS) {
-        BIO_printf(trc_out, "dec %ld\n", rr->length);
+        BIO_printf(trc_out, "dec %zd\n", rr->length);
         BIO_dump_indent(trc_out, rr->data, rr->length, 4);
     } OSSL_TRACE_END(TLS);
 
diff --git a/test/sparse_array_test.c b/test/sparse_array_test.c
index 3457a7775f..5cc8038f7f 100644
--- a/test/sparse_array_test.c
+++ b/test/sparse_array_test.c
@@ -122,7 +122,7 @@ static void leaf_check_all(ossl_uintmax_t n, char *value, void *arg)
             doall_data->res = 1;
             return;
         }
-    TEST_error("Index %zu with value %s not found", n, value);
+    TEST_error("Index %ju with value %s not found", n, value);
 }
 
 static void leaf_delete(ossl_uintmax_t n, char *value, void *arg)
@@ -138,7 +138,7 @@ static void leaf_delete(ossl_uintmax_t n, char *value, void *arg)
             ossl_sa_char_set(doall_data->sa, n, NULL);
             return;
         }
-    TEST_error("Index %zu with value %s not found", n, value);
+    TEST_error("Index %ju with value %s not found", n, value);
 }
 
 static int test_sparse_array_doall(void)