/*
- * 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.
*/
+/*
+ * Deserialise a context handle.
+ */
+
#include "gssapiP_eap.h"
+#define UPDATE_REMAIN(n) do { \
+ p += (n); \
+ remain -= (n); \
+ } while (0)
+
+#define CHECK_REMAIN(n) do { \
+ if (remain < (n)) { \
+ *minor = GSSEAP_TOK_TRUNC; \
+ return GSS_S_DEFECTIVE_TOKEN; \
+ } \
+ } while (0)
+
static OM_uint32
gssEapImportPartialContext(OM_uint32 *minor,
unsigned char **pBuf,
unsigned char *p = *pBuf;
size_t remain = *pRemain;
gss_buffer_desc buf;
+ size_t serverLen;
- /* XXX we also need to deserialise the current server name */
+ /* Selected RADIUS server */
+ CHECK_REMAIN(4);
+ serverLen = load_uint32_be(p);
+ UPDATE_REMAIN(4);
- if (remain < 4) {
- *minor = ERANGE;
- return GSS_S_DEFECTIVE_TOKEN;
+ if (serverLen != 0) {
+ CHECK_REMAIN(serverLen);
+
+ ctx->acceptorCtx.radServer = GSSEAP_MALLOC(serverLen + 1);
+ if (ctx->acceptorCtx.radServer == NULL) {
+ *minor = ENOMEM;
+ return GSS_S_FAILURE;
+ }
+ memcpy(ctx->acceptorCtx.radServer, p, serverLen);
+ ctx->acceptorCtx.radServer[serverLen] = '\0';
+
+ UPDATE_REMAIN(serverLen);
}
+
+ /* RADIUS state blob */
+ CHECK_REMAIN(4);
buf.length = load_uint32_be(p);
+ UPDATE_REMAIN(4);
- if (remain < buf.length) {
- *minor = ERANGE;
- return GSS_S_DEFECTIVE_TOKEN;
+ if (buf.length != 0) {
+ CHECK_REMAIN(buf.length);
- }
- buf.value = &p[4];
+ buf.value = p;
- major = duplicateBuffer(minor, &buf, &ctx->acceptorCtx.state);
- if (GSS_ERROR(major))
- return major;
+ major = duplicateBuffer(minor, &buf, &ctx->acceptorCtx.state);
+ if (GSS_ERROR(major))
+ return major;
+
+ UPDATE_REMAIN(buf.length);
+ }
- *pBuf += 4 + buf.length;
- *pRemain -= 4 + buf.length;
+ *pBuf = p;
+ *pRemain = remain;
return GSS_S_COMPLETE;
}
oidBuf.length = load_uint32_be(p);
if (remain < 4 + oidBuf.length || oidBuf.length == 0) {
- *minor = ERANGE;
+ *minor = GSSEAP_TOK_TRUNC;
return GSS_S_DEFECTIVE_TOKEN;
}
oidBuf.elements = &p[4];
- if (!gssEapIsConcreteMechanismOid(&oidBuf)) {
- return GSS_S_BAD_MECH;
- }
-
- if (!gssEapInternalizeOid(&oidBuf, pOid)) {
- major = duplicateOid(minor, &oidBuf, pOid);
- if (GSS_ERROR(major))
- return major;
- }
+ major = gssEapCanonicalizeOid(minor, &oidBuf, 0, pOid);
+ if (GSS_ERROR(major))
+ return major;
*pBuf += 4 + oidBuf.length;
*pRemain -= 4 + oidBuf.length;
gss_buffer_desc tmp;
if (remain < 12) {
- *minor = ERANGE;
+ *minor = GSSEAP_TOK_TRUNC;
return GSS_S_DEFECTIVE_TOKEN;
}
length = load_uint32_be(&p[8]);
if ((length != 0) != (encryptionType != ENCTYPE_NULL)) {
- *minor = ERANGE;
+ *minor = GSSEAP_BAD_CONTEXT_TOKEN;
return GSS_S_DEFECTIVE_TOKEN;
}
if (remain - 12 < length) {
- *minor = ERANGE;
+ *minor = GSSEAP_TOK_TRUNC;
return GSS_S_DEFECTIVE_TOKEN;
}
gss_buffer_desc tmp;
if (remain < 4) {
- *minor = ERANGE;
+ *minor = GSSEAP_TOK_TRUNC;
return GSS_S_DEFECTIVE_TOKEN;
}
tmp.length = load_uint32_be(p);
if (tmp.length != 0) {
if (remain - 4 < tmp.length) {
- *minor = ERANGE;
+ *minor = GSSEAP_TOK_TRUNC;
return GSS_S_DEFECTIVE_TOKEN;
}
size_t remain = token->length;
if (remain < 16) {
- *minor = ERANGE;
+ *minor = GSSEAP_TOK_TRUNC;
return GSS_S_DEFECTIVE_TOKEN;
}
if (load_uint32_be(&p[0]) != EAP_EXPORT_CONTEXT_V1) {
- *minor = EINVAL;
+ *minor = GSSEAP_BAD_CONTEXT_TOKEN;
return GSS_S_DEFECTIVE_TOKEN;
}
ctx->state = load_uint32_be(&p[4]);
remain -= 16;
/* Validate state */
- if (ctx->state < EAP_STATE_IDENTITY ||
- ctx->state > EAP_STATE_ESTABLISHED)
+ if (GSSEAP_SM_STATE(ctx) < GSSEAP_STATE_INITIAL ||
+ GSSEAP_SM_STATE(ctx) > GSSEAP_STATE_ESTABLISHED)
return GSS_S_DEFECTIVE_TOKEN;
/* Only acceptor can export partial context tokens */
}
if (remain < 24 + sequenceSize(ctx->seqState)) {
- *minor = ERANGE;
+ *minor = GSSEAP_TOK_TRUNC;
return GSS_S_DEFECTIVE_TOKEN;
}
- ctx->expiryTime = (time_t)load_uint64_be(&p[0]); /* XXX */
+ ctx->expiryTime = (time_t)load_uint64_be(&p[0]);
ctx->sendSeq = load_uint64_be(&p[8]);
ctx->recvSeq = load_uint64_be(&p[16]);
p += 24;
* acceptor 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 = gssEapImportPartialContext(minor, &p, &remain, ctx);
if (GSS_ERROR(major))
assert(remain == 0);
#endif
- *minor = 0;
major = GSS_S_COMPLETE;
+ *minor = 0;
return major;
}
*context_handle = GSS_C_NO_CONTEXT;
if (interprocess_token == GSS_C_NO_BUFFER ||
- interprocess_token->length == 0)
+ interprocess_token->length == 0) {
+ *minor = GSSEAP_TOK_TRUNC;
return GSS_S_DEFECTIVE_TOKEN;
+ }
major = gssEapAllocContext(minor, &ctx);
if (GSS_ERROR(major))