===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/sshkey.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- src/usr.bin/ssh/sshkey.c	2015/12/11 02:31:47	1.30
+++ src/usr.bin/ssh/sshkey.c	2015/12/11 04:21:12	1.31
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshkey.c,v 1.30 2015/12/11 02:31:47 mmcc Exp $ */
+/* $OpenBSD: sshkey.c,v 1.31 2015/12/11 04:21:12 mmcc Exp $ */
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2008 Alexander von Gernler.  All rights reserved.
@@ -400,12 +400,9 @@
 
 	if (cert == NULL)
 		return;
-	if (cert->certblob != NULL)
-		sshbuf_free(cert->certblob);
-	if (cert->critical != NULL)
-		sshbuf_free(cert->critical);
-	if (cert->extensions != NULL)
-		sshbuf_free(cert->extensions);
+	sshbuf_free(cert->certblob);
+	sshbuf_free(cert->critical);
+	sshbuf_free(cert->extensions);
 	free(cert->key_id);
 	for (i = 0; i < cert->nprincipals; i++)
 		free(cert->principals[i]);
@@ -2426,8 +2423,7 @@
 		sshbuf_reset(cert);
 	free(sig_blob);
 	free(ca_blob);
-	if (principals != NULL)
-		sshbuf_free(principals);
+	sshbuf_free(principals);
 	return ret;
 }
 
@@ -3437,10 +3433,8 @@
  out:
 	explicit_bzero(&ciphercontext, sizeof(ciphercontext));
 	explicit_bzero(buf, sizeof(buf));
-	if (buffer != NULL)
-		sshbuf_free(buffer);
-	if (encrypted != NULL)
-		sshbuf_free(encrypted);
+	sshbuf_free(buffer);
+	sshbuf_free(encrypted);
 
 	return r;
 }
@@ -3588,8 +3582,7 @@
 	pub = NULL;
 
  out:
-	if (copy != NULL)
-		sshbuf_free(copy);
+	sshbuf_free(copy);
 	sshkey_free(pub);
 	return r;
 }
@@ -3704,10 +3697,8 @@
 	explicit_bzero(&ciphercontext, sizeof(ciphercontext));
 	free(comment);
 	sshkey_free(prv);
-	if (copy != NULL)
-		sshbuf_free(copy);
-	if (decrypted != NULL)
-		sshbuf_free(decrypted);
+	sshbuf_free(copy);
+	sshbuf_free(decrypted);
 	return r;
 }
 #endif /* WITH_SSH1 */