gss_ctx_id_t ctx,
gss_buffer_t token)
{
- token->length = 0;
- token->value = NULL;
-
- /*
- * The format of this token awaits definition by libradsec.
- */
- return GSS_S_COMPLETE;
+ /* XXX we also need to serialise the current server name */
+ return duplicateBuffer(minor, &ctx->acceptorCtx.state, token);
}
static OM_uint32
{
OM_uint32 major, tmpMinor;
size_t length;
- gss_buffer_desc initiatorName, acceptorName;
- gss_buffer_desc partialCtx, key;
+ gss_buffer_desc initiatorName = GSS_C_EMPTY_BUFFER;
+ gss_buffer_desc acceptorName = GSS_C_EMPTY_BUFFER;
+ gss_buffer_desc partialCtx = GSS_C_EMPTY_BUFFER;
+ gss_buffer_desc key;
unsigned char *p;
- initiatorName.length = 0;
- initiatorName.value = NULL;
-
- acceptorName.length = 0;
- acceptorName.value = NULL;
-
- partialCtx.length = 0;
- partialCtx.value = NULL;
-
if ((CTX_IS_INITIATOR(ctx) && !CTX_IS_ESTABLISHED(ctx)) ||
ctx->mechanismUsed == GSS_C_NO_OID)
return GSS_S_NO_CONTEXT;
key.value = KRB_KEY_DATA(&ctx->rfc3961Key);
if (ctx->initiatorName != GSS_C_NO_NAME) {
- major = gssEapExportName(minor, ctx->initiatorName, &initiatorName, TRUE);
+ major = gssEapExportNameInternal(minor, ctx->initiatorName,
+ &initiatorName,
+ EXPORT_NAME_FLAG_COMPOSITE);
if (GSS_ERROR(major))
goto cleanup;
}
if (ctx->acceptorName != GSS_C_NO_NAME) {
- major = gssEapExportName(minor, ctx->acceptorName, &acceptorName, TRUE);
+ major = gssEapExportNameInternal(minor, ctx->acceptorName,
+ &acceptorName,
+ EXPORT_NAME_FLAG_COMPOSITE);
if (GSS_ERROR(major))
goto cleanup;
}
* contexts.
*/
if (!CTX_IS_INITIATOR(ctx) && !CTX_IS_ESTABLISHED(ctx)) {
+ assert((ctx->flags & CTX_FLAG_KRB_REAUTH_GSS) == 0);
+
major = gssEapExportPartialContext(minor, ctx, &partialCtx);
if (GSS_ERROR(major))
goto cleanup;
store_uint64_be(ctx->sendSeq, &p[8]);
store_uint64_be(ctx->recvSeq, &p[16]);
p += 24;
- sequenceExternalize(ctx->seqState, &p, &length);
+
+ major = sequenceExternalize(minor, ctx->seqState, &p, &length);
+ if (GSS_ERROR(major))
+ goto cleanup;
if (partialCtx.value != NULL)
p = store_buffer(&partialCtx, p, FALSE);
OM_uint32 major, tmpMinor;
gss_ctx_id_t ctx = *context_handle;
+ interprocess_token->length = 0;
+ interprocess_token->value = NULL;
+
if (ctx == GSS_C_NO_CONTEXT)
return GSS_S_NO_CONTEXT;