src/usr.bin/ssh/kex.c - diff

Return to kex.c CVS log

Up to [local] / src / usr.bin / ssh

-version 1.144, 2019/01/21 09:55:52
+version 1.145, 2019/01/21 10:05:09
 Line 1039
 Line 1039
 Line 1039
  }
  #endif
+ int
+ kex_load_hostkey(struct ssh *ssh, struct sshkey **pubp, struct sshkey **prvp)
+ {
+         struct kex *kex = ssh->kex;
+         *pubp = NULL;
+         *prvp = NULL;
+         if (kex->load_host_public_key == NULL ||
+             kex->load_host_private_key == NULL)
+                 return SSH_ERR_INVALID_ARGUMENT;
+         *pubp = kex->load_host_public_key(kex->hostkey_type,
+             kex->hostkey_nid, ssh);
+         *prvp = kex->load_host_private_key(kex->hostkey_type,
+             kex->hostkey_nid, ssh);
+         if (*pubp == NULL)
+                 return SSH_ERR_NO_HOSTKEY_LOADED;
+         return 0;
+ }
  #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH) || defined(DEBUG_KEXECDH)
  void