/*
- * 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 { \
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 < 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 */
*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))