From f8c9e2d1ed5081ac5da06890bf211413fba50b9d Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Thu, 7 Jul 2005 20:06:19 +0000
Subject: [PATCH] Do not assume that des_key_schedule is an array.

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15574 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 appl/kx/krb4.c                   | 4 ++--
 appl/telnet/libtelnet/kerberos.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/appl/kx/krb4.c b/appl/kx/krb4.c
index 1d587df45..53e00453f 100644
--- a/appl/kx/krb4.c
+++ b/appl/kx/krb4.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995 - 2000 Kungliga Tekniska Högskolan
+ * Copyright (c) 1995 - 2005 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  * 
@@ -364,7 +364,7 @@ recv_v4_auth (kx_context *kc, int sock, u_char *buf)
 
     c->auth     = auth;
     memcpy (c->key, &auth.session, sizeof(des_cblock));
-    memcpy (c->schedule, schedule, sizeof(schedule));
+    memcpy (&c->schedule, &schedule, sizeof(schedule));
 
     return 0;
 }
diff --git a/appl/telnet/libtelnet/kerberos.c b/appl/telnet/libtelnet/kerberos.c
index f64c80cbb..cf680bb48 100644
--- a/appl/telnet/libtelnet/kerberos.c
+++ b/appl/telnet/libtelnet/kerberos.c
@@ -440,7 +440,7 @@ kerberos4_is(Authenticator *ap, unsigned char *data, int cnt)
 		}
 	    }
 	    memset(data, 0, cnt);
-	    memset(ks, 0, sizeof(ks));
+	    memset(&ks, 0, sizeof(ks));
 	    memset(&cred, 0, sizeof(cred));
 	}
 	
@@ -712,7 +712,7 @@ kerberos4_forward(Authenticator *ap, void *v)
     len = pack_cred(&cred, netcred);
     des_pcbc_encrypt((void*)netcred, (void*)netcred, len,
 		     ks, key, DES_ENCRYPT);
-    memset(ks, 0, sizeof(ks));
+    memset(&ks, 0, sizeof(ks));
     Data(ap, KRB_FORWARD, netcred, len);
     memset(netcred, 0, sizeof(netcred));
     return 0;