[openssh-commits] [openssh] 03/03: upstream: Remove leftover line.

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit 322964f8f2e9c321e77ebae1e4d2cd0ccc5c5a0b
Author: dtucker at openbsd.org <dtucker at openbsd.org>
Date:   Fri Jul 1 05:08:23 2022 +0000

    upstream: Remove leftover line.
    
    Remove extra line leftover from merge conflict. ok djm@
    
    OpenBSD-Commit-ID: 460e2290875d7ae64971a7e669c244b1d1c0ae2e
---
 sshd.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/sshd.c b/sshd.c
index e0680d3f..17eee9d8 100644
--- 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 at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at 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;
 

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.