commit 89540b6de025b80404a0cb8418c06377f3f98848
author mmcc@openbsd.org <mmcc@openbsd.org> Fri Dec 11 02:31:47 2015 +0000
committer Damien Miller <djm@mindrot.org> Fri Dec 18 14:49:32 2015 +1100
tree e5ba6b2acbaab9aa3b89c3ff0c0b14adddfa19db
parent 79394ed6d74572c2d2643d73937dad33727fc240

upstream commit

Remove NULL-checks before sshkey_free().

ok djm@

Upstream-ID: 3e35afe8a25e021216696b5d6cde7f5d2e5e3f52

ssh-keygen.c

diff --git a/ssh-keygen.c b/ssh-keygen.c
index 6ac1fa6..ff3f710 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.285 2015/12/04 16:41:28 markus Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.286 2015/12/11 02:31:47 mmcc Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2166,8 +2166,7 @@
 	close(fd);
 	sshbuf_free(kbuf);
 	ssh_krl_free(krl);
-	if (ca != NULL)
-		sshkey_free(ca);
+	sshkey_free(ca);
 }
 
 static void