summaryrefslogtreecommitdiff
path: root/sshkey.c
diff options
context:
space:
mode:
authormarkus@openbsd.org <markus@openbsd.org>2017-07-19 08:30:41 +0000
committerDamien Miller <djm@mindrot.org>2017-07-21 14:17:33 +1000
commitdc2bd308768386b02c7337120203ca477e67ba62 (patch)
treea78d5fac5d955719e85b5772d8f4074069f14f3e /sshkey.c
parentfd0e8fa5f89d21290b1fb5f9d110ca4f113d81d9 (diff)
upstream commit
fix support for unknown key types; ok djm@ Upstream-ID: 53fb29394ed04d616d65b3748dee5aa06b07ab48
Diffstat (limited to 'sshkey.c')
-rw-r--r--sshkey.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/sshkey.c b/sshkey.c
index acc39632..d987bf5a 100644
--- a/sshkey.c
+++ b/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.
@@ -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;