diff options
author | Markus Friedl <markus@cvs.openbsd.org> | 2017-07-19 08:30:42 +0000 |
---|---|---|
committer | Markus Friedl <markus@cvs.openbsd.org> | 2017-07-19 08:30:42 +0000 |
commit | 112c544fd5f07d7a52d47d539e363554d5b25e5c (patch) | |
tree | 93f7bb1b6b6ac6b618eeb88737a20ce33cb75fa8 /usr.bin/ssh/sshkey.c | |
parent | ec37331668fe8c718e98889703c1f2a9d04def5b (diff) |
fix support for unknown key types; ok djm@
Diffstat (limited to 'usr.bin/ssh/sshkey.c')
-rw-r--r-- | usr.bin/ssh/sshkey.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/usr.bin/ssh/sshkey.c b/usr.bin/ssh/sshkey.c index 6b44dfe96bf..8c6de18419f 100644 --- a/usr.bin/ssh/sshkey.c +++ b/usr.bin/ssh/sshkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshkey.c,v 1.54 2017/07/01 13:50:45 djm Exp $ */ +/* $OpenBSD: sshkey.c,v 1.55 2017/07/19 08:30:41 markus Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * Copyright (c) 2008 Alexander von Gernler. All rights reserved. @@ -1948,11 +1948,6 @@ sshkey_from_blob_internal(struct sshbuf *b, struct sshkey **keyp, pk = NULL; break; case KEY_UNSPEC: - if ((key = sshkey_new(type)) == NULL) { - ret = SSH_ERR_ALLOC_FAIL; - goto out; - } - break; default: ret = SSH_ERR_KEY_TYPE_UNKNOWN; goto out; |