[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  1c03c81f52c15eb4f4b8aac158313c31be82e3e5 (commit)
      from  8448b69df2396336e3a3b228ba56fdb6deb1383b (commit)


- Log -----------------------------------------------------------------
commit 1c03c81f52c15eb4f4b8aac158313c31be82e3e5
Author: J Mohan Rao Arisankala <mohan at computer.org>
Date:   Mon Feb 29 22:23:18 2016 +0530

    GH764: s_server: trace option fall through
    
    in s_server cmd:
    specifying -trace option, falls through and turn-on security_debug
    
    Signed-off-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 apps/s_server.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/s_server.c b/apps/s_server.c
index cd7a1e1..5ac3d8f 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -1332,9 +1332,8 @@ int s_server_main(int argc, char *argv[])
         case OPT_TRACE:
 #ifndef OPENSSL_NO_SSL_TRACE
             s_msg = 2;
-#else
-            break;
 #endif
+            break;
         case OPT_SECURITY_DEBUG:
             sdebug = 1;
             break;