diff options
| author | markus@openbsd.org <markus@openbsd.org> | 2017-07-19 10:30:41 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2017-07-21 06:17:33 +0200 |
| commit | dc2bd308768386b02c7337120203ca477e67ba62 (patch) | |
| tree | a78d5fac5d955719e85b5772d8f4074069f14f3e /sshkey.c | |
| parent | upstream commit (diff) | |
| download | openssh-dc2bd308768386b02c7337120203ca477e67ba62.tar.xz openssh-dc2bd308768386b02c7337120203ca477e67ba62.zip | |
upstream commit
fix support for unknown key types; ok djm@
Upstream-ID: 53fb29394ed04d616d65b3748dee5aa06b07ab48
Diffstat (limited to 'sshkey.c')
| -rw-r--r-- | sshkey.c | 7 |
1 files changed, 1 insertions, 6 deletions
@@ -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. @@ -1986,11 +1986,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; |