Skip to content

Commit

Permalink
Fix typos in s_client
Browse files Browse the repository at this point in the history
There was some typos of OPENSS_NO_QUIC (should be OPENSSL_NO_QUIC) in
s_client

Fixes #21291

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from #21293)
  • Loading branch information
mattcaswell authored and paulidale committed Jun 29, 2023
1 parent ed5c0df commit 55d3a6b
Showing 1 changed file with 0 additions and 16 deletions.
16 changes: 0 additions & 16 deletions apps/s_client.c
Expand Up @@ -1285,9 +1285,7 @@ int s_client_main(int argc, char **argv)
#ifndef OPENSSL_NO_DTLS
isdtls = 0;
#endif
#ifndef OPENSS_NO_QUIC
isquic = 0;
#endif
break;
case OPT_TLS1_3:
min_version = TLS1_3_VERSION;
Expand All @@ -1296,9 +1294,7 @@ int s_client_main(int argc, char **argv)
#ifndef OPENSSL_NO_DTLS
isdtls = 0;
#endif
#ifndef OPENSS_NO_QUIC
isquic = 0;
#endif
break;
case OPT_TLS1_2:
min_version = TLS1_2_VERSION;
Expand All @@ -1307,9 +1303,7 @@ int s_client_main(int argc, char **argv)
#ifndef OPENSSL_NO_DTLS
isdtls = 0;
#endif
#ifndef OPENSS_NO_QUIC
isquic = 0;
#endif
break;
case OPT_TLS1_1:
min_version = TLS1_1_VERSION;
Expand All @@ -1318,9 +1312,7 @@ int s_client_main(int argc, char **argv)
#ifndef OPENSSL_NO_DTLS
isdtls = 0;
#endif
#ifndef OPENSS_NO_QUIC
isquic = 0;
#endif
break;
case OPT_TLS1:
min_version = TLS1_VERSION;
Expand All @@ -1329,18 +1321,14 @@ int s_client_main(int argc, char **argv)
#ifndef OPENSSL_NO_DTLS
isdtls = 0;
#endif
#ifndef OPENSS_NO_QUIC
isquic = 0;
#endif
break;
case OPT_DTLS:
#ifndef OPENSSL_NO_DTLS
meth = DTLS_client_method();
socket_type = SOCK_DGRAM;
isdtls = 1;
# ifndef OPENSS_NO_QUIC
isquic = 0;
# endif
#endif
break;
case OPT_DTLS1:
Expand All @@ -1350,9 +1338,7 @@ int s_client_main(int argc, char **argv)
max_version = DTLS1_VERSION;
socket_type = SOCK_DGRAM;
isdtls = 1;
# ifndef OPENSS_NO_QUIC
isquic = 0;
# endif
#endif
break;
case OPT_DTLS1_2:
Expand All @@ -1362,9 +1348,7 @@ int s_client_main(int argc, char **argv)
max_version = DTLS1_2_VERSION;
socket_type = SOCK_DGRAM;
isdtls = 1;
# ifndef OPENSS_NO_QUIC
isquic = 0;
# endif
#endif
break;
case OPT_QUIC:
Expand Down

0 comments on commit 55d3a6b

Please sign in to comment.