r12863: As lha suggested to me a while back, it appears that the

gsskrb5_get_initiator_subkey() routine is bougs.  We can indeed use
gss_krb5_get_subkey().

This is fortunate, as there was a segfault bug in 'initiator' version.

Andrew Bartlett
(This used to be commit ec11870ca1f9231dd3eeae792fc3268b31477e11)

1 files changed, 0 insertions, 41 deletions

diff --git a/source4/heimdal/lib/gssapi/wrap.c b/source4/heimdal/lib/gssapi/wrap.c
index 50249d2d7f2..502137329cb 100644
--- a/source4/heimdal/lib/gssapi/wrap.c
+++ b/source4/heimdal/lib/gssapi/wrap.c
@@ -36,47 +36,6 @@
 RCSID("$Id: wrap.c,v 1.31 2005/01/05 02:52:12 lukeh Exp $");
 
 OM_uint32
-gsskrb5_get_initiator_subkey(OM_uint32 *minor_status,
-			     gss_ctx_id_t context_handle,
-			     gss_buffer_t key)
-{
-    krb5_error_code ret;
-    krb5_keyblock *skey = NULL;
-
-    HEIMDAL_MUTEX_lock(&context_handle->ctx_id_mutex);
-    if (context_handle->more_flags & LOCAL) {
-	ret = krb5_auth_con_getlocalsubkey(gssapi_krb5_context,
-					   context_handle->auth_context, 
-					   &skey);
-	if (ret) {
-		*minor_status = ret;
-		return GSS_KRB5_S_KG_NO_SUBKEY; /* XXX */
-	}
-	
-    } else {
-	ret = krb5_auth_con_getremotesubkey(gssapi_krb5_context,
-					    context_handle->auth_context, 
-					    &skey);
-	if (ret) {
-		*minor_status = ret;
-		return GSS_KRB5_S_KG_NO_SUBKEY; /* XXX */
-	}
-    
-    }
-    HEIMDAL_MUTEX_unlock(&context_handle->ctx_id_mutex);
-    key->length = skey->keyvalue.length;
-    key->value  = malloc (key->length);
-    if (!key->value) {
-	    krb5_free_keyblock(gssapi_krb5_context, skey);
-	    *minor_status = ENOMEM;
-	    return GSS_S_FAILURE;
-    }
-    memcpy(key->value, skey->keyvalue.data, key->length);
-    krb5_free_keyblock(gssapi_krb5_context, skey);
-    return 0;
-}
-
-OM_uint32
 gss_krb5_get_subkey(const gss_ctx_id_t context_handle,
 		    krb5_keyblock **key)
 {