diff options
author | Damien Miller <djm@mindrot.org> | 2013-11-08 12:28:03 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2013-11-08 12:28:03 +1100 |
commit | 727a3bfd3b5943bef9a9fd02812e9a75758d6d26 (patch) | |
tree | c9465c196ba7c575797626192d06e35a787a5c7d /cipher-3des1.c | |
parent | 13cfd6d68237ef844dd8e02cf9ed21268154a999 (diff) |
- djm@cvs.openbsd.org 2013/11/08 00:39:15
[auth-options.c auth2-chall.c authfd.c channels.c cipher-3des1.c]
[clientloop.c gss-genr.c monitor_mm.c packet.c schnorr.c umac.c]
[sftp-client.c sftp-glob.c]
use calloc for all structure allocations; from markus@
Diffstat (limited to 'cipher-3des1.c')
-rw-r--r-- | cipher-3des1.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cipher-3des1.c b/cipher-3des1.c index c8a70244b..56fc77786 100644 --- a/cipher-3des1.c +++ b/cipher-3des1.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: cipher-3des1.c,v 1.8 2013/05/17 00:13:13 djm Exp $ */ | 1 | /* $OpenBSD: cipher-3des1.c,v 1.9 2013/11/08 00:39:15 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2003 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2003 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -67,7 +67,7 @@ ssh1_3des_init(EVP_CIPHER_CTX *ctx, const u_char *key, const u_char *iv, | |||
67 | u_char *k1, *k2, *k3; | 67 | u_char *k1, *k2, *k3; |
68 | 68 | ||
69 | if ((c = EVP_CIPHER_CTX_get_app_data(ctx)) == NULL) { | 69 | if ((c = EVP_CIPHER_CTX_get_app_data(ctx)) == NULL) { |
70 | c = xmalloc(sizeof(*c)); | 70 | c = xcalloc(1, sizeof(*c)); |
71 | EVP_CIPHER_CTX_set_app_data(ctx, c); | 71 | EVP_CIPHER_CTX_set_app_data(ctx, c); |
72 | } | 72 | } |
73 | if (key == NULL) | 73 | if (key == NULL) |