diff options
author | Colin Watson <cjwatson@debian.org> | 2013-11-09 12:09:48 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2013-11-09 12:09:48 +0000 |
commit | 210ca37aa0cdf5499f0ea847ec150fefbfbf7c39 (patch) | |
tree | 64829a84f903d7e2d3270c43e3f80df7db2a6a10 /cipher-3des1.c | |
parent | 74e339b8f8936bc0d985e053a076d0c9b5e9ea51 (diff) | |
parent | ee196dab7c5f97f0b80c8099343a375bead92010 (diff) |
merge 6.4p1
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) |