diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2018-09-13 02:08:33 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2018-09-13 12:12:33 +1000 |
| commit | 482d23bcacdd3664f21cc82a5135f66fc598275f (patch) | |
| tree | 362f697a94da0a765d1dabcfbf33370b2a4df121 /sshd.c | |
| parent | d70d061828730a56636ab6f1f24fe4a8ccefcfc1 (diff) | |
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 'sshd.c')
| -rw-r--r-- | sshd.c | 6 |
1 files changed, 3 insertions, 3 deletions
| @@ -493,8 +493,8 @@ demote_sensitive_data(void) | |||
| 493 | 493 | ||
| 494 | for (i = 0; i < options.num_host_key_files; i++) { | 494 | for (i = 0; i < options.num_host_key_files; i++) { |
| 495 | if (sensitive_data.host_keys[i]) { | 495 | if (sensitive_data.host_keys[i]) { |
| 496 | if ((r = sshkey_demote(sensitive_data.host_keys[i], | 496 | if ((r = sshkey_from_private( |
| 497 | &tmp)) != 0) | 497 | sensitive_data.host_keys[i], &tmp)) != 0) |
| 498 | fatal("could not demote host %s key: %s", | 498 | fatal("could not demote host %s key: %s", |
| 499 | sshkey_type(sensitive_data.host_keys[i]), | 499 | sshkey_type(sensitive_data.host_keys[i]), |
| 500 | ssh_err(r)); | 500 | ssh_err(r)); |
| @@ -1772,7 +1772,7 @@ main(int ac, char **av) | |||
| 1772 | error("Error loading host key \"%s\": %s", | 1772 | error("Error loading host key \"%s\": %s", |
| 1773 | options.host_key_files[i], ssh_err(r)); | 1773 | options.host_key_files[i], ssh_err(r)); |
| 1774 | if (pubkey == NULL && key != NULL) | 1774 | if (pubkey == NULL && key != NULL) |
| 1775 | if ((r = sshkey_demote(key, &pubkey)) != 0) | 1775 | if ((r = sshkey_from_private(key, &pubkey)) != 0) |
| 1776 | fatal("Could not demote key: \"%s\": %s", | 1776 | fatal("Could not demote key: \"%s\": %s", |
| 1777 | options.host_key_files[i], ssh_err(r)); | 1777 | options.host_key_files[i], ssh_err(r)); |
| 1778 | sensitive_data.host_keys[i] = key; | 1778 | sensitive_data.host_keys[i] = key; |