upstream: factor out kex_load_hostkey() - this is duplicated in

both the client and server implementations for most KEX methods.

from markus@ ok djm@

OpenBSD-Commit-ID: 8232fa7c21fbfbcaf838313b0c166dc6c8762f3c

1 files changed, 3 insertions, 13 deletions

diff --git a/kexecdhs.c b/kexecdhs.c
index 4ba2072df..b9254eed7 100644
--- a/kexecdhs.c
+++ b/kexecdhs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexecdhs.c,v 1.20 2019/01/21 09:55:52 djm Exp $ */
+/* $OpenBSD: kexecdhs.c,v 1.21 2019/01/21 10:05:09 djm Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2010 Damien Miller.  All rights reserved.
@@ -89,19 +89,9 @@ input_kex_ecdh_init(int type, u_int32_t seq, struct ssh *ssh)
         sshkey_dump_ec_key(server_key);
 #endif
 
-        if (kex->load_host_public_key == NULL ||
-            kex->load_host_private_key == NULL) {
-                r = SSH_ERR_INVALID_ARGUMENT;
+        if ((r = kex_load_hostkey(ssh, &server_host_private,
+            &server_host_public)) != 0)
                 goto out;
-        }
-        server_host_public = kex->load_host_public_key(kex->hostkey_type,
-            kex->hostkey_nid, ssh);
-        server_host_private = kex->load_host_private_key(kex->hostkey_type,
-            kex->hostkey_nid, ssh);
-        if (server_host_public == NULL) {
-                r = SSH_ERR_NO_HOSTKEY_LOADED;
-                goto out;
-        }
         if ((client_public = EC_POINT_new(group)) == NULL) {
                 r = SSH_ERR_ALLOC_FAIL;
                 goto out;