From: djm@openbsd.org <djm@openbsd.org>
Date: Mon, 18 Nov 2019 06:39:36 +0000 (+0000)
Subject: upstream: Fix incorrect error message when key certification fails
X-Git-Tag: V_8_2_P1~271
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d88205417084f523107fbe1bc92061635cd57fd2;p=thirdparty%2Fopenssh-portable.git

upstream: Fix incorrect error message when key certification fails

OpenBSD-Commit-ID: 7771bd77ee73f7116df37c734c41192943a73cee
---

diff --git a/ssh-keygen.c b/ssh-keygen.c
index d95415fb2..356168fb7 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.366 2019/11/18 06:24:17 djm Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.367 2019/11/18 06:39:36 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1830,7 +1830,7 @@ do_ca_sign(struct passwd *pw, const char *ca_key_path, int prefer_agent,
 				fatal("Couldn't certify key %s via agent: %s",
 				    tmp, ssh_err(r));
 		} else {
-			if ((sshkey_certify(public, ca, key_type_name,
+			if ((r = sshkey_certify(public, ca, key_type_name,
 			    sk_provider)) != 0)
 				fatal("Couldn't certify key %s: %s",
 				    tmp, ssh_err(r));