projects
/
moonshot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/master' into HEAD
[moonshot.git]
/
moonshot
/
mech_eap
/
export_sec_context.c
diff --git
a/moonshot/mech_eap/export_sec_context.c
b/moonshot/mech_eap/export_sec_context.c
index
43f3f28
..
1426d62
100644
(file)
--- a/
moonshot/mech_eap/export_sec_context.c
+++ b/
moonshot/mech_eap/export_sec_context.c
@@
-38,7
+38,7
@@
#include "gssapiP_eap.h"
static OM_uint32
#include "gssapiP_eap.h"
static OM_uint32
-
gssEapExportPartial
Context(OM_uint32 *minor,
+
exportPartialRadius
Context(OM_uint32 *minor,
gss_ctx_id_t ctx,
gss_buffer_t token)
{
gss_ctx_id_t ctx,
gss_buffer_t token)
{
@@
-143,7
+143,7
@@
gssEapExportSecContext(OM_uint32 *minor,
*/
if (!CTX_IS_INITIATOR(ctx) && !CTX_IS_ESTABLISHED(ctx) &&
(ctx->flags & CTX_FLAG_KRB_REAUTH) == 0) {
*/
if (!CTX_IS_INITIATOR(ctx) && !CTX_IS_ESTABLISHED(ctx) &&
(ctx->flags & CTX_FLAG_KRB_REAUTH) == 0) {
- major =
gssEapExportPartial
Context(minor, ctx, &partialCtx);
+ major =
exportPartialRadius
Context(minor, ctx, &partialCtx);
if (GSS_ERROR(major))
goto cleanup;
}
if (GSS_ERROR(major))
goto cleanup;
}
@@
-155,6
+155,9
@@
gssEapExportSecContext(OM_uint32 *minor,
length += 4 + acceptorName.length; /* acceptorName.value */
length += 24 + sequenceSize(ctx->seqState); /* seqState */
length += 4 + acceptorName.length; /* acceptorName.value */
length += 24 + sequenceSize(ctx->seqState); /* seqState */
+ if (!CTX_IS_INITIATOR(ctx) && !CTX_IS_ESTABLISHED(ctx))
+ length += 4 + ctx->conversation.length;
+
if (partialCtx.value != NULL)
length += 4 + partialCtx.length; /* partialCtx.value */
if (partialCtx.value != NULL)
length += 4 + partialCtx.length; /* partialCtx.value */
@@
-190,6
+193,9
@@
gssEapExportSecContext(OM_uint32 *minor,
if (GSS_ERROR(major))
goto cleanup;
if (GSS_ERROR(major))
goto cleanup;
+ if (!CTX_IS_INITIATOR(ctx) && !CTX_IS_ESTABLISHED(ctx))
+ p = store_buffer(&ctx->conversation, p, FALSE);
+
if (partialCtx.value != NULL)
p = store_buffer(&partialCtx, p, FALSE);
if (partialCtx.value != NULL)
p = store_buffer(&partialCtx, p, FALSE);