summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTheodore Tso <tytso@mit.edu>1994-11-17 07:01:14 +0000
committerTheodore Tso <tytso@mit.edu>1994-11-17 07:01:14 +0000
commitd6ea66307a6549df49db1ae9c38d508ba69b8b09 (patch)
tree8e27576b58f124105c9b798db47294a59dd044bd /src
parent413fb0f9224ca34bda6f1f34d1c9c748d425f9e5 (diff)
downloadkrb5-d6ea66307a6549df49db1ae9c38d508ba69b8b09.tar.gz
krb5-d6ea66307a6549df49db1ae9c38d508ba69b8b09.tar.xz
krb5-d6ea66307a6549df49db1ae9c38d508ba69b8b09.zip
Set the encryption type of the session keyblock to be the type used to
encrypt the ticket. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4667 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r--src/lib/krb5/krb/ChangeLog9
-rw-r--r--src/lib/krb5/krb/gc_2tgt.c2
-rw-r--r--src/lib/krb5/krb/gc_via_tgt.c2
3 files changed, 12 insertions, 1 deletions
diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index e8cf4de6e..b68f11e41 100644
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,6 +1,13 @@
+Thu Nov 17 01:56:05 1994 Theodore Y. Ts'o (tytso@dcl)
+
+ * gc_via_tgt.c (krb5_get_cred_via_tgt):
+ * gc_2tgt.c (krb5_get_cred_via_2tgt): Set the encryption type of
+ the session keyblock to be the type used to encrypt the
+ ticket.
+
Fri Nov 11 01:20:22 1994 Theodore Y. Ts'o (tytso@dcl)
- * get_in_tkt (krb5_get_in_tkt): Set the encryption type of the
+ * get_in_tkt.c (krb5_get_in_tkt): Set the encryption type of the
session keyblock to be the type used to encrypt the
ticket.
diff --git a/src/lib/krb5/krb/gc_2tgt.c b/src/lib/krb5/krb/gc_2tgt.c
index a1bf62dd5..639c94277 100644
--- a/src/lib/krb5/krb/gc_2tgt.c
+++ b/src/lib/krb5/krb/gc_2tgt.c
@@ -130,6 +130,8 @@ register krb5_creds * cred;
memset(&cred->keyblock.contents, 0, cred->keyblock.length);
krb5_xfree(cred->keyblock.contents);
}
+ cred->keyblock.magic = KV5M_KEYBLOCK;
+ cred->keyblock.etype = dec_rep->ticket->enc_part.etype;
if (retval = krb5_copy_keyblock_contents(dec_rep->enc_part2->session,
&cred->keyblock))
goto errout;
diff --git a/src/lib/krb5/krb/gc_via_tgt.c b/src/lib/krb5/krb/gc_via_tgt.c
index 2390d6b52..d2c565439 100644
--- a/src/lib/krb5/krb/gc_via_tgt.c
+++ b/src/lib/krb5/krb/gc_via_tgt.c
@@ -145,6 +145,8 @@ OLDDECLARG(krb5_creds *, cred)
memset(&cred->keyblock.contents, 0, cred->keyblock.length);
krb5_xfree(cred->keyblock.contents);
}
+ cred->keyblock.magic = KV5M_KEYBLOCK;
+ cred->keyblock.etype = dec_rep->ticket->enc_part.etype;
if (retval = krb5_copy_keyblock_contents(dec_rep->enc_part2->session,
&cred->keyblock)) {
cleanup();