1 files changed, 5 insertions, 6 deletions

diff --git a/sshd.c b/sshd.c
index 7ff109175..a1c3970b3 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.514 2018/08/13 02:41:05 djm Exp $ */
+/* $OpenBSD: sshd.c,v 1.516 2018/09/21 12:23:17 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -509,8 +509,8 @@ demote_sensitive_data(void)
 
         for (i = 0; i < options.num_host_key_files; i++) {
                 if (sensitive_data.host_keys[i]) {
-                        if ((r = sshkey_demote(sensitive_data.host_keys[i],
-                            &tmp)) != 0)
+                        if ((r = sshkey_from_private(
+                            sensitive_data.host_keys[i], &tmp)) != 0)
                                 fatal("could not demote host %s key: %s",
                                     sshkey_type(sensitive_data.host_keys[i]),
                                     ssh_err(r));
@@ -552,8 +552,7 @@ privsep_preauth_child(void)
 
 #ifdef GSSAPI
         /* Cache supported mechanism OIDs for later use */
-        if (options.gss_authentication || options.gss_keyex)
-                ssh_gssapi_prepare_supported_oids();
+        ssh_gssapi_prepare_supported_oids();
 #endif
 
         reseed_prngs();
@@ -1788,7 +1787,7 @@ main(int ac, char **av)
                         error("Error loading host key \"%s\": %s",
                             options.host_key_files[i], ssh_err(r));
                 if (pubkey == NULL && key != NULL)
-                        if ((r = sshkey_demote(key, &pubkey)) != 0)
+                        if ((r = sshkey_from_private(key, &pubkey)) != 0)
                                 fatal("Could not demote key: \"%s\": %s",
                                     options.host_key_files[i], ssh_err(r));
                 sensitive_data.host_keys[i] = key;