control: tags -1 + patch fixed-upstream On 2014-10-23 08:36:18 [+0200], Kurt Roeckx wrote: > > Applications can request is explicitly. They shouldn't, and I > don't want them to do that.
Kurt removed the v2 option from the tool upstream, it just did not make into the Debian version (yet). The patch attached contains a ifdef so the v2 option can not be seen. The patch is about the v2 option. If we stick strickly to the bug report (which is about v3) then we can close the bug for unstable. I see the v2 and v3 options only in stable. > Kurt Sebastian
>From ed49066c864e823fc462fffd0c4a28943fc04680 Mon Sep 17 00:00:00 2001 From: Sebastian Andrzej Siewior <[email protected]> Date: Mon, 21 Mar 2016 16:14:19 +0100 Subject: [PATCH] put ifdefs arround SSLv2 code in s_client As of commit 45f55f6a5 ("Remove SSLv2 support") the SSLv2 support has been removed. This patch puts a ifdef around so we don't offer the "-sslv2" option which is not available. Signed-off-by: Sebastian Andrzej Siewior <[email protected]> --- apps/s_client.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/apps/s_client.c b/apps/s_client.c index 0c1102b9c36a..91c6a228a33f 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -376,7 +376,9 @@ static void sc_usage(void) " -srp_strength int - minimal length in bits for N (default %d).\n", SRP_MINIMAL_N); #endif +#ifndef OPENSSL_NO_SSL2 BIO_printf(bio_err, " -ssl2 - just use SSLv2\n"); +#endif #ifndef OPENSSL_NO_SSL3_METHOD BIO_printf(bio_err, " -ssl3 - just use SSLv3\n"); #endif @@ -387,7 +389,11 @@ static void sc_usage(void) BIO_printf(bio_err, " -fallback_scsv - send TLS_FALLBACK_SCSV\n"); BIO_printf(bio_err, " -mtu - set the link layer MTU\n"); BIO_printf(bio_err, - " -no_tls1_2/-no_tls1_1/-no_tls1/-no_ssl3/-no_ssl2 - turn off that protocol\n"); + " -no_tls1_2/-no_tls1_1/-no_tls1/-no_ssl3" +#ifndef OPENSSL_NO_SSL2 + "/-no_ssl2" +#endif + "- turn off that protocol\n"); BIO_printf(bio_err, " -bugs - Switch on all SSL implementation bug workarounds\n"); BIO_printf(bio_err, -- 2.7.0
