summaryrefslogtreecommitdiff
path: root/ssh-keygen.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2015-02-23 22:21:21 +0000
committerDamien Miller <djm@mindrot.org>2015-02-24 09:21:48 +1100
commit2285c30d51b7e2052c6526445abe7e7cc7e170a1 (patch)
tree3478177f5686f1e07beda2fe0e0a713df04d40a0 /ssh-keygen.c
parent9af21979c00652029e160295e988dea40758ece2 (diff)
upstream commit
further silence spurious error message even when -v is specified (e.g. to get visual host keys); reported by naddy@
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 1ae865af7..b85fa4964 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keygen.c,v 1.263 2015/02/23 16:55:31 djm Exp $ */ 1/* $OpenBSD: ssh-keygen.c,v 1.264 2015/02/23 22:21:21 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
@@ -843,7 +843,7 @@ do_fingerprint(struct passwd *pw)
843 exit(1); 843 exit(1);
844 } 844 }
845 if ((r = sshkey_load_public(identity_file, &public, &comment)) != 0) 845 if ((r = sshkey_load_public(identity_file, &public, &comment)) != 0)
846 debug("Error loading public key \"%s\": %s", 846 debug2("Error loading public key \"%s\": %s",
847 identity_file, ssh_err(r)); 847 identity_file, ssh_err(r));
848 else { 848 else {
849 fp = sshkey_fingerprint(public, fptype, rep); 849 fp = sshkey_fingerprint(public, fptype, rep);