From a32e19c637cec7b6c4ce779c6b6586c3880de6b2 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Wed, 31 Dec 2003 11:36:00 +1100 Subject: [PATCH] - markus@cvs.openbsd.org 2003/12/22 20:29:55 [cipher-3des1.c] EVP_CIPHER_CTX_cleanup() for the des contexts; pruiksma@freesurf.fr --- ChangeLog | 5 ++++- cipher-3des1.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 62095746d..c80577e5a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,9 @@ [moduli.c ssh-keygen.1 ssh-keygen.c] tidy up moduli generation debugging, add -v (verbose/debug) option to ssh-keygen; ok markus@ + - markus@cvs.openbsd.org 2003/12/22 20:29:55 + [cipher-3des1.c] + EVP_CIPHER_CTX_cleanup() for the des contexts; pruiksma@freesurf.fr 20031219 - (dtucker) [defines.h] Bug #458: Define SIZE_T_MAX as UINT_MAX if we @@ -1623,4 +1626,4 @@ - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. Report from murple@murple.net, diagnosis from dtucker@zip.com.au -$Id: ChangeLog,v 1.3153 2003/12/31 00:34:51 dtucker Exp $ +$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 @@ */ #include "includes.h" -RCSID("$OpenBSD: cipher-3des1.c,v 1.1 2003/05/15 03:08:29 markus Exp $"); +RCSID("$OpenBSD: cipher-3des1.c,v 1.2 2003/12/22 20:29:55 markus Exp $"); #include #include "xmalloc.h" @@ -126,6 +126,9 @@ ssh1_3des_cleanup(EVP_CIPHER_CTX *ctx) struct ssh1_3des_ctx *c; if ((c = EVP_CIPHER_CTX_get_app_data(ctx)) != NULL) { + EVP_CIPHER_CTX_cleanup(&c->k1); + EVP_CIPHER_CTX_cleanup(&c->k2); + EVP_CIPHER_CTX_cleanup(&c->k3); memset(c, 0, sizeof(*c)); xfree(c); EVP_CIPHER_CTX_set_app_data(ctx, NULL);