===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/sshkey.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- src/usr.bin/ssh/sshkey.c	2015/12/10 17:08:40	1.29
+++ src/usr.bin/ssh/sshkey.c	2015/12/11 02:31:47	1.30
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshkey.c,v 1.29 2015/12/10 17:08:40 mmcc Exp $ */
+/* $OpenBSD: sshkey.c,v 1.30 2015/12/11 02:31:47 mmcc Exp $ */
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2008 Alexander von Gernler.  All rights reserved.
@@ -410,8 +410,7 @@
 	for (i = 0; i < cert->nprincipals; i++)
 		free(cert->principals[i]);
 	free(cert->principals);
-	if (cert->signature_key != NULL)
-		sshkey_free(cert->signature_key);
+	sshkey_free(cert->signature_key);
 	explicit_bzero(cert, sizeof(*cert));
 	free(cert);
 }
@@ -3591,8 +3590,7 @@
  out:
 	if (copy != NULL)
 		sshbuf_free(copy);
-	if (pub != NULL)
-		sshkey_free(pub);
+	sshkey_free(pub);
 	return r;
 }
 
@@ -3705,8 +3703,7 @@
  out:
 	explicit_bzero(&ciphercontext, sizeof(ciphercontext));
 	free(comment);
-	if (prv != NULL)
-		sshkey_free(prv);
+	sshkey_free(prv);
 	if (copy != NULL)
 		sshbuf_free(copy);
 	if (decrypted != NULL)
@@ -3798,8 +3795,7 @@
 	BIO_free(bio);
 	if (pk != NULL)
 		EVP_PKEY_free(pk);
-	if (prv != NULL)
-		sshkey_free(prv);
+	sshkey_free(prv);
 	return r;
 }
 #endif /* WITH_OPENSSL */