[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  b76998b86c3f63bea7f8b85c8b62fda91fb8f4b7 (commit)
      from  5bb9e2b48b67f6217f7394ea6947b5ff5b8c4e39 (commit)


- Log -----------------------------------------------------------------
commit b76998b86c3f63bea7f8b85c8b62fda91fb8f4b7
Author: Rich Salz <rsalz at akamai.com>
Date:   Tue Mar 8 09:38:30 2016 -0500

    Fix build; ssltest
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 test/ssltest.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/ssltest.c b/test/ssltest.c
index a8918db..71cc126 100644
--- a/test/ssltest.c
+++ b/test/ssltest.c
@@ -207,8 +207,8 @@
 # include OPENSSL_UNISTD
 #endif
 
-SSL_CTX *s_ctx = NULL;
-SSL_CTX *s_ctx2 = NULL;
+static SSL_CTX *s_ctx = NULL;
+static SSL_CTX *s_ctx2 = NULL;
 
 /*
  * There is really no standard for this, so let's assign something
@@ -1626,7 +1626,7 @@ int main(int argc, char *argv[])
         rv = SSL_CONF_cmd(c_cctx, arg, argn);
         /* If not recognised use server context */
         if (rv == -2) {
-            SSL_CONF_cmd(s_cctx2, arg, argn);
+            (void)SSL_CONF_cmd(s_cctx2, arg, argn);
             rv = SSL_CONF_cmd(s_cctx, arg, argn);
         }
         if (rv <= 0) {