Update from stable branch.

[thirdparty/openssl.git] / apps / s_server.c

diff --git a/apps/s_server.c b/apps/s_server.c
index 1bf649b710fa633516de18bd18b58c20ffd4bfb5..6b0d340be28b854ba323a2f46edff167935d89a4 100644 (file)
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -822,7 +822,9 @@ BIO_printf(err, "cert_status: received %d ids\n", sk_OCSP_RESPID_num(ids));
 
 int MAIN(int, char **);
 
+#ifdef OPENSSL_EXPERIMENTAL_JPAKE
 static char *jpake_secret = NULL;
+#endif
 
 int MAIN(int argc, char *argv[])
        {
@@ -1182,11 +1184,13 @@ int MAIN(int argc, char *argv[])
                        }
                        
 #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 @@ static int sv_body(char *hostname, int s, unsigned char *context)
                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);