diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2022-07-01 05:08:23 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2022-07-01 16:00:17 +1000 |
| commit | 322964f8f2e9c321e77ebae1e4d2cd0ccc5c5a0b (patch) | |
| tree | 886eea514d79ca72b2472aaf743f9f073fcf9d84 /sshd.c | |
| parent | 7ec81daad0e03a64e8d91c5590960c48c1a899a3 (diff) | |
upstream: Remove leftover line.
Remove extra line leftover from merge conflict. ok djm@
OpenBSD-Commit-ID: 460e2290875d7ae64971a7e669c244b1d1c0ae2e
Diffstat (limited to 'sshd.c')
| -rw-r--r-- | sshd.c | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -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; |