diff options
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 23984ba..ec3ad6a 100644 --- a/crypto/openssh/sshconnect2.c +++ b/crypto/openssh/sshconnect2.c @@ -1,5 +1,4 @@ /* $OpenBSD: sshconnect2.c,v 1.204 2014/02/02 03:44:32 djm Exp $ */ -/* $FreeBSD$ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2008 Damien Miller. All rights reserved. @@ -80,16 +79,6 @@ 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); } |
