gss_buffer_desc buf;
gss_OID_desc oid;
- buf.length = ctx->rfc3961Key.length;
- buf.value = ctx->rfc3961Key.contents;
+ buf.length = KRB_KEY_LENGTH(&ctx->rfc3961Key);
+ buf.value = KRB_KEY_DATA(&ctx->rfc3961Key);
major = gss_add_buffer_set_member(minor, &buf, dataSet);
if (GSS_ERROR(major))
{ 11, "\x2a\x86\x48\x86\xf7\x12\x01\x02\x02\x05\x05" },
inquireSessionKey
},
+ {
+ /* GSS_KRB5_EXPORT_LUCID_SEC_CONTEXT + v1 */
+ { 12, "\x2a\x86\x48\x86\xf7\x12\x01\x02\x02\x05\x06\x01" },
+ gssEapExportLucidSecContext
+ },
};
OM_uint32
gss_inquire_sec_context_by_oid(OM_uint32 *minor,
- const gss_ctx_id_t context_handle,
+ const gss_ctx_id_t ctx,
const gss_OID desired_object,
gss_buffer_set_t *data_set)
{
- OM_uint32 major = GSS_S_UNAVAILABLE;
+ OM_uint32 major;
int i;
*data_set = GSS_C_NO_BUFFER_SET;
+ GSSEAP_MUTEX_LOCK(&ctx->mutex);
+
+ if (!CTX_IS_ESTABLISHED(ctx)) {
+ *minor = GSSEAP_CONTEXT_INCOMPLETE;
+ major = GSS_S_NO_CONTEXT;
+ goto cleanup;
+ }
+
+ major = GSS_S_UNAVAILABLE;
+
for (i = 0; i < sizeof(inquireCtxOps) / sizeof(inquireCtxOps[0]); i++) {
if (oidEqual(&inquireCtxOps[i].oid, desired_object)) {
- major = (*inquireCtxOps[i].inquire)(minor, context_handle,
+ major = (*inquireCtxOps[i].inquire)(minor, ctx,
desired_object, data_set);
break;
}
}
+cleanup:
+ GSSEAP_MUTEX_UNLOCK(&ctx->mutex);
+
return major;
}