aboutsummaryrefslogtreecommitdiff
path: root/src/krb524
diff options
context:
space:
mode:
authorSam Hartman <hartmans@mit.edu>1996-01-27 06:40:36 +0000
committerSam Hartman <hartmans@mit.edu>1996-01-27 06:40:36 +0000
commit96e594edc132c8d7b1661d68ec89dcb43f481457 (patch)
tree6c22c6bdd70b2f7bd897adae205f79c731c7eb30 /src/krb524
parentdc1cc607fbfe10d8b4236163daa636bf63713c07 (diff)
downloadkrb5-96e594edc132c8d7b1661d68ec89dcb43f481457.zip
krb5-96e594edc132c8d7b1661d68ec89dcb43f481457.tar.gz
krb5-96e594edc132c8d7b1661d68ec89dcb43f481457.tar.bz2
Fix bug in finding the tgs key;
we really really want to avoid encrypting v4 tickets in DES3 keys. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7407 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/krb524')
-rw-r--r--src/krb524/ChangeLog7
-rw-r--r--src/krb524/cnv_tkt_skey.c1
-rw-r--r--src/krb524/krb524d.c4
3 files changed, 10 insertions, 2 deletions
diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog
index d95aa09..359d7a6 100644
--- a/src/krb524/ChangeLog
+++ b/src/krb524/ChangeLog
@@ -1,3 +1,10 @@
+Sat Jan 27 01:31:12 1996 Sam Hartman <hartmans@tertius.mit.edu>
+
+ * krb524d.c (kdc_get_server_key): If an enctype is given, then use
+ iit even after falling back from trying a v4salt. If we don't, we
+ have a good chance fo getting the DES3 TGT service key, and that
+ just doesn't do what we want.
+
Thu Jan 25 02:07:46 1996 Sam Hartman <hartmans@tertius.mit.edu>
* cnv_tkt_skey.c (krb524_convert_tkt_skey): Take both a v5 and v4
diff --git a/src/krb524/cnv_tkt_skey.c b/src/krb524/cnv_tkt_skey.c
index 8423197..f4d97f8 100644
--- a/src/krb524/cnv_tkt_skey.c
+++ b/src/krb524/cnv_tkt_skey.c
@@ -1,3 +1,4 @@
+
/*
* Copyright 1994 by OpenVision Technologies, Inc.
*
diff --git a/src/krb524/krb524d.c b/src/krb524/krb524d.c
index e062a33..396056b 100644
--- a/src/krb524/krb524d.c
+++ b/src/krb524/krb524d.c
@@ -441,7 +441,7 @@ krb5_error_code kdc_get_server_key(context, service, key, kvno, ktype)
krb5_principal service;
krb5_keyblock *key;
krb5_kvno *kvno;
-krb5_enctype ktype;
+ krb5_enctype ktype;
{
krb5_error_code ret;
int nprincs;
@@ -476,7 +476,7 @@ krb5_enctype ktype;
&pkey) &&
krb5_dbe_find_enctype(context,
&server,
- -1,
+ ktype,
-1,
-1,
&pkey))