1 files changed, 17 insertions, 3 deletions

diff --git a/src/lib/libssl/src/apps/s_server.c b/src/lib/libssl/src/apps/s_server.c
index 7919c437c6..84b1b28461 100644
--- a/src/lib/libssl/src/apps/s_server.c
+++ b/src/lib/libssl/src/apps/s_server.c
@@ -742,6 +742,10 @@ BIO_printf(err, "cert_status: received %d ids\n", sk_OCSP_RESPID_num(ids));
 #endif
 int MAIN(int, char **);
 
+#ifndef OPENSSL_NO_JPAKE
+static char *jpake_secret = NULL;
+#endif
+
 int MAIN(int argc, char *argv[])
         {
         X509_STORE *store = NULL;
@@ -760,9 +764,7 @@ int MAIN(int argc, char *argv[])
         int state=0;
         SSL_METHOD *meth=NULL;
         int socket_type=SOCK_STREAM;
-#ifndef OPENSSL_NO_ENGINE
         ENGINE *e=NULL;
-#endif
         char *inrand=NULL;
         int s_cert_format = FORMAT_PEM, s_key_format = FORMAT_PEM;
         char *passarg = NULL, *pass = NULL;
@@ -774,7 +776,6 @@ int MAIN(int argc, char *argv[])
         EVP_PKEY *s_key2 = NULL;
         X509 *s_cert2 = NULL;
 #endif
-
 #ifndef OPENSSL_NO_TLSEXT
         tlsextctx tlsextcbp = {NULL, NULL, SSL_TLSEXT_ERR_ALERT_WARNING};
 #endif
@@ -1071,6 +1072,14 @@ int MAIN(int argc, char *argv[])
                         if (--argc < 1) goto bad;
                         s_key_file2= *(++argv);
                         }
+                        
+#endif
+#ifndef OPENSSL_NO_JPAKE
+                else if (strcmp(*argv,"-jpake") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        jpake_secret = *(++argv);
+                        }
 #endif
                 else
                         {
@@ -1673,6 +1682,11 @@ static int sv_body(char *hostname, int s, unsigned char *context)
                 test=BIO_new(BIO_f_nbio_test());
                 sbio=BIO_push(test,sbio);
                 }
+#ifndef OPENSSL_NO_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);
         /* SSL_set_fd(con,s); */