[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  52f4840cb237cc37cad5eac8328828cf3d3e1049 (commit)
      from  deb2d5e7e3d5549d2be0f9c3fde2f257ae378152 (commit)


- Log -----------------------------------------------------------------
commit 52f4840cb237cc37cad5eac8328828cf3d3e1049
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Tue Feb 14 17:18:00 2017 +0000

    Make -xcert work again.
    
    When a certificate is prepended update the list pointer.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2628)

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

Summary of changes:
 apps/s_cb.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/s_cb.c b/apps/s_cb.c
index e0d432d..0111c24 100644
--- a/apps/s_cb.c
+++ b/apps/s_cb.c
@@ -944,6 +944,7 @@ int args_excert(int opt, SSL_EXCERT **pexc)
             BIO_printf(bio_err, "%s: Error adding xcert\n", opt_getprog());
             goto err;
         }
+        *pexc = exc;
         exc->certfile = opt_arg();
         break;
     case OPT_X_KEY: