summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2015-03-06 01:40:56 +0000
committerDamien Miller <djm@mindrot.org>2015-03-06 13:22:44 +1100
commit55e5bdeb519cb60cc18b7ba0545be581fb8598b4 (patch)
tree74bde7d2a7daf158ef4c535b377041741dd73b57
parentbe8f658e550a434eac04256bfbc4289457a24e99 (diff)
upstream commit
fix sshkey_certify() return value for unsupported key types; ok markus@ deraadt@
-rw-r--r--sshkey.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sshkey.c b/sshkey.c
index 2c678090..47687903 100644
--- a/sshkey.c
+++ b/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.
@@ -2464,6 +2464,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 */