summaryrefslogtreecommitdiff
path: root/usr.bin/ssh
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2015-03-06 01:40:57 +0000
committerDamien Miller <djm@cvs.openbsd.org>2015-03-06 01:40:57 +0000
commit9f06b7132bf222c340805e0bd1ba41d0055792d3 (patch)
treef4009ee12ab35695309087d5f1ba3e62e5718cba /usr.bin/ssh
parent76f158042faaf7b8be7e8550a3d7c484f70aa1a0 (diff)
fix sshkey_certify() return value for unsupported key types;
ok markus@ deraadt@
Diffstat (limited to 'usr.bin/ssh')
-rw-r--r--usr.bin/ssh/sshkey.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.bin/ssh/sshkey.c b/usr.bin/ssh/sshkey.c
index c311834afe4..a13340b3fdb 100644
--- a/usr.bin/ssh/sshkey.c
+++ b/usr.bin/ssh/sshkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshkey.c,v 1.14 2015/01/26 02:59:11 djm Exp $ */
+/* $OpenBSD: sshkey.c,v 1.15 2015/03/06 01:40:56 djm Exp $ */
/*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
* Copyright (c) 2008 Alexander von Gernler. All rights reserved.
@@ -2418,6 +2418,7 @@ sshkey_certify(struct sshkey *k, struct sshkey *ca)
break;
default:
ret = SSH_ERR_INVALID_ARGUMENT;
+ goto out;
}
/* -v01 certs have a serial number next */