summaryrefslogtreecommitdiff
path: root/ssh-keygen.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2019-11-18 06:39:36 +0000
committerDamien Miller <djm@mindrot.org>2019-11-18 17:42:11 +1100
commitd88205417084f523107fbe1bc92061635cd57fd2 (patch)
treea4ed07408e0958d2a5d7c6daf08f2e1dfb2e6c47 /ssh-keygen.c
parent740c4bc9875cbb4b9fc03fd5eac19df080f20df5 (diff)
upstream: Fix incorrect error message when key certification fails
OpenBSD-Commit-ID: 7771bd77ee73f7116df37c734c41192943a73cee
Diffstat (limited to 'ssh-keygen.c')
-rw-r--r--ssh-keygen.c4
1 files changed, 2 insertions, 2 deletions
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 @@
1/* $OpenBSD: ssh-keygen.c,v 1.366 2019/11/18 06:24:17 djm Exp $ */ 1/* $OpenBSD: ssh-keygen.c,v 1.367 2019/11/18 06:39:36 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * 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,
1830 fatal("Couldn't certify key %s via agent: %s", 1830 fatal("Couldn't certify key %s via agent: %s",
1831 tmp, ssh_err(r)); 1831 tmp, ssh_err(r));
1832 } else { 1832 } else {
1833 if ((sshkey_certify(public, ca, key_type_name, 1833 if ((r = sshkey_certify(public, ca, key_type_name,
1834 sk_provider)) != 0) 1834 sk_provider)) != 0)
1835 fatal("Couldn't certify key %s: %s", 1835 fatal("Couldn't certify key %s: %s",
1836 tmp, ssh_err(r)); 1836 tmp, ssh_err(r));