in_tkt_sky.c (skey_keyproc()), rd_req_dec.c (krb5_rd_req_decoded())

		use new API for krb5_kt_get_entry.

get_fcreds.c Removed #include<krb5/crc-32.h> and #include<krb5/asn1.h>

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

diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 6a4d7b6f7646ac242ca8e00b9c2541be94aa6e14..1eff8d70fbb0169174c340a4688f5fac7d67c1da 100644 (file)
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,12 @@
+Sat Jan 28 14:45:55 1995 Chris Provenzano (proven@mit.edu)
+
+       * in_tkt_sky.c (skey_keyproc()), rd_req_dec.c (krb5_rd_req_decoded())
+               use new API for krb5_kt_get_entry.
+
+Fri Jan 27 15:45:45 1995 Chris Provenzano (proven@mit.edu)
+
+       * get_fcreds.c Removed #include<krb5/crc-32.h> and #include<krb5/asn1.h>
+
 Wed Jan 25 16:54:40 1995  Chris Provenzano (proven@mit.edu)
 
        * Removed all narrow types and references to wide.h and narrow.h

diff --git a/src/lib/krb5/krb/get_fcreds.c b/src/lib/krb5/krb/get_fcreds.c
index a520e5aff424cf0485c265418b7e3d1e77171ef5..7b771965bfc3d330ec47dac18a6384c2d18e3308 100644 (file)
--- a/src/lib/krb5/krb/get_fcreds.c
+++ b/src/lib/krb5/krb/get_fcreds.c
@@ -1,5 +1,5 @@
 /*
- * lib/krb5/krb/mk_cred.c
+ * lib/krb5/krb/get_fcreds.c
  *
  * Copyright 1994 by the Massachusetts Institute of Technology.
  * All Rights Reserved.
@@ -20,7 +20,7 @@
  * this software for any purpose.  It is provided "as is" without express
  * or implied warranty.
  * 
- * krb5_mk_cred()
+ * krb5_get_for_creds()
  */
 
 /* XXX This API is going to change; what's here isn't general enough! XXX */
@@ -35,8 +35,6 @@
 #include <netdb.h>
 
 #include <krb5/krb5.h>
-#include <krb5/asn1.h>
-#include <krb5/crc-32.h>
 #include <krb5/los-proto.h>
 #include <krb5/ext-proto.h>
 

diff --git a/src/lib/krb5/krb/in_tkt_sky.c b/src/lib/krb5/krb/in_tkt_sky.c
index cc9a89bc3dcc3754b941c60da22615a093fb24e5..f6184585774d980d83e5819567c52b0ff9ff174c 100644 (file)
--- a/src/lib/krb5/krb/in_tkt_sky.c
+++ b/src/lib/krb5/krb/in_tkt_sky.c
@@ -65,6 +65,7 @@ skey_keyproc(context, type, key, keyseed, padata)
            return retval;
        if (retval = krb5_kt_get_entry(context, kt_id, arg->client,
                                       0, /* don't have vno available */
+                                      type,
                                       &kt_ent))
            return retval;
     }

diff --git a/src/lib/krb5/krb/rd_req_dec.c b/src/lib/krb5/krb/rd_req_dec.c
index cad8f99b838b7c5207fbc9210ca75f74de533e21..93b729aeace74c321b6441a194d1dd30910a0ca0 100644 (file)
--- a/src/lib/krb5/krb/rd_req_dec.c
+++ b/src/lib/krb5/krb/rd_req_dec.c
@@ -111,8 +111,16 @@ krb5_rd_req_decoded(context, req, server, sender_addr, fetchfrom, keyproc,
            retval = krb5_kt_default(context, &keytabid);
        }
        if (!retval) {
+           /*
+            * OK we know the encryption type req->ticket->enc_part.etype, 
+            * and now we need to get the keytype
+            */
+           krb5_keytype keytype = krb5_csarray[req->ticket->enc_part.etype]->
+                                       system->proto_keytype;
+
            retval = krb5_kt_get_entry(context, keytabid, req->ticket->server,
-                                      req->ticket->enc_part.kvno, &ktentry);
+                                      req->ticket->enc_part.kvno, keytype,
+                                      &ktentry);
            (void) krb5_kt_close(context, keytabid);
            if (!retval) {
                retval = krb5_copy_keyblock(context, &ktentry.key, &tkt_key);