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

diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index e8cf4de6e3a299b6fb4044ff85fdb6191f020886..b68f11e41559f2cc1cfe7649ac078f48b697ba91 100644 (file)
--- 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 a1bf62dd5af6d740709185c22b6325f47296dd59..639c942779e640b73f8e5e2c4d55bdaf9832b9c4 100644 (file)
--- 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 2390d6b521c792fa5d8de432e26bfaefc073619f..d2c565439f41e468ad2e35060b87bc2a4b7207ac 100644 (file)
--- 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();