From: dtucker <dtucker@openbsd.org>
Date: Fri, 1 Jul 2022 05:08:23 +0000 (+0000)
Subject: Remove extra line leftover from merge conflict.  ok djm@
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=74158beac1edd1d22821a1dab07ca6bf1ad63a76;p=openbsd

Remove extra line leftover from merge conflict.  ok djm@
---

diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c
index dc450911ba7..d26eb86aefa 100644
--- a/usr.bin/ssh/sshd.c
+++ b/usr.bin/ssh/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
@@ -2203,8 +2203,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;