diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2015-02-12 04:23:18 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2015-02-12 04:23:18 +0000 |
| commit | e3213d47a875fe9ed6557bf4728158ae27445eec (patch) | |
| tree | a21f2f90bbc069c7db9439dab321edc762ffafc2 /usr.bin/ftp/main.c | |
| parent | d1e3221766c47552c8a90ce9ce84ec6e354acfb1 (diff) | |
Change TLS_PROTOCOLS_DEFAULT to be TLSv1.2 only. Add a TLS_PROTOCOLS_ALL
that includes all currently supported protocols (TLSv1.0, TLSv1.1 and
TLSv1.2). Change all users of libtls to use TLS_PROTOCOLS_ALL so that they
maintain existing behaviour.
Discussed with tedu@ and reyk@.
Diffstat (limited to 'usr.bin/ftp/main.c')
| -rw-r--r-- | usr.bin/ftp/main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.bin/ftp/main.c b/usr.bin/ftp/main.c index 5e2595d4dbf..ae333c0479f 100644 --- a/usr.bin/ftp/main.c +++ b/usr.bin/ftp/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.97 2015/02/09 08:24:21 tedu Exp $ */ +/* $OpenBSD: main.c,v 1.98 2015/02/12 04:23:17 jsing Exp $ */ /* $NetBSD: main.c,v 1.24 1997/08/18 10:20:26 lukem Exp $ */ /* @@ -312,6 +312,8 @@ main(volatile int argc, char *argv[]) tls_config = tls_config_new(); if (tls_config == NULL) errx(1, "tls config failed"); + tls_config_set_protocols(tls_config, + TLS_PROTOCOLS_ALL); } cp = optarg; |