[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  b2d6aed499e584e0da232fd109459cf7743f00fe (commit)
      from  a8a355402cf2b75fd8fffcd56f9abf6e9c5fae4a (commit)


- Log -----------------------------------------------------------------
commit b2d6aed499e584e0da232fd109459cf7743f00fe
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Mar 8 21:13:05 2016 +0000

    Fix error in ssltest
    
    Compiling ssltest with some compilers using --strict-warnings results in
    complaints about an unused result.
    
    Reviewed-by: Kurt Roeckx <kurt at openssl.org>

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

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

diff --git a/test/ssltest.c b/test/ssltest.c
index 71cc126..2ca4d69 100644
--- a/test/ssltest.c
+++ b/test/ssltest.c
@@ -1626,8 +1626,9 @@ int main(int argc, char *argv[])
         rv = SSL_CONF_cmd(c_cctx, arg, argn);
         /* If not recognised use server context */
         if (rv == -2) {
-            (void)SSL_CONF_cmd(s_cctx2, arg, argn);
-            rv = SSL_CONF_cmd(s_cctx, arg, argn);
+            rv = SSL_CONF_cmd(s_cctx2, arg, argn);
+            if (rv > 0)
+                rv = SSL_CONF_cmd(s_cctx, arg, argn);
         }
         if (rv <= 0) {
             BIO_printf(bio_err, "Error processing %s %s\n",