summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/ssh-add.c
diff options
context:
space:
mode:
authormmcc <mmcc@openbsd.org>2015-12-11 02:31:47 +0000
committermmcc <mmcc@openbsd.org>2015-12-11 02:31:47 +0000
commit5fb8de7dd2c66851536ccb7dd27da54220e963f9 (patch)
tree56443100bade97d819c409a4e9fc644411d6a243 /usr.bin/ssh/ssh-add.c
parentfflush stdout so that output is seen even when running in debug mode when (diff)
downloadwireguard-openbsd-5fb8de7dd2c66851536ccb7dd27da54220e963f9.tar.xz
wireguard-openbsd-5fb8de7dd2c66851536ccb7dd27da54220e963f9.zip
Remove NULL-checks before sshkey_free().
ok djm@
Diffstat (limited to 'usr.bin/ssh/ssh-add.c')
-rw-r--r--usr.bin/ssh/ssh-add.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/usr.bin/ssh/ssh-add.c b/usr.bin/ssh/ssh-add.c
index 3eebd5e47b3..d45f64f4f93 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.126 2015/10/15 23:51:40 djm Exp $ */
+/* $OpenBSD: ssh-add.c,v 1.127 2015/12/11 02:31:47 mmcc Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -142,10 +142,8 @@ delete_file(int agent_fd, const char *filename, int key_only)
certpath, ssh_err(r));
out:
- if (cert != NULL)
- sshkey_free(cert);
- if (public != NULL)
- sshkey_free(public);
+ sshkey_free(cert);
+ sshkey_free(public);
free(certpath);
free(comment);