upstream: Remove leftover line.

Remove extra line leftover from merge conflict. ok djm@

OpenBSD-Commit-ID: 460e2290875d7ae64971a7e669c244b1d1c0ae2e

diff --git a/sshd.c b/sshd.c
index e0680d3f5b41f8a45514dba082869c5d2932bf72..17eee9d83aab8e5759b65e0bac545273115152c4 100644 (file)
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.589 2022/07/01 03:39:44 dtucker Exp $ */
+/* $OpenBSD: sshd.c,v 1.590 2022/07/01 05:08:23 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2376,8 +2376,6 @@ do_ssh2_kex(struct ssh *ssh)
        myproposal[PROPOSAL_ENC_ALGS_CTOS] =
            myproposal[PROPOSAL_ENC_ALGS_STOC] = prop_enc =
            compat_cipher_proposal(ssh, options.ciphers);
-       myproposal[PROPOSAL_ENC_ALGS_STOC] = compat_cipher_proposal(ssh,
-           options.ciphers);
        myproposal[PROPOSAL_MAC_ALGS_CTOS] =
            myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs;