[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  dbaa069a5eb7892b3178a21839a0e14b8d808d81 (commit)
      from  d734582275aa29ef839af2130ae84af20b84425e (commit)


- Log -----------------------------------------------------------------
commit dbaa069a5eb7892b3178a21839a0e14b8d808d81
Author: edelangh <edelangh at student.42.fr>
Date:   Fri Feb 17 13:23:22 2017 +0100

    use OSSLzu instead of lu format for size_t display
    
    CLA: trivial
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2660)

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

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

diff --git a/apps/passwd.c b/apps/passwd.c
index 9be9284..5be728f 100644
--- a/apps/passwd.c
+++ b/apps/passwd.c
@@ -555,8 +555,8 @@ static char *shacrypt(const char *passwd, const char *magic, const char *salt)
     OPENSSL_strlcat(out_buf, magic, sizeof out_buf);
     OPENSSL_strlcat(out_buf, "$", sizeof out_buf);
     if (rounds_custom) {
-        char tmp_buf[7 + 9 + 1]; /* "rounds=999999999" */
-        sprintf(tmp_buf, "rounds=%lu", rounds);
+        char tmp_buf[80]; /* "rounds=999999999" */
+        sprintf(tmp_buf, "rounds=%"OSSLzu, rounds);
         OPENSSL_strlcat(out_buf, tmp_buf, sizeof out_buf);
         OPENSSL_strlcat(out_buf, "$", sizeof out_buf);
     }