upstream: hold our collective noses and use the openssl-1.1.x API in

OpenSSH; feedback and ok tb@ jsing@ markus@

OpenBSD-Commit-ID: cacbcac87ce5da0d3ca7ef1b38a6f7fb349e4417

1 files changed, 2 insertions, 2 deletions

diff --git a/auth2.c b/auth2.c
index ab8795895..4d19957a6 100644
--- a/auth2.c
+++ b/auth2.c
@@ -706,7 +706,7 @@ auth2_record_key(Authctxt *authctxt, int authenticated,
         struct sshkey **tmp, *dup;
         int r;
 
-        if ((r = sshkey_demote(key, &dup)) != 0)
+        if ((r = sshkey_from_private(key, &dup)) != 0)
                 fatal("%s: copy key: %s", __func__, ssh_err(r));
         sshkey_free(authctxt->auth_method_key);
         authctxt->auth_method_key = dup;
@@ -715,7 +715,7 @@ auth2_record_key(Authctxt *authctxt, int authenticated,
                 return;
 
         /* If authenticated, make sure we don't accept this key again */
-        if ((r = sshkey_demote(key, &dup)) != 0)
+        if ((r = sshkey_from_private(key, &dup)) != 0)
                 fatal("%s: copy key: %s", __func__, ssh_err(r));
         if (authctxt->nprev_keys >= INT_MAX ||
             (tmp = recallocarray(authctxt->prev_keys, authctxt->nprev_keys,