From 322964f8f2e9c321e77ebae1e4d2cd0ccc5c5a0b Mon Sep 17 00:00:00 2001 From: "dtucker@openbsd.org" Date: Fri, 1 Jul 2022 05:08:23 +0000 Subject: [PATCH] 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 e0680d3f5..17eee9d83 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 * Copyright (c) 1995 Tatu Ylonen , 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;