oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

(krb5_mk_priv): Fetch the correct session key from auth_context

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@2592 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1997-07-24 07:21:57 +00:00
parent 04738fd3c4
commit 40ebd0d909
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/krb5/mk_priv.c
View File

@@ -55,6 +55,7 @@ krb5_mk_priv(krb5_context context,
u_char buf[1024]; u_char buf[1024];
size_t len; size_t len;
unsigned tmp_seq; unsigned tmp_seq;
krb5_keyblock *key;
part.user_data = *userdata; part.user_data = *userdata;
gettimeofday (&tv, NULL); gettimeofday (&tv, NULL);
@@ -80,8 +81,17 @@ krb5_mk_priv(krb5_context context,
s.enc_part.etype = auth_context->enctype; s.enc_part.etype = auth_context->enctype;
s.enc_part.kvno = NULL; 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, 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) if (r)
return r; return r;