Set the encryption type in the keyblock information in the decrypted

ticket/authenticator/rd_rep message to be the encryption type used to
encrypt said message.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4652 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 818f188d8fda50536bb8b595ad8dc0f6dab4cfc5..e7276c98a2aaec10b07d77c629aab923201fbd3e 100644 (file)
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,17 @@
+Thu Nov 10 23:56:43 1994  Theodore Y. Ts'o  (tytso@dcl)
+
+       * rd_rep.c (krb5_rd_rep): Set the encryption type in
+               the subkey keyblock to be the encryption type used to
+               encrypt the rd_rep message.
+
+       * decrypt_tk.c (krb5_decrypt_tkt_part): Set the encryption type in
+               the session keyblock to be the encryption type used to
+               encrypt the ticket.
+
+       * rd_req_dec.c (decrypt_authenticator): Set the encryption type in
+               the subkey keyblock to be the encryption type used to
+               encrypt the authenticator. 
+
 Tue Nov  8 17:09:48 1994  Theodore Y. Ts'o  (tytso@dcl)
 
        * in_tkt_pwd.c (pwd_keyproc): Use the documented interface for

diff --git a/src/lib/krb5/krb/decrypt_tk.c b/src/lib/krb5/krb/decrypt_tk.c
index 893fade0faf53f786c9125137726bf1eaf72d16f..41ddd301cf704c2248c92f3d71c61e1608818e2b 100644 (file)
--- a/src/lib/krb5/krb/decrypt_tk.c
+++ b/src/lib/krb5/krb/decrypt_tk.c
@@ -91,5 +91,6 @@ free(scratch.data);}
        ticket->enc_part2 = dec_tkt_part;
     }
     clean_scratch();
+    ticket->enc_part2->session->etype = ticket->enc_part.etype;
     return retval;
 }

diff --git a/src/lib/krb5/krb/rd_rep.c b/src/lib/krb5/krb/rd_rep.c
index c1d8640f94c770c588eb66a109aa876665693fbd..cea75674a869d468210f2a40dd5ef9516884910d 100644 (file)
--- a/src/lib/krb5/krb/rd_rep.c
+++ b/src/lib/krb5/krb/rd_rep.c
@@ -104,5 +104,6 @@ free(scratch.data);}
     /*  now decode the decrypted stuff */
     retval = decode_krb5_ap_rep_enc_part(&scratch, repl);
     clean_scratch();
+    (*repl)->subkey->etype = reply->enc_part.etype;
     return retval;
 }

diff --git a/src/lib/krb5/krb/rd_req_dec.c b/src/lib/krb5/krb/rd_req_dec.c
index 12a47742ef97852f206769357ee73499404c2952..9f17f87c4f1bdc36858afe552ed9894f57a17587 100644 (file)
--- a/src/lib/krb5/krb/rd_req_dec.c
+++ b/src/lib/krb5/krb/rd_req_dec.c
@@ -336,6 +336,7 @@ free(scratch.data);}
     /*  now decode the decrypted stuff */
     if (!(retval = decode_krb5_authenticator(&scratch, &local_auth))) {
        *authpp = local_auth;
+       local_auth->subkey->etype = request->authenticator.etype;
     }
     clean_scratch();
     return retval;