summaryrefslogtreecommitdiffstats
path: root/kex.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2019-01-21 13:08:13 +0100
committerDamien Miller <djm@mindrot.org>2019-01-21 13:13:53 +0100
commit70edd73edc4df54e5eee50cd27c25427b34612f8 (patch)
treed60fb0d0cf4cc75e3fc5916c61f12d189bdcc5ab /kex.c
parentupstream: forgot to cvs add this file in previous series of commits; (diff)
downloadopenssh-70edd73edc4df54e5eee50cd27c25427b34612f8.tar.xz
openssh-70edd73edc4df54e5eee50cd27c25427b34612f8.zip
upstream: fix reversed arguments to kex_load_hostkey(); manifested as
errors in cert-hostkey.sh regress failures. OpenBSD-Commit-ID: 12dab63850b844f84d5a67e86d9e21a42fba93ba
Diffstat (limited to 'kex.c')
-rw-r--r--kex.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kex.c b/kex.c
index cec9b2985..34808b5c3 100644
--- a/kex.c
+++ b/kex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.c,v 1.149 2019/01/21 10:40:11 djm Exp $ */
+/* $OpenBSD: kex.c,v 1.150 2019/01/21 12:08:13 djm Exp $ */
/*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
*
@@ -1039,7 +1039,7 @@ kex_derive_keys(struct ssh *ssh, u_char *hash, u_int hashlen,
}
int
-kex_load_hostkey(struct ssh *ssh, struct sshkey **pubp, struct sshkey **prvp)
+kex_load_hostkey(struct ssh *ssh, struct sshkey **prvp, struct sshkey **pubp)
{
struct kex *kex = ssh->kex;