diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2018-09-13 04:08:33 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2018-09-13 04:12:33 +0200 |
| commit | 482d23bcacdd3664f21cc82a5135f66fc598275f (patch) | |
| tree | 362f697a94da0a765d1dabcfbf33370b2a4df121 /auth2.c | |
| parent | upstream: Include certs with multiple RSA signature variants in (diff) | |
| download | openssh-482d23bcacdd3664f21cc82a5135f66fc598275f.tar.xz openssh-482d23bcacdd3664f21cc82a5135f66fc598275f.zip | |
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
Diffstat (limited to 'auth2.c')
| -rw-r--r-- | auth2.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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, |