/*
- * 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 { \
#define CHECK_REMAIN(n) do { \
if (remain < (n)) { \
- *minor = GSSEAP_WRONG_SIZE; \
+ *minor = GSSEAP_TOK_TRUNC; \
return GSS_S_DEFECTIVE_TOKEN; \
} \
} while (0)
oidBuf.length = load_uint32_be(p);
if (remain < 4 + oidBuf.length || oidBuf.length == 0) {
- *minor = GSSEAP_WRONG_SIZE;
+ *minor = GSSEAP_TOK_TRUNC;
return GSS_S_DEFECTIVE_TOKEN;
}
gss_buffer_desc tmp;
if (remain < 12) {
- *minor = GSSEAP_WRONG_SIZE;
+ *minor = GSSEAP_TOK_TRUNC;
return GSS_S_DEFECTIVE_TOKEN;
}
}
if (remain - 12 < length) {
- *minor = GSSEAP_WRONG_SIZE;
+ *minor = GSSEAP_TOK_TRUNC;
return GSS_S_DEFECTIVE_TOKEN;
}
gss_buffer_desc tmp;
if (remain < 4) {
- *minor = GSSEAP_WRONG_SIZE;
+ *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 = GSSEAP_WRONG_SIZE;
+ *minor = GSSEAP_TOK_TRUNC;
return GSS_S_DEFECTIVE_TOKEN;
}
size_t remain = token->length;
if (remain < 16) {
- *minor = GSSEAP_WRONG_SIZE;
+ *minor = GSSEAP_TOK_TRUNC;
return GSS_S_DEFECTIVE_TOKEN;
}
if (load_uint32_be(&p[0]) != EAP_EXPORT_CONTEXT_V1) {
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 = GSSEAP_WRONG_SIZE;
+ *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;
}
OM_uint32 major, tmpMinor;
gss_ctx_id_t ctx = GSS_C_NO_CONTEXT;
- *minor = 0;
*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))