diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2022-06-18 02:17:16 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2022-06-24 14:28:29 +1000 |
| commit | f29d6cf98c25bf044079032d22c1a57c63ab9d8e (patch) | |
| tree | 61087ba6dec1f37a6f7f043d1d0d941c7f18959f /ssh-add.c | |
| parent | ad1762173bb38716a106e8979806149fd0f2753e (diff) | |
| download | openssh-git-f29d6cf98c25bf044079032d22c1a57c63ab9d8e.tar.gz | |
upstream: Don't attempt to fprintf a null identity comment. From
Martin Vahlensieck via tech@.
OpenBSD-Commit-ID: 4c54d20a8e8e4e9912c38a7b4ef5bfc5ca2e05c2
Diffstat (limited to 'ssh-add.c')
| -rw-r--r-- | ssh-add.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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) { |