diff options
| author |   markus <markus@openbsd.org> | 2017-07-19 08:30:41 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2017-07-19 08:30:41 +0000 |
| commit | 6a4f4207fb405f62e4d0a78a02d8cc86df7f80fb (patch) | |
| tree | a481f4feddb4304a01ab343efb3e773fd5a6de44 /usr.bin/ssh/sshkey.c | |
| parent | Fix possible double free in the TX dma ring handling. If the allocation of (diff) | |
| download | wireguard-openbsd-6a4f4207fb405f62e4d0a78a02d8cc86df7f80fb.tar.xz wireguard-openbsd-6a4f4207fb405f62e4d0a78a02d8cc86df7f80fb.zip | |
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; |