- djm@cvs.openbsd.org 2010/01/30 02:54:53

[openssh.git] / cipher-3des1.c

diff --git a/cipher-3des1.c b/cipher-3des1.c
index 6f9f5dd6b5d48b405b185e38af9aa7d466baf258..17a13a133abbc0dc5de69101edb26eaca95ef020 100644 (file)
--- a/cipher-3des1.c
+++ b/cipher-3des1.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: cipher-3des1.c,v 1.6 2006/08/03 03:34:42 deraadt Exp $ */
 /*
  * Copyright (c) 2003 Markus Friedl.  All rights reserved.
  *
@@ -23,15 +24,18 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: cipher-3des1.c,v 1.1 2003/05/15 03:08:29 markus Exp $");
+
+#include <sys/types.h>
 
 #include <openssl/evp.h>
+
+#include <stdarg.h>
+#include <string.h>
+
 #include "xmalloc.h"
 #include "log.h"
 
-#if OPENSSL_VERSION_NUMBER < 0x00906000L
-#define SSH_OLD_EVP
-#endif
+#include "openbsd-compat/openssl-compat.h"
 
 /*
  * This is used by SSH1:
@@ -126,6 +130,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);