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_client.c | |
| parent | 5aca224ecd7fcbcb39b3e302106708cd2f6f0fb9 (diff) | |
Update from stable branch.
Diffstat (limited to 'apps/s_client.c')
| -rw-r--r-- | apps/s_client.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/apps/s_client.c b/apps/s_client.c index 93c62b4386..231915160e 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -429,7 +429,9 @@ int MAIN(int argc, char **argv) int peerlen = sizeof(peer); int enable_timeouts = 0 ; long socket_mtu = 0; +#ifdef OPENSSL_EXPERIMENTAL_JPAKE char *jpake_secret = NULL; +#endif #if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3) meth=SSLv23_client_method(); @@ -699,11 +701,13 @@ int MAIN(int argc, char **argv) /* meth=TLSv1_client_method(); */ } #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); @@ -1022,9 +1026,10 @@ SSL_set_tlsext_status_ids(con, ids); #endif } #endif - +#ifdef OPENSSL_EXPERIMENTAL_JPAKE if (jpake_secret) jpake_client_auth(bio_c_out, sbio, jpake_secret); +#endif SSL_set_bio(con,sbio,sbio); SSL_set_connect_state(con); |