diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | cipher-3des1.c | 5 |
2 files changed, 8 insertions, 2 deletions
@@ -4,6 +4,9 @@ | |||
4 | [moduli.c ssh-keygen.1 ssh-keygen.c] | 4 | [moduli.c ssh-keygen.1 ssh-keygen.c] |
5 | tidy up moduli generation debugging, add -v (verbose/debug) option to | 5 | tidy up moduli generation debugging, add -v (verbose/debug) option to |
6 | ssh-keygen; ok markus@ | 6 | ssh-keygen; ok markus@ |
7 | - markus@cvs.openbsd.org 2003/12/22 20:29:55 | ||
8 | [cipher-3des1.c] | ||
9 | EVP_CIPHER_CTX_cleanup() for the des contexts; pruiksma@freesurf.fr | ||
7 | 10 | ||
8 | 20031219 | 11 | 20031219 |
9 | - (dtucker) [defines.h] Bug #458: Define SIZE_T_MAX as UINT_MAX if we | 12 | - (dtucker) [defines.h] Bug #458: Define SIZE_T_MAX as UINT_MAX if we |
@@ -1623,4 +1626,4 @@ | |||
1623 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1626 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1624 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1627 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1625 | 1628 | ||
1626 | $Id: ChangeLog,v 1.3153 2003/12/31 00:34:51 dtucker Exp $ | 1629 | $Id: ChangeLog,v 1.3154 2003/12/31 00:36:00 dtucker Exp $ |
diff --git a/cipher-3des1.c b/cipher-3des1.c index 6f9f5dd6b..f815e8ae5 100644 --- a/cipher-3des1.c +++ b/cipher-3des1.c | |||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: cipher-3des1.c,v 1.1 2003/05/15 03:08:29 markus Exp $"); | 26 | RCSID("$OpenBSD: cipher-3des1.c,v 1.2 2003/12/22 20:29:55 markus Exp $"); |
27 | 27 | ||
28 | #include <openssl/evp.h> | 28 | #include <openssl/evp.h> |
29 | #include "xmalloc.h" | 29 | #include "xmalloc.h" |
@@ -126,6 +126,9 @@ ssh1_3des_cleanup(EVP_CIPHER_CTX *ctx) | |||
126 | struct ssh1_3des_ctx *c; | 126 | struct ssh1_3des_ctx *c; |
127 | 127 | ||
128 | if ((c = EVP_CIPHER_CTX_get_app_data(ctx)) != NULL) { | 128 | if ((c = EVP_CIPHER_CTX_get_app_data(ctx)) != NULL) { |
129 | EVP_CIPHER_CTX_cleanup(&c->k1); | ||
130 | EVP_CIPHER_CTX_cleanup(&c->k2); | ||
131 | EVP_CIPHER_CTX_cleanup(&c->k3); | ||
129 | memset(c, 0, sizeof(*c)); | 132 | memset(c, 0, sizeof(*c)); |
130 | xfree(c); | 133 | xfree(c); |
131 | EVP_CIPHER_CTX_set_app_data(ctx, NULL); | 134 | EVP_CIPHER_CTX_set_app_data(ctx, NULL); |