Import openssh_7.2p1.orig.tar.gz

1 files changed, 4 insertions, 7 deletions

diff --git a/ssh-dss.c b/ssh-dss.c
index 8ed19d849..cc47dcf5f 100644
--- a/ssh-dss.c
+++ b/ssh-dss.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-dss.c,v 1.32 2014/06/24 01:13:21 djm Exp $ */
+/* $OpenBSD: ssh-dss.c,v 1.34 2015/12/11 04:21:12 mmcc Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -122,8 +122,7 @@ ssh_dss_sign(const struct sshkey *key, u_char **sigp, size_t *lenp,
         explicit_bzero(digest, sizeof(digest));
         if (sig != NULL)
                 DSA_SIG_free(sig);
-        if (b != NULL)
-                sshbuf_free(b);
+        sshbuf_free(b);
         return ret;
 }
 
@@ -209,10 +208,8 @@ ssh_dss_verify(const struct sshkey *key,
         explicit_bzero(digest, sizeof(digest));
         if (sig != NULL)
                 DSA_SIG_free(sig);
-        if (b != NULL)
-                sshbuf_free(b);
-        if (ktype != NULL)
-                free(ktype);
+        sshbuf_free(b);
+        free(ktype);
         if (sigblob != NULL) {
                 explicit_bzero(sigblob, len);
                 free(sigblob);