commit ed551cddf7130a43d992f386e26071e9ee6f105a
author Dr. Stephen Henson <steve@openssl.org> Wed Nov 12 17:28:18 2008 +0000
committer Dr. Stephen Henson <steve@openssl.org> Wed Nov 12 17:28:18 2008 +0000
tree 58cb5d24e5cfd04d97d5c4efa7344097a8cefb5a
parent 5aca224ecd7fcbcb39b3e302106708cd2f6f0fb9

Update from stable branch.

apps/s_server.c

diff --git a/apps/s_server.c b/apps/s_server.c
index 1bf649b..6b0d340 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -822,7 +822,9 @@
 
 int MAIN(int, char **);
 
+#ifdef OPENSSL_EXPERIMENTAL_JPAKE
 static char *jpake_secret = NULL;
+#endif
 
 int MAIN(int argc, char *argv[])
 	{
@@ -1182,11 +1184,13 @@
 			}
 			
 #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);
@@ -1814,9 +1818,10 @@
 		test=BIO_new(BIO_f_nbio_test());
 		sbio=BIO_push(test,sbio);
 		}
-
+#ifdef OPENSSL_EXPERIMENTAL_JPAKE
 	if(jpake_secret)
 		jpake_server_auth(bio_s_out, sbio, jpake_secret);
+#endif
 
 	SSL_set_bio(con,sbio,sbio);
 	SSL_set_accept_state(con);