Remove check to make sure ticket enctype

is in the tgs enctypes.

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

diff --git a/src/lib/krb5/ccache/memory/ChangeLog b/src/lib/krb5/ccache/memory/ChangeLog
index 2064c8c39c1b83c4f43ed6e0730eb431b477a881..7ea831a2a236b34131e1578bf4975e8c9290ed04 100644 (file)
--- a/src/lib/krb5/ccache/memory/ChangeLog
+++ b/src/lib/krb5/ccache/memory/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb  1 15:47:25 1996  Sam Hartman  <hartmans@tertius.mit.edu>
+
+       * mcc_retrv.c (ktype_reasonable): removed.
+       (krb5_mcc_retrieve): Accept any enctype unless matching spefic enctype match.
+
 Thu Jan 25 14:50:51 1996  Sam Hartman  <hartmans@tertius.mit.edu>
 
        * mcc_retrv.c (ktype_reasonable): Rename ktype_match

diff --git a/src/lib/krb5/ccache/memory/mcc_retrv.c b/src/lib/krb5/ccache/memory/mcc_retrv.c
index 9280c73b7bc0ec71a1c6b963d2784571eaf461fb..582157904404c578fe3e149c615b5f5be17aade0 100644 (file)
--- a/src/lib/krb5/ccache/memory/mcc_retrv.c
+++ b/src/lib/krb5/ccache/memory/mcc_retrv.c
@@ -64,29 +64,7 @@ register const krb5_data *data1, *data2;
        return memcmp(data1->data, data2->data, data1->length) ? FALSE : TRUE;
 }
 
-static krb5_boolean
-ktype_reasonable(context, creds)
-    register krb5_context context;
-    register krb5_creds *creds;
-{
-    register int i;
-    krb5_enctype * ktypes = (krb5_enctype *) NULL;
-    krb5_enctype enctype = creds->keyblock.enctype;
-    krb5_principal princ = creds->server;
-
-    if (krb5_get_tgs_ktypes(context, princ, &ktypes))
-       return FALSE;
 
-    for (i=0; ktypes[i]; i++) {
-       if (ktypes[i] == enctype) {
-           free(ktypes);
-           return TRUE;
-       }
-    }
-
-    free(ktypes);
-    return FALSE;
-}
 
 /*
  * Effects:
@@ -153,8 +131,7 @@ krb5_mcc_retrieve(context, id, whichfields, mcreds, creds)
              (! set(KRB5_TC_MATCH_2ND_TKT) ||
               data_match (&mcreds->second_ticket, &fetchcreds.second_ticket))
              &&
-             ((! set(KRB5_TC_MATCH_KTYPE) &&
-               ktype_reasonable (context, &fetchcreds))||
+             ((! set(KRB5_TC_MATCH_KTYPE))||
               (mcreds->keyblock.enctype == fetchcreds.keyblock.enctype))
              )
          {

diff --git a/src/lib/krb5/ccache/stdio/ChangeLog b/src/lib/krb5/ccache/stdio/ChangeLog
index 1b3e55b9792a911819b59fd4caa1504f11005f83..072fe2b24d0c9a0601f65911b064fa0ef3bea93e 100644 (file)
--- a/src/lib/krb5/ccache/stdio/ChangeLog
+++ b/src/lib/krb5/ccache/stdio/ChangeLog
@@ -1,3 +1,7 @@
+Thu Feb  1 15:50:29 1996  Sam Hartman  <hartmans@tertius.mit.edu>
+
+       * scc_retrv.c (krb5_scc_retrieve): Accept any enctype unless doing a specific match.
+
 Thu Jan 25 14:44:48 1996  Sam Hartman  <hartmans@tertius.mit.edu>
 
        * scc_retrv.c (ktype_reasonable): Rename ktype_match; see fcc  for explanation.

diff --git a/src/lib/krb5/ccache/stdio/scc_retrv.c b/src/lib/krb5/ccache/stdio/scc_retrv.c
index 0c905d7c98b559d8e50c57f4463e84b705116bd3..9b91a685e775521fe7ab1fea80fc7be98050326e 100644 (file)
--- a/src/lib/krb5/ccache/stdio/scc_retrv.c
+++ b/src/lib/krb5/ccache/stdio/scc_retrv.c
@@ -134,29 +134,6 @@ register const krb5_data *data1, *data2;
        return memcmp(data1->data, data2->data, data1->length) ? FALSE : TRUE;
 }
 
-static krb5_boolean
-ktype_reasonable(context, creds)
-    register krb5_context context;
-    register krb5_creds *creds;
-{
-    register int i;
-    krb5_enctype * ktypes = (krb5_enctype *) NULL;
-    krb5_enctype enctype = creds->keyblock.enctype;
-    krb5_principal princ = creds->server;
-
-    if (krb5_get_tgs_ktypes(context, princ, &ktypes))
-       return FALSE;
-
-    for (i=0; ktypes[i]; i++) {
-       if (ktypes[i] == enctype) {
-           free(ktypes);
-           return TRUE;
-       }
-    }
-
-    free(ktypes);
-    return FALSE;
-}
 
 /*
  * Effects:
@@ -223,8 +200,7 @@ krb5_scc_retrieve(context, id, whichfields, mcreds, creds)
              (! set(KRB5_TC_MATCH_2ND_TKT) ||
               data_match (&mcreds->second_ticket, &fetchcreds.second_ticket))
              &&
-             ((! set(KRB5_TC_MATCH_KTYPE)&&
-               ktype_reasonable (context, &fetchcreds))||
+             ((! set(KRB5_TC_MATCH_KTYPE))||
                  (mcreds->keyblock.enctype == fetchcreds.keyblock.enctype))
              )
          {