diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2008-11-24 16:14:15 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2008-11-24 16:14:15 +0000 |
| commit | 5a02ac6e5b31ab588b2d80fde4843a87cec25198 (patch) | |
| tree | 546f1cb3681bf57c5e559633d3caaec2d8dd86c7 /apps/s_client.c | |
| parent | 14d4074ee1d328e6dd70ad010f6a0ae50887794d (diff) | |
Revert OPENSSL_EXPERIMENTAL patch.
Change it so JPAKE uses the standard OPENSSL_NO_JPAKE instead.
Diffstat (limited to 'apps/s_client.c')
| -rw-r--r-- | apps/s_client.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/s_client.c b/apps/s_client.c index 9686b0a190..dc1308b288 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -338,7 +338,7 @@ int MAIN(int argc, char **argv) int peerlen = sizeof(peer); int enable_timeouts = 0 ; long mtu = 0; -#ifdef OPENSSL_EXPERIMENTAL_JPAKE +#ifndef OPENSSL_NO_JPAKE char *jpake_secret = NULL; #endif @@ -585,7 +585,7 @@ int MAIN(int argc, char **argv) /* meth=TLSv1_client_method(); */ } #endif -#ifdef OPENSSL_EXPERIMENTAL_JPAKE +#ifndef OPENSSL_NO_JPAKE else if (strcmp(*argv,"-jpake") == 0) { if (--argc < 1) goto bad; @@ -897,7 +897,7 @@ SSL_set_tlsext_status_ids(con, ids); #endif } #endif -#ifdef OPENSSL_EXPERIMENTAL_JPAKE +#ifndef OPENSSL_NO_JPAKE if (jpake_secret) jpake_client_auth(bio_c_out, sbio, jpake_secret); #endif |