diff options
author | des <des@FreeBSD.org> | 2015-11-23 12:48:13 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2015-11-23 12:48:13 +0000 |
commit | 24641fd80bf48485d78a92673c1bec422fff009a (patch) | |
tree | 230f252c2608532143f5031930a8a1373fa20da7 /crypto/openssh/readconf.c | |
parent | 643090321a0a0dcd32c9c52721f41a1bd51553ca (diff) | |
download | FreeBSD-src-24641fd80bf48485d78a92673c1bec422fff009a.zip FreeBSD-src-24641fd80bf48485d78a92673c1bec422fff009a.tar.gz |
Retire the NONE cipher option.
Diffstat (limited to 'crypto/openssh/readconf.c')
-rw-r--r-- | crypto/openssh/readconf.c | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/crypto/openssh/readconf.c b/crypto/openssh/readconf.c index d5e9a45..700a79b 100644 --- a/crypto/openssh/readconf.c +++ b/crypto/openssh/readconf.c @@ -154,9 +154,6 @@ typedef enum { oCanonicalizeFallbackLocal, oCanonicalizePermittedCNAMEs, oIgnoredUnknownOption, oHPNDisabled, oHPNBufferSize, oTcpRcvBufPoll, oTcpRcvBuf, -#ifdef NONE_CIPHER_ENABLED - oNoneEnabled, oNoneSwitch, -#endif oVersionAddendum, oDeprecated, oUnsupported } OpCodes; @@ -274,10 +271,6 @@ static struct { { "hpnbuffersize", oHPNBufferSize }, { "tcprcvbufpoll", oTcpRcvBufPoll }, { "tcprcvbuf", oTcpRcvBuf }, -#ifdef NONE_CIPHER_ENABLED - { "noneenabled", oNoneEnabled }, - { "noneswitch", oNoneSwitch }, -#endif { "versionaddendum", oVersionAddendum }, { NULL, oBadOption } @@ -1375,31 +1368,6 @@ parse_int: intptr = &options->tcp_rcv_buf; goto parse_int; -#ifdef NONE_CIPHER_ENABLED - case oNoneEnabled: - intptr = &options->none_enabled; - goto parse_flag; - - /* - * We check to see if the command comes from the command line or not. - * If it does then enable it otherwise fail. NONE must never be a - * default configuration. - */ - case oNoneSwitch: - if (strcmp(filename,"command-line") == 0) { - intptr = &options->none_switch; - goto parse_flag; - } else { - debug("NoneSwitch directive found in %.200s.", - filename); - error("NoneSwitch is found in %.200s.\n" - "You may only use this configuration option " - "from the command line", filename); - error("Continuing..."); - return 0; - } -#endif - case oVersionAddendum: if (s == NULL) fatal("%.200s line %d: Missing argument.", filename, @@ -1659,10 +1627,6 @@ initialize_options(Options * options) options->hpn_buffer_size = -1; options->tcp_rcv_buf_poll = -1; options->tcp_rcv_buf = -1; -#ifdef NONE_CIPHER_ENABLED - options->none_enabled = -1; - options->none_switch = -1; -#endif } /* @@ -1883,11 +1847,6 @@ fill_default_options(Options * options) options->tcp_rcv_buf *= 1024; if (options->tcp_rcv_buf_poll == -1) options->tcp_rcv_buf_poll = 1; -#ifdef NONE_CIPHER_ENABLED - /* options->none_enabled must not be set by default */ - if (options->none_switch == -1) - options->none_switch = 0; -#endif } /* |