Add JPAKE.
diff --git a/apps/s_server.c b/apps/s_server.c
index c95057a..1bf649b 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -822,6 +822,8 @@
int MAIN(int, char **);
+static char *jpake_secret = NULL;
+
int MAIN(int argc, char *argv[])
{
X509_STORE *store = NULL;
@@ -854,7 +856,6 @@
EVP_PKEY *s_key2 = NULL;
X509 *s_cert2 = NULL;
#endif
-
#ifndef OPENSSL_NO_TLSEXT
tlsextctx tlsextcbp = {NULL, NULL, SSL_TLSEXT_ERR_ALERT_WARNING};
#endif
@@ -1179,7 +1180,13 @@
if (--argc < 1) goto bad;
s_key_file2= *(++argv);
}
+
#endif
+ else if (strcmp(*argv,"-jpake") == 0)
+ {
+ if (--argc < 1) goto bad;
+ jpake_secret = *(++argv);
+ }
else
{
BIO_printf(bio_err,"unknown option %s\n",*argv);
@@ -1807,6 +1814,10 @@
test=BIO_new(BIO_f_nbio_test());
sbio=BIO_push(test,sbio);
}
+
+ if(jpake_secret)
+ jpake_server_auth(bio_s_out, sbio, jpake_secret);
+
SSL_set_bio(con,sbio,sbio);
SSL_set_accept_state(con);
/* SSL_set_fd(con,s); */
