From beb38c6e85b1bb433343cabef403fd1308e5e264 Mon Sep 17 00:00:00 2001
From: des <des@FreeBSD.org>
Date: Tue, 19 Nov 2013 11:47:30 +0000
Subject: MFH (r257954): upgrade to OpenSSH 6.4p1

Approved by:	re (kib)
---
 crypto/openssh/cipher-3des1.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'crypto/openssh/cipher-3des1.c')

diff --git a/crypto/openssh/cipher-3des1.c b/crypto/openssh/cipher-3des1.c
index c8a7024..56fc777 100644
--- a/crypto/openssh/cipher-3des1.c
+++ b/crypto/openssh/cipher-3des1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cipher-3des1.c,v 1.8 2013/05/17 00:13:13 djm Exp $ */
+/* $OpenBSD: cipher-3des1.c,v 1.9 2013/11/08 00:39:15 djm Exp $ */
 /*
  * Copyright (c) 2003 Markus Friedl.  All rights reserved.
  *
@@ -67,7 +67,7 @@ ssh1_3des_init(EVP_CIPHER_CTX *ctx, const u_char *key, const u_char *iv,
 	u_char *k1, *k2, *k3;
 
 	if ((c = EVP_CIPHER_CTX_get_app_data(ctx)) == NULL) {
-		c = xmalloc(sizeof(*c));
+		c = xcalloc(1, sizeof(*c));
 		EVP_CIPHER_CTX_set_app_data(ctx, c);
 	}
 	if (key == NULL)
-- 
cgit v1.1