From: jsg@openbsd.org <jsg@openbsd.org>
Date: Tue, 5 May 2015 02:48:17 +0000 (+0000)
Subject: upstream commit
X-Git-Tag: V_6_9_P1~88
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5b1507a207253b39e810e91e68f9598691b7a29;p=thirdparty%2Fopenssh-portable.git

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@
---

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 @@
-/* $OpenBSD: digest-libc.c,v 1.4 2014/12/21 22:27:56 djm Exp $ */
+/* $OpenBSD: digest-libc.c,v 1.5 2015/05/05 02:48:17 jsg Exp $ */
 /*
  * Copyright (c) 2013 Damien Miller <djm@mindrot.org>
  * Copyright (c) 2014 Markus Friedl.  All rights reserved.
@@ -172,7 +172,7 @@ ssh_digest_start(int alg)
 	const struct ssh_digest *digest = ssh_digest_by_alg(alg);
 	struct ssh_digest_ctx *ret;
 
-	if (digest == NULL || (ret = calloc(1, sizeof(ret))) == NULL)
+	if (digest == NULL || (ret = calloc(1, sizeof(*ret))) == NULL)
 		return NULL;
 	if ((ret->mdctx = calloc(1, digest->ctx_len)) == NULL) {
 		free(ret);