svn rev #21575: branches/mskrb-integ/src/lib/gssapi/krb5/

[lhoward@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=21575
Commit By: lhoward
Log Message:
remove gsskrb5_get_subkey()



Changed Files:
U   branches/mskrb-integ/src/lib/gssapi/krb5/gssapiP_krb5.h
U   branches/mskrb-integ/src/lib/gssapi/krb5/inq_context.c
U   branches/mskrb-integ/src/lib/gssapi/krb5/krb5_gss_glue.c
Modified: branches/mskrb-integ/src/lib/gssapi/krb5/gssapiP_krb5.h
===================================================================
--- branches/mskrb-integ/src/lib/gssapi/krb5/gssapiP_krb5.h	2008-12-23 05:27:14 UTC (rev 21574)
+++ branches/mskrb-integ/src/lib/gssapi/krb5/gssapiP_krb5.h	2008-12-23 05:29:17 UTC (rev 21575)
@@ -920,14 +920,6 @@
 OM_uint32
 gss_krb5int_inq_session_key(OM_uint32 *, const gss_ctx_id_t, const gss_OID, gss_buffer_set_t *);
 
-#if 0 
-#define GSS_KRB5_GET_SUBKEY_OID_LENGTH 9
-#define GSS_KRB5_GET_SUBKEY_OID "\x2b\x06\x01\x04\x01\xa9\x4a\x13\x06"
-
-OM_uint32
-gss_krb5int_get_subkey(OM_uint32 *, const gss_ctx_id_t, const gss_OID, gss_buffer_set_t *);
-#endif
-
 #define GSS_KRB5_SET_CRED_RCACHE_OID_LENGTH 9
 #define GSS_KRB5_SET_CRED_RCACHE_OID "\x2b\x06\x01\x04\x01\xa9\x4a\x13\x0d"
 

Modified: branches/mskrb-integ/src/lib/gssapi/krb5/inq_context.c
===================================================================
--- branches/mskrb-integ/src/lib/gssapi/krb5/inq_context.c	2008-12-23 05:27:14 UTC (rev 21574)
+++ branches/mskrb-integ/src/lib/gssapi/krb5/inq_context.c	2008-12-23 05:29:17 UTC (rev 21575)
@@ -189,43 +189,7 @@
     return((lifetime == 0)?GSS_S_CONTEXT_EXPIRED:GSS_S_COMPLETE);
 }
 
-#if 0
 OM_uint32
-gss_krb5int_get_subkey(
-    OM_uint32 *minor_status,
-    const gss_ctx_id_t context_handle,
-    const gss_OID desired_object,
-    gss_buffer_set_t *data_set)
-{
-    OM_uint32 major_status;
-    krb5_error_code code;
-    krb5_gss_ctx_id_rec *ctx;
-    krb5_keyblock *key, *outkey;
-    gss_buffer_desc rep;
-
-    ctx = (krb5_gss_ctx_id_rec *) context_handle;
-    key = ctx->have_acceptor_subkey ? ctx->acceptor_subkey : ctx->subkey;
-
-    code = krb5_copy_keyblock(ctx->k5_context, key, &outkey);
-    if (code) {
-	*minor_status = code;
-	return GSS_S_FAILURE;
-    }
-
-    rep.value = &outkey;
-    rep.length = sizeof(outkey);
-
-    major_status = generic_gss_add_buffer_set_member(minor_status, &rep, data_set);
-    if (GSS_ERROR(major_status)) {
-	krb5_free_keyblock(ctx->k5_context, outkey);
-	return major_status;
-    }
-
-    return GSS_S_COMPLETE;
-}
-#endif
-
-OM_uint32
 gss_krb5int_inq_session_key(
     OM_uint32 *minor_status,
     const gss_ctx_id_t context_handle,

Modified: branches/mskrb-integ/src/lib/gssapi/krb5/krb5_gss_glue.c
===================================================================
--- branches/mskrb-integ/src/lib/gssapi/krb5/krb5_gss_glue.c	2008-12-23 05:27:14 UTC (rev 21574)
+++ branches/mskrb-integ/src/lib/gssapi/krb5/krb5_gss_glue.c	2008-12-23 05:29:17 UTC (rev 21575)
@@ -78,13 +78,7 @@
 	{GSS_KRB5_INQ_SESSION_KEY_OID_LENGTH, GSS_KRB5_INQ_SESSION_KEY_OID},
 	gss_krb5int_inq_session_key
     },
-#if 0
     {
-	{GSS_KRB5_GET_SUBKEY_OID_LENGTH, GSS_KRB5_GET_SUBKEY_OID},
-	gss_krb5int_get_subkey
-    },
-#endif
-    {
 	{GSS_KRB5_EXPORT_LUCID_SEC_CONTEXT_OID_LENGTH, GSS_KRB5_EXPORT_LUCID_SEC_CONTEXT_OID},
 	gss_krb5int_export_lucid_sec_context
     },
@@ -819,48 +813,6 @@
     return major_status;    
 }
 
-#if 0
-OM_uint32
-gsskrb5_get_subkey(
-    OM_uint32  *minor_status,
-    const gss_ctx_id_t context_handle,
-    krb5_keyblock **key)
-{
-    static const gss_OID_desc const req_oid = {
-	GSS_KRB5_GET_SUBKEY_OID_LENGTH,
-	GSS_KRB5_GET_SUBKEY_OID };
-    OM_uint32 major_status;
-    gss_buffer_set_t data_set = GSS_C_NO_BUFFER_SET;
-
-    if (minor_status == NULL)
-	return GSS_S_CALL_INACCESSIBLE_WRITE;
-
-    if (key == NULL)
-	return GSS_S_CALL_INACCESSIBLE_WRITE;
-
-    major_status = gss_inquire_sec_context_by_oid(minor_status,
-						  context_handle,
-						  (const gss_OID)&req_oid,
-						  &data_set);
-    if (major_status != GSS_S_COMPLETE)
-	return major_status;
-
-    if (data_set == GSS_C_NO_BUFFER_SET ||
-        data_set->count != 1 ||
-	data_set->elements[0].length != sizeof(*key)) {
-	return GSS_S_FAILURE;
-    }
-
-    *key = *((krb5_keyblock **)data_set->elements[0].value);
-
-    gss_release_buffer_set(minor_status, &data_set);
-
-    *minor_status = 0;
-
-    return GSS_S_COMPLETE;
-}
-#endif
-
 /*
  * This API should go away and be replaced with an accessor
  * into a gss_name_t.