RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: Don't attempt to fprintf a null identity comment. From 

Martin Vahlensieck via tech@.

OpenBSD-Commit-ID: 4c54d20a8e8e4e9912c38a7b4ef5bfc5ca2e05c2
This commit is contained in:
dtucker@openbsd.org 2022-06-18 02:17:16 +00:00 committed by Damien Miller
parent ad1762173b
commit f29d6cf98c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ssh-add.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-add.c,v 1.165 2022/02/04 02:49:17 dtucker Exp $ */
/* $OpenBSD: ssh-add.c,v 1.166 2022/06/18 02:17:16 dtucker Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -125,7 +125,7 @@ delete_one(int agent_fd, const struct sshkey *key, const char *comment,
}
if (!qflag) {
fprintf(stderr, "Identity removed: %s %s (%s)\n", path,
sshkey_type(key), comment);
sshkey_type(key), comment ? comment : "no comment");
}
return 0;
}
@ -399,7 +399,7 @@ add_file(int agent_fd, const char *filename, int key_only, int qflag,
certpath, filename);
sshkey_free(cert);
goto out;
}
}
/* Graft with private bits */
if ((r = sshkey_to_certified(private)) != 0) {