Oops... missed this part of backport.

diff --git a/apps/s_client.c b/apps/s_client.c
index 9a0989fc42271612ef63830938765147ff577b34..60a8d13df1987333c463ca74e79080d00c4930d8 100644 (file)
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -673,6 +673,20 @@ bad:
                goto end;
                }
 
+#ifndef OPENSSL_NO_ENGINE
+       if (ssl_client_engine)
+               {
+               if (!SSL_CTX_set_client_cert_engine(ctx, ssl_client_engine))
+                       {
+                       BIO_puts(bio_err, "Error setting client auth engine\n");
+                       ERR_print_errors(bio_err);
+                       ENGINE_free(ssl_client_engine);
+                       goto end;
+                       }
+               ENGINE_free(ssl_client_engine);
+               }
+#endif
+
        if (bugs)
                SSL_CTX_set_options(ctx,SSL_OP_ALL|off);
        else