summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorBodo Moeller <bodo@openssl.org>2014-10-15 10:43:50 +0200
committerBodo Moeller <bodo@openssl.org>2014-10-15 10:43:50 +0200
commitfb0e87fb67a358b40a1d56d2df3a611a09899780 (patch)
treecb2a2a4b0136e83469283bae50b5b5b8bdff984a /apps
parentcf6da05304d554aaa885151451aa4ecaa977e601 (diff)
Add TLS_FALLBACK_SCSV documentation, and move s_client -fallback_scsv
handling out of #ifndef OPENSSL_NO_DTLS1 section. Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'apps')
-rw-r--r--apps/s_client.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/s_client.c b/apps/s_client.c
index d56dc8d47f..a6f972a8a9 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -942,10 +942,6 @@ static char *jpake_secret = NULL;
meth=DTLSv1_2_client_method();
socket_type=SOCK_DGRAM;
}
- else if (strcmp(*argv,"-fallback_scsv") == 0)
- {
- fallback_scsv = 1;
- }
else if (strcmp(*argv,"-timeout") == 0)
enable_timeouts=1;
else if (strcmp(*argv,"-mtu") == 0)
@@ -954,6 +950,10 @@ static char *jpake_secret = NULL;
socket_mtu = atol(*(++argv));
}
#endif
+ else if (strcmp(*argv,"-fallback_scsv") == 0)
+ {
+ fallback_scsv = 1;
+ }
else if (strcmp(*argv,"-keyform") == 0)
{
if (--argc < 1) goto bad;