[openssl] master update

patrick.steuer at de.ibm.com patrick.steuer at de.ibm.com
Sun Nov 3 15:57:33 UTC 2019

The branch master has been updated
       via  e774adb593e7bf9057775d85ecc7c24e9bacee12 (commit)
      from  6f93f06135cbbd36c3fe98d63717e8303a5d559b (commit)

- Log -----------------------------------------------------------------
commit e774adb593e7bf9057775d85ecc7c24e9bacee12
Author: Patrick Steuer <patrick.steuer at de.ibm.com>
Date:   Sat Nov 2 14:50:28 2019 +0100

    Fix --strict-warnings build
    The %zd format corresponds to ssize_t which is used for
    function to either return a valid size or a negative value
    to indicate an error. Since size_t is in [-1,SSIZE_MAX] it
    is not a portable way to represent a pointer diff. For
    the %td format which corresponds to ptrdiff_t is C11,
    we chose to cast to long instead as it is already done
    in other places.
    Signed-off-by: Patrick Steuer <patrick.steuer at de.ibm.com>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/10335)


Summary of changes:
 crypto/x509/pcy_tree.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/x509/pcy_tree.c b/crypto/x509/pcy_tree.c
index 8ab0914373..fa11e5e47a 100644
--- a/crypto/x509/pcy_tree.c
+++ b/crypto/x509/pcy_tree.c
@@ -49,8 +49,8 @@ static void tree_print(BIO *channel,
     BIO_printf(channel, "Level print after %s\n", str);
-    BIO_printf(channel, "Printing Up to Level %zd\n",
-               curr - tree->levels);
+    BIO_printf(channel, "Printing Up to Level %ld\n",
+               (long)(curr - tree->levels));
     for (plev = tree->levels; plev != curr; plev++) {
         int i;

More information about the openssl-commits mailing list