Update from stable branch.
diff --git a/apps/s_client.c b/apps/s_client.c
index 93c62b4..2319151 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -429,7 +429,9 @@
int peerlen = sizeof(peer);
int enable_timeouts = 0 ;
long socket_mtu = 0;
+#ifdef OPENSSL_EXPERIMENTAL_JPAKE
char *jpake_secret = NULL;
+#endif
#if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3)
meth=SSLv23_client_method();
@@ -699,11 +701,13 @@
/* meth=TLSv1_client_method(); */
}
#endif
+#ifdef OPENSSL_EXPERIMENTAL_JPAKE
else if (strcmp(*argv,"-jpake") == 0)
{
if (--argc < 1) goto bad;
jpake_secret = *++argv;
}
+#endif
else
{
BIO_printf(bio_err,"unknown option %s\n",*argv);
@@ -1022,9 +1026,10 @@
#endif
}
#endif
-
+#ifdef OPENSSL_EXPERIMENTAL_JPAKE
if (jpake_secret)
jpake_client_auth(bio_c_out, sbio, jpake_secret);
+#endif
SSL_set_bio(con,sbio,sbio);
SSL_set_connect_state(con);
