[openssh-commits] [openssh] 01/01: upstream commit

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 55e5bdeb519cb60cc18b7ba0545be581fb8598b4
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Fri Mar 6 01:40:56 2015 +0000

    upstream commit
    
    fix sshkey_certify() return value for unsupported key types;
     ok markus@ deraadt@
---
 sshkey.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sshkey.c b/sshkey.c
index 2c67809..4768790 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 */

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.