summaryrefslogtreecommitdiffstats
path: root/crypto/openssh/sshconnect2.c
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2014-04-20 11:34:33 +0000
committerdes <des@FreeBSD.org>2014-04-20 11:34:33 +0000
commite1e5f20b8815dab6b04e73d6ba98044da9075bbc (patch)
treec924bd7387ade2fccece4f9941549459346b5111 /crypto/openssh/sshconnect2.c
parent532d55ab5f5e84d53dbf378356c60f27a7d7bdb4 (diff)
downloadFreeBSD-src-e1e5f20b8815dab6b04e73d6ba98044da9075bbc.zip
FreeBSD-src-e1e5f20b8815dab6b04e73d6ba98044da9075bbc.tar.gz
Apply upstream patch for EC calculation bug and bump version addendum.
Diffstat (limited to 'crypto/openssh/sshconnect2.c')
-rw-r--r--crypto/openssh/sshconnect2.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/openssh/sshconnect2.c b/crypto/openssh/sshconnect2.c
index eb86ab1..1bf0193 100644
--- a/crypto/openssh/sshconnect2.c
+++ b/crypto/openssh/sshconnect2.c
@@ -207,6 +207,8 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port)
}
if (options.kex_algorithms != NULL)
myproposal[PROPOSAL_KEX_ALGS] = options.kex_algorithms;
+ myproposal[PROPOSAL_KEX_ALGS] = compat_kex_proposal(
+ myproposal[PROPOSAL_KEX_ALGS]);
if (options.rekey_limit || options.rekey_interval)
packet_set_rekey_limits((u_int32_t)options.rekey_limit,
OpenPOWER on IntegriCloud