/*
- * Copyright (c) 2010, JANET(UK)
+ * Copyright (c) 2011, JANET(UK)
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* SUCH DAMAGE.
*/
+/*
+ * Serialise a security context. On the acceptor, this may be partially
+ * established.
+ */
+
#include "gssapiP_eap.h"
static OM_uint32
unsigned char *p;
char serverBuf[MAXHOSTNAMELEN];
- if (ctx->acceptorCtx.radConn != NULL &&
- rs_conn_get_current_server(ctx->acceptorCtx.radConn,
- serverBuf, sizeof(serverBuf)) == 0)
+ if (ctx->acceptorCtx.radConn != NULL) {
+ if (rs_conn_get_current_peer(ctx->acceptorCtx.radConn,
+ serverBuf, sizeof(serverBuf)) != 0) {
+ return gssEapRadiusMapError(minor,
+ rs_err_conn_pop(ctx->acceptorCtx.radConn));
+ }
serverLen = strlen(serverBuf);
+ }
length = 4 + serverLen + 4 + ctx->acceptorCtx.state.length;
token->value = GSSEAP_MALLOC(length);
if (token->value == NULL) {
- *minor = ENOMEM;
major = GSS_S_FAILURE;
+ *minor = ENOMEM;
goto cleanup;
}
token->length = length;
assert(p == (unsigned char *)token->value + token->length);
+ major = GSS_S_COMPLETE;
+ *minor = 0;
+
cleanup:
if (GSS_ERROR(major))
gss_release_buffer(&tmpMinor, token);
unsigned char *p;
if ((CTX_IS_INITIATOR(ctx) && !CTX_IS_ESTABLISHED(ctx)) ||
- ctx->mechanismUsed == GSS_C_NO_OID)
+ ctx->mechanismUsed == GSS_C_NO_OID) {
+ *minor = GSSEAP_CONTEXT_INCOMPLETE;
return GSS_S_NO_CONTEXT;
+ }
key.length = KRB_KEY_LENGTH(&ctx->rfc3961Key);
key.value = KRB_KEY_DATA(&ctx->rfc3961Key);
* contexts.
*/
if (!CTX_IS_INITIATOR(ctx) && !CTX_IS_ESTABLISHED(ctx)) {
- assert((ctx->flags & CTX_FLAG_KRB_REAUTH_GSS) == 0);
+ assert((ctx->flags & CTX_FLAG_KRB_REAUTH) == 0);
major = gssEapExportPartialContext(minor, ctx, &partialCtx);
if (GSS_ERROR(major))
token->value = GSSEAP_MALLOC(length);
if (token->value == NULL) {
- *minor = ENOMEM;
major = GSS_S_FAILURE;
+ *minor = ENOMEM;
goto cleanup;
}
token->length = length;
if (ctx == GSS_C_NO_CONTEXT) {
*minor = EINVAL;
- return GSS_S_NO_CONTEXT;
+ return GSS_S_CALL_INACCESSIBLE_READ | GSS_S_NO_CONTEXT;
}
*minor = 0;