merged OpenSSH 4.6p1, openssh-4.6p1-gsskex-20070312.patch, and openssh-4.6p1-hpn12v16...

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

diff --git a/openssh/cipher-3des1.c b/openssh/cipher-3des1.c
index 6f9f5dd6b5d48b405b185e38af9aa7d466baf258..fc16e20d7e790762ec7af1e73918e68577d28f0c 100644 (file)
--- a/openssh/cipher-3des1.c
+++ b/openssh/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,9 +24,14 @@
  */
 
 #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"
 
@@ -126,6 +132,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);