summaryrefslogtreecommitdiff
path: root/ssh-dss.c
diff options
context:
space:
mode:
authormmcc@openbsd.org <mmcc@openbsd.org>2015-12-11 04:21:11 +0000
committerDamien Miller <djm@mindrot.org>2015-12-18 14:50:48 +1100
commit52d7078421844b2f88329f5be3de370b0a938636 (patch)
tree1241462a841b14259755de181563cc83acd42109 /ssh-dss.c
parenta4b9e0f4e4a6980a0eb8072f76ea611cab5b77e7 (diff)
upstream commit
Remove NULL-checks before sshbuf_free(). ok djm@ Upstream-ID: 5ebed00ed5f9f03b119a345085e8774565466917
Diffstat (limited to 'ssh-dss.c')
-rw-r--r--ssh-dss.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/ssh-dss.c b/ssh-dss.c
index 254f2a39b..cc47dcf5f 100644
--- a/ssh-dss.c
+++ b/ssh-dss.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-dss.c,v 1.33 2015/12/10 17:08:40 mmcc Exp $ */ 1/* $OpenBSD: ssh-dss.c,v 1.34 2015/12/11 04:21:12 mmcc Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -122,8 +122,7 @@ ssh_dss_sign(const struct sshkey *key, u_char **sigp, size_t *lenp,
122 explicit_bzero(digest, sizeof(digest)); 122 explicit_bzero(digest, sizeof(digest));
123 if (sig != NULL) 123 if (sig != NULL)
124 DSA_SIG_free(sig); 124 DSA_SIG_free(sig);
125 if (b != NULL) 125 sshbuf_free(b);
126 sshbuf_free(b);
127 return ret; 126 return ret;
128} 127}
129 128
@@ -209,8 +208,7 @@ ssh_dss_verify(const struct sshkey *key,
209 explicit_bzero(digest, sizeof(digest)); 208 explicit_bzero(digest, sizeof(digest));
210 if (sig != NULL) 209 if (sig != NULL)
211 DSA_SIG_free(sig); 210 DSA_SIG_free(sig);
212 if (b != NULL) 211 sshbuf_free(b);
213 sshbuf_free(b);
214 free(ktype); 212 free(ktype);
215 if (sigblob != NULL) { 213 if (sigblob != NULL) {
216 explicit_bzero(sigblob, len); 214 explicit_bzero(sigblob, len);