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/sshconnect2.c | |
parent | 643090321a0a0dcd32c9c52721f41a1bd51553ca (diff) | |
download | FreeBSD-src-24641fd80bf48485d78a92673c1bec422fff009a.zip FreeBSD-src-24641fd80bf48485d78a92673c1bec422fff009a.tar.gz |
Retire the NONE cipher option.
Diffstat (limited to 'crypto/openssh/sshconnect2.c')
-rw-r--r-- | crypto/openssh/sshconnect2.c | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/crypto/openssh/sshconnect2.c b/crypto/openssh/sshconnect2.c index 37a6858..ec3ad6a 100644 --- a/crypto/openssh/sshconnect2.c +++ b/crypto/openssh/sshconnect2.c @@ -25,7 +25,6 @@ */ #include "includes.h" -__RCSID("$FreeBSD$"); #include <sys/types.h> #include <sys/socket.h> @@ -80,16 +79,6 @@ __RCSID("$FreeBSD$"); extern char *client_version_string; extern char *server_version_string; extern Options options; -#ifdef NONE_CIPHER_ENABLED -extern Kex *xxx_kex; - -/* - * tty_flag is set in ssh.c so we can use it here. If set then prevent - * the switch to the null cipher. - */ - -extern int tty_flag; -#endif /* * SSH2 key exchange @@ -422,29 +411,6 @@ ssh_userauth2(const char *local_user, const char *server_user, char *host, pubkey_cleanup(&authctxt); dispatch_range(SSH2_MSG_USERAUTH_MIN, SSH2_MSG_USERAUTH_MAX, NULL); -#ifdef NONE_CIPHER_ENABLED - /* - * If the user explicitly requests to use the none cipher enable it - * post authentication and only if the right conditions are met: both - * of the NONE switches must be true and there must be no tty allocated. - */ - if (options.none_switch == 1 && options.none_enabled == 1) { - if (!tty_flag) { - debug("Requesting none cipher re-keying..."); - myproposal[PROPOSAL_ENC_ALGS_STOC] = "none"; - myproposal[PROPOSAL_ENC_ALGS_CTOS] = "none"; - kex_prop2buf(&xxx_kex->my, myproposal); - packet_request_rekeying(); - fprintf(stderr, "WARNING: enabled NONE cipher\n"); - } else { - /* Requested NONE cipher on an interactive session. */ - debug("Cannot switch to NONE cipher with tty " - "allocated"); - fprintf(stderr, "NONE cipher switch disabled given " - "a TTY is allocated\n"); - } - } -#endif debug("Authentication succeeded (%s).", authctxt.method->name); } |