From 0c10332af909747af443c5d5791f0995fa850470 Mon Sep 17 00:00:00 2001 From: dtucker Date: Sat, 18 Jun 2022 02:17:16 +0000 Subject: [PATCH] Don't attempt to fprintf a null identity comment. From Martin Vahlensieck via tech@. --- usr.bin/ssh/ssh-add.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.bin/ssh/ssh-add.c b/usr.bin/ssh/ssh-add.c index c206118a320..03afd1d1df5 100644 --- a/usr.bin/ssh/ssh-add.c +++ b/usr.bin/ssh/ssh-add.c @@ -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 * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -118,7 +118,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; } @@ -392,7 +392,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) { -- 2.20.1