diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2008-11-12 17:28:18 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2008-11-12 17:28:18 +0000 |
| commit | ed551cddf7130a43d992f386e26071e9ee6f105a (patch) | |
| tree | 58cb5d24e5cfd04d97d5c4efa7344097a8cefb5a /apps/s_server.c | |
| parent | 5aca224ecd7fcbcb39b3e302106708cd2f6f0fb9 (diff) | |
Update from stable branch.
Diffstat (limited to 'apps/s_server.c')
| -rw-r--r-- | apps/s_server.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/apps/s_server.c b/apps/s_server.c index 1bf649b710..6b0d340be2 100644 --- 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); |