[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  0b53fe1cdc24a3dce450e77db6895a0243ddcb26 (commit)
      from  bcc1f3e2baa9caa83a0a94bd19fb37488ef3ee57 (commit)


- Log -----------------------------------------------------------------
commit 0b53fe1cdc24a3dce450e77db6895a0243ddcb26
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Jan 22 14:27:25 2019 +0000

    Fix s_client so that it builds on Windows
    
    Fixes #8050
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/8065)

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

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

diff --git a/apps/s_client.c b/apps/s_client.c
index d788b89..9705c4c 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -2360,9 +2360,11 @@ int s_client_main(int argc, char **argv)
                 if (proxypass != NULL)
                     l += strlen(proxypass);
                 proxyauth = app_malloc(l + 2, "Proxy auth string");
-                snprintf(proxyauth, l + 2, "%s:%s", proxyuser, (proxypass != NULL) ? proxypass : "");
+                BIO_snprintf(proxyauth, l + 2, "%s:%s", proxyuser,
+                             (proxypass != NULL) ? proxypass : "");
                 proxyauthenc = base64encode(proxyauth, strlen(proxyauth));
-                BIO_printf(fbio, "Proxy-Authorization: Basic %s\r\n", proxyauthenc); 
+                BIO_printf(fbio, "Proxy-Authorization: Basic %s\r\n",
+                           proxyauthenc);
                 OPENSSL_clear_free(proxyauth, strlen(proxyauth));
                 OPENSSL_clear_free(proxyauthenc, strlen(proxyauthenc));
             }