diff options
author | djm@openbsd.org <djm@openbsd.org> | 2018-09-14 04:17:44 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2018-09-14 14:19:06 +1000 |
commit | 6da046f9c3374ce7e269ded15d8ff8bc45017301 (patch) | |
tree | ccad16fa508f4881970e7102c897d60f6e235b8f /ssh-keygen.c | |
parent | 1f24ac5fc05252ceb1c1d0e8cab6a283b883c780 (diff) |
upstream: garbage-collect moribund ssh_new_private() API.
OpenBSD-Commit-ID: 7c05bf13b094093dfa01848a9306c82eb6e95f6c
Diffstat (limited to 'ssh-keygen.c')
-rw-r--r-- | ssh-keygen.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c index a70fd1f88..46b3af5a8 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-keygen.c,v 1.320 2018/09/12 01:21:34 djm Exp $ */ | 1 | /* $OpenBSD: ssh-keygen.c,v 1.322 2018/09/14 04:17:44 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -491,8 +491,8 @@ do_convert_private_ssh2_from_blob(u_char *blob, u_int blen) | |||
491 | free(type); | 491 | free(type); |
492 | return NULL; | 492 | return NULL; |
493 | } | 493 | } |
494 | if ((key = sshkey_new_private(ktype)) == NULL) | 494 | if ((key = sshkey_new(ktype)) == NULL) |
495 | fatal("sshkey_new_private failed"); | 495 | fatal("sshkey_new failed"); |
496 | free(type); | 496 | free(type); |
497 | 497 | ||
498 | switch (key->type) { | 498 | switch (key->type) { |