summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsg@openbsd.org <jsg@openbsd.org>2015-05-05 02:48:17 +0000
committerDamien Miller <djm@mindrot.org>2015-05-08 13:32:55 +1000
commitd5b1507a207253b39e810e91e68f9598691b7a29 (patch)
treeeb3261d6e2cf6313386ca5ac615bcf0b27ce86e5
parenta647b9b8e616c231594b2710c925d31b1b8afea3 (diff)
upstream commit
use the sizeof the struct not the sizeof a pointer to the struct in ssh_digest_start() This file is only used if ssh is built with OPENSSL=no ok markus@
-rw-r--r--digest-libc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/digest-libc.c b/digest-libc.c
index a216e784e..40db00274 100644
--- a/digest-libc.c
+++ b/digest-libc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: digest-libc.c,v 1.4 2014/12/21 22:27:56 djm Exp $ */ 1/* $OpenBSD: digest-libc.c,v 1.5 2015/05/05 02:48:17 jsg Exp $ */
2/* 2/*
3 * Copyright (c) 2013 Damien Miller <djm@mindrot.org> 3 * Copyright (c) 2013 Damien Miller <djm@mindrot.org>
4 * Copyright (c) 2014 Markus Friedl. All rights reserved. 4 * Copyright (c) 2014 Markus Friedl. All rights reserved.
@@ -172,7 +172,7 @@ ssh_digest_start(int alg)
172 const struct ssh_digest *digest = ssh_digest_by_alg(alg); 172 const struct ssh_digest *digest = ssh_digest_by_alg(alg);
173 struct ssh_digest_ctx *ret; 173 struct ssh_digest_ctx *ret;
174 174
175 if (digest == NULL || (ret = calloc(1, sizeof(ret))) == NULL) 175 if (digest == NULL || (ret = calloc(1, sizeof(*ret))) == NULL)
176 return NULL; 176 return NULL;
177 if ((ret->mdctx = calloc(1, digest->ctx_len)) == NULL) { 177 if ((ret->mdctx = calloc(1, digest->ctx_len)) == NULL) {
178 free(ret); 178 free(ret);