From 40ebd0d909cca28e52600a11955a84dc1ebaebd8 Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Thu, 24 Jul 1997 07:21:57 +0000
Subject: [PATCH] (krb5_mk_priv): Fetch the correct session key from
 auth_context

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@2592 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/krb5/mk_priv.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/krb5/mk_priv.c b/lib/krb5/mk_priv.c
index 5eddbe27f..45ac2b5f3 100644
--- a/lib/krb5/mk_priv.c
+++ b/lib/krb5/mk_priv.c
@@ -55,6 +55,7 @@ krb5_mk_priv(krb5_context context,
   u_char buf[1024];
   size_t len;
   unsigned tmp_seq;
+  krb5_keyblock *key;
 
   part.user_data = *userdata;
   gettimeofday (&tv, NULL);
@@ -80,8 +81,17 @@ krb5_mk_priv(krb5_context context,
   s.enc_part.etype = auth_context->enctype;
   s.enc_part.kvno = NULL;
 
+  /* XXX - Is this right? */
+
+  if (auth_context->local_subkey.keytype)
+      key = &auth_context->local_subkey;
+  else if (auth_context->remote_subkey.keytype)
+      key = &auth_context->remote_subkey;
+  else
+      key = &auth_context->key;
+
   r = krb5_encrypt (context, buf + sizeof(buf) - len, len,
-		    s.enc_part.etype, &auth_context->key, &s.enc_part.cipher);
+		    s.enc_part.etype, key, &s.enc_part.cipher);
   if (r)
     return r;