diff options
| author | Theodore Tso <tytso@mit.edu> | 1994-11-11 05:33:17 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1994-11-11 05:33:17 +0000 |
| commit | 03d69d4ee58f5910315eeb6a062751f399c6ed98 (patch) | |
| tree | 2bc737a5861ea8da732407bba6602babb8436dee /src/lib | |
| parent | e89c322b1e0bad237436672eb98e8bcfac8a7497 (diff) | |
| download | krb5-03d69d4ee58f5910315eeb6a062751f399c6ed98.tar.gz krb5-03d69d4ee58f5910315eeb6a062751f399c6ed98.tar.xz krb5-03d69d4ee58f5910315eeb6a062751f399c6ed98.zip | |
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
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/krb5/krb/ChangeLog | 14 | ||||
| -rw-r--r-- | src/lib/krb5/krb/decrypt_tk.c | 1 | ||||
| -rw-r--r-- | src/lib/krb5/krb/rd_rep.c | 1 | ||||
| -rw-r--r-- | src/lib/krb5/krb/rd_req_dec.c | 1 |
4 files changed, 17 insertions, 0 deletions
diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog index 818f188d8..e7276c98a 100644 --- 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 893fade0f..41ddd301c 100644 --- 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 c1d8640f9..cea75674a 100644 --- 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 12a47742e..9f17f87c4 100644 --- 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; |