From: Greg Hudson <ghudson@mit.edu>
Date: Thu, 7 Jun 2012 16:41:48 +0000 (-0400)
Subject: Remove krb5_is_permitted_enctype_ext
X-Git-Tag: krb5-1.11-alpha1~510
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d1caa110226f85b4001a97afa05ef479018c511;p=thirdparty%2Fkrb5.git

Remove krb5_is_permitted_enctype_ext

It's an internal function (not in krb5.h or the libkrb5 export list)
and nothing uses it.
---

diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index ee15eacd8b..539c8831ac 100644
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -2324,16 +2324,6 @@ void KRB5_CALLCONV krb5_free_ktypes(krb5_context, krb5_enctype *);
 
 krb5_boolean krb5_is_permitted_enctype(krb5_context, krb5_enctype);
 
-typedef struct
-{
-    krb5_enctype *etype;
-    krb5_boolean *etype_ok;
-    krb5_int32 etype_count;
-} krb5_etypes_permitted;
-
-krb5_boolean krb5_is_permitted_enctype_ext(krb5_context,
-                                           krb5_etypes_permitted *);
-
 krb5_boolean KRB5_CALLCONV krb5int_c_weak_enctype(krb5_enctype);
 
 krb5_error_code krb5_kdc_rep_decrypt_proc(krb5_context, const krb5_keyblock *,
diff --git a/src/lib/krb5/krb/init_ctx.c b/src/lib/krb5/krb/init_ctx.c
index 0e44f3dd93..8455b5043d 100644
--- a/src/lib/krb5/krb/init_ctx.c
+++ b/src/lib/krb5/krb/init_ctx.c
@@ -594,35 +594,3 @@ krb5_is_permitted_enctype(krb5_context context, krb5_enctype etype)
 
     return(ret);
 }
-
-/* The same as krb5_is_permitted_enctype, but verifies multiple etype's
- * Returns 0 is either the list of the permitted enc types is not available
- * or all requested etypes are not permitted. Otherwise returns 1.
- */
-
-krb5_boolean
-krb5_is_permitted_enctype_ext ( krb5_context context,
-                                krb5_etypes_permitted *etypes)
-{
-    krb5_enctype *list, *ptr;
-    krb5_boolean ret = 0;
-    int i = 0;
-
-    if (krb5_get_permitted_enctypes(context, &list))
-        return(0);
-
-    for ( i=0; i< etypes->etype_count; i++ )
-    {
-        for (ptr = list; *ptr; ptr++)
-        {
-            if (*ptr == etypes->etype[i])
-            {
-                etypes->etype_ok[i] =  TRUE;
-                ret = 1;
-            }
-        }
-    }
-    krb5_free_ktypes (context, list);
-
-    return(ret);
-}