From be1e55af709bed3a5b3c7532727d2a0ee9c9584a Mon Sep 17 00:00:00 2001 From: Assar Westerlund Date: Mon, 7 Jul 1997 09:42:25 +0000 Subject: [PATCH] fix all krb5_encrypt and krb5_decrypt git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@2006 ec53bebd-3082-4978-b11e-865c3cabbd6b --- kdc/kerberos5.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/kdc/kerberos5.c b/kdc/kerberos5.c index 757280463..59fc7da02 100644 --- a/kdc/kerberos5.c +++ b/kdc/kerberos5.c @@ -85,6 +85,7 @@ as_rep(krb5_context context, krb5_decrypt (context, enc_data.cipher.data, enc_data.cipher.length, + enc_data.etype, &client->keyblock, &ts_data); e = decode_PA_ENC_TS_ENC(ts_data.data, @@ -219,7 +220,9 @@ as_rep(krb5_context context, rep.ticket.enc_part.etype = ETYPE_DES_CBC_CRC; rep.ticket.enc_part.kvno = NULL; - krb5_encrypt(context, buf + sizeof(buf) - len, len, &server->keyblock, + krb5_encrypt(context, buf + sizeof(buf) - len, len, + rep.ticket.enc_part.etype, + &server->keyblock, &rep.ticket.enc_part.cipher); e = encode_EncASRepPart(buf + sizeof(buf) - 1, sizeof(buf), ek, &len); @@ -230,7 +233,9 @@ as_rep(krb5_context context, rep.enc_part.etype = ETYPE_DES_CBC_CRC; rep.enc_part.kvno = NULL; - krb5_encrypt(context, buf + sizeof(buf) - len, len, &client->keyblock, + krb5_encrypt(context, buf + sizeof(buf) - len, len, + rep.enc_part.etype, + &client->keyblock, &rep.enc_part.cipher); e = encode_AS_REP(buf + sizeof(buf) - 1, sizeof(buf), &rep, &len); @@ -466,7 +471,9 @@ tgs_rep(krb5_context context, return e; rep.ticket.enc_part.etype = ETYPE_DES_CBC_CRC; rep.ticket.enc_part.kvno = NULL; - krb5_encrypt(context, buf + sizeof(buf) - len, len, &server->keyblock, + krb5_encrypt(context, buf + sizeof(buf) - len, len, + rep.ticket.enc_part.etype, + &server->keyblock, &rep.ticket.enc_part.cipher); e = encode_EncTGSRepPart(buf + sizeof(buf) - 1, @@ -479,7 +486,9 @@ tgs_rep(krb5_context context, krb5_keyblock kb; kb.keytype = tgt->key.keytype; kb.keyvalue = tgt->key.keyvalue; - krb5_encrypt(context, buf + sizeof(buf) - len, len, &kb, + krb5_encrypt(context, buf + sizeof(buf) - len, len, + rep.enc_part.etype, + &kb, &rep.enc_part.cipher); }