[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  9ff2cebf29d30397b3b67603000f67ee429c700b (commit)
      from  8f3f9623a46fb4e294a7e4c3db3168002e3f781b (commit)


- Log -----------------------------------------------------------------
commit 9ff2cebf29d30397b3b67603000f67ee429c700b
Author: Todd Short <tshort at akamai.com>
Date:   Wed Apr 26 14:42:14 2017 -0400

    Fix s_client when no-dtls
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3344)

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

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

diff --git a/apps/s_client.c b/apps/s_client.c
index 443822b..d018268 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -906,7 +906,9 @@ int s_client_main(int argc, char **argv)
 #endif
     BIO *bio_c_msg = NULL;
     const char *keylog_file = NULL, *early_data_file = NULL;
+#ifndef OPENSSL_NO_DTLS
     int isdtls = 0;
+#endif
 
     FD_ZERO(&readfds);
     FD_ZERO(&writefds);