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/sshd.c | |
| parent | 643090321a0a0dcd32c9c52721f41a1bd51553ca (diff) | |
| download | FreeBSD-src-24641fd80bf48485d78a92673c1bec422fff009a.zip FreeBSD-src-24641fd80bf48485d78a92673c1bec422fff009a.tar.gz | |
Retire the NONE cipher option.
Diffstat (limited to 'crypto/openssh/sshd.c')
| -rw-r--r-- | crypto/openssh/sshd.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/crypto/openssh/sshd.c b/crypto/openssh/sshd.c index e59fb3d..ab73dec 100644 --- a/crypto/openssh/sshd.c +++ b/crypto/openssh/sshd.c @@ -2501,12 +2501,6 @@ do_ssh2_kex(void) if (options.ciphers != NULL) { myproposal[PROPOSAL_ENC_ALGS_CTOS] = myproposal[PROPOSAL_ENC_ALGS_STOC] = options.ciphers; -#ifdef NONE_CIPHER_ENABLED - } else if (options.none_enabled == 1) { - debug ("WARNING: None cipher enabled"); - myproposal[PROPOSAL_ENC_ALGS_CTOS] = - myproposal[PROPOSAL_ENC_ALGS_STOC] = KEX_ENCRYPT_INCLUDE_NONE; -#endif } myproposal[PROPOSAL_ENC_ALGS_CTOS] = compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_CTOS]); |
