summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTheodore Tso <tytso@mit.edu>1994-12-13 20:31:19 +0000
committerTheodore Tso <tytso@mit.edu>1994-12-13 20:31:19 +0000
commit8f64320fdbcd0bfa88b70db1962b221ba16899d1 (patch)
tree76ffc5468ce2b331724a1e6372f95e161dc5c6ed /src
parentc4e770805a18bfc46bfe4b7d035712b1aab51c78 (diff)
downloadkrb5-8f64320fdbcd0bfa88b70db1962b221ba16899d1.tar.gz
krb5-8f64320fdbcd0bfa88b70db1962b221ba16899d1.tar.xz
krb5-8f64320fdbcd0bfa88b70db1962b221ba16899d1.zip
rd_req_dec.c (decrypt_authenticator): If the subkey doesn't exist,
don't try to set the subkey's etype. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4729 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r--src/lib/krb5/krb/ChangeLog5
-rw-r--r--src/lib/krb5/krb/rd_req_dec.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 59da66f82..612040c87 100644
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,8 @@
+Wed Dec 7 17:52:08 1994 <tytso@localhost>
+
+ * rd_req_dec.c (decrypt_authenticator): If the subkey doesn't
+ exist, don't try to set the subkey's etype.
+
Wed Nov 30 17:10:39 1994 Theodore Y. Ts'o (tytso@dcl)
* bld_princ.c (krb5_build_principal_va): Set the principal's type
diff --git a/src/lib/krb5/krb/rd_req_dec.c b/src/lib/krb5/krb/rd_req_dec.c
index 9f17f87c4..fc3a0f801 100644
--- a/src/lib/krb5/krb/rd_req_dec.c
+++ b/src/lib/krb5/krb/rd_req_dec.c
@@ -336,7 +336,8 @@ 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;
+ if (local_auth->subkey)
+ local_auth->subkey->etype = request->authenticator.etype;
}
clean_scratch();
return retval;