/*
- * Copyright (c) 2010, JANET(UK)
+ * Copyright (c) 2011, JANET(UK)
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
unsigned char *p = *pBuf;
size_t remain = *pRemain;
gss_buffer_desc buf;
- size_t serverLen;
+ size_t ctxLength, serverLen;
+
+ /* Length of partial RADIUS context */
+ CHECK_REMAIN(4);
+ ctxLength = load_uint32_be(p);
+ UPDATE_REMAIN(4);
+
+ CHECK_REMAIN(ctxLength);
+ remain = ctxLength; /* check against partial context length */
/* Selected RADIUS server */
CHECK_REMAIN(4);
UPDATE_REMAIN(buf.length);
}
+#ifdef GSSEAP_DEBUG
+ assert(remain == 0);
+#endif
+
*pBuf = p;
- *pRemain = remain;
+ *pRemain -= 4 + ctxLength;
return GSS_S_COMPLETE;
}
oidBuf.elements = &p[4];
- if (!gssEapIsConcreteMechanismOid(&oidBuf)) {
- *minor = GSSEAP_WRONG_MECH;
- 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;
remain -= 16;
/* Validate state */
- if (ctx->state < GSSEAP_STATE_IDENTITY ||
- ctx->state > GSSEAP_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 */
*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;
* The partial context should only be expected for unestablished
* acceptor contexts.
*/
- if (!CTX_IS_INITIATOR(ctx) && !CTX_IS_ESTABLISHED(ctx)) {
- assert((ctx->flags & CTX_FLAG_KRB_REAUTH) == 0);
-
+ if (!CTX_IS_INITIATOR(ctx) && !CTX_IS_ESTABLISHED(ctx) &&
+ (ctx->flags & CTX_FLAG_KRB_REAUTH) == 0) {
major = gssEapImportPartialContext(minor, &p, &remain, ctx);
if (GSS_ERROR(major))
return major;