static OM_uint32
acceptReady(OM_uint32 *minor, gss_ctx_id_t ctx, gss_cred_id_t cred)
{
- OM_uint32 major;
+ OM_uint32 major, tmpMinor;
VALUE_PAIR *vp;
gss_buffer_desc nameBuf = GSS_C_EMPTY_BUFFER;
if (GSS_ERROR(major))
return major;
+ gssEapReleaseName(&tmpMinor, &ctx->initiatorName);
+
vp = rc_avpair_get(ctx->acceptorCtx.avps, PW_USER_NAME, 0);
if (vp != NULL) {
nameBuf.length = vp->lvalue;
nameBuf.value = vp->strvalue;
- } else if (ctx->initiatorName == GSS_C_NO_NAME) {
+ } else {
ctx->gssFlags |= GSS_C_ANON_FLAG;
}
- if (nameBuf.length != 0 || ctx->initiatorName == GSS_C_NO_NAME) {
- major = gssEapImportName(minor, &nameBuf, GSS_C_NT_USER_NAME,
- &ctx->initiatorName);
- if (GSS_ERROR(major))
- return major;
- }
+ major = gssEapImportName(minor, &nameBuf, GSS_C_NT_USER_NAME,
+ &ctx->initiatorName);
+ if (GSS_ERROR(major))
+ return major;
ctx->initiatorName->attrCtx = gssEapCreateAttrContext(cred, ctx);
vp = rc_avpair_get(ctx->acceptorCtx.avps,
- RADIUS_VENDOR_ATTR_MS_MPPE_SEND_KEY,
- RADIUS_VENDOR_ID_MICROSOFT);
+ VENDOR_ATTR_MS_MPPE_SEND_KEY,
+ VENDOR_ID_MICROSOFT);
if (ctx->encryptionType != ENCTYPE_NULL && vp != NULL) {
major = gssEapDeriveRfc3961Key(minor,
(unsigned char *)vp->strvalue,
if (GSS_ERROR(major))
return major;
- if (ctx->acceptorName == GSS_C_NO_NAME &&
- cred != GSS_C_NO_CREDENTIAL &&
- cred->name != GSS_C_NO_NAME) {
- major = gss_duplicate_name(minor, cred->name, &ctx->acceptorName);
+ assert(ctx->acceptorName == GSS_C_NO_NAME);
+
+ if (cred != GSS_C_NO_CREDENTIAL && cred->name != GSS_C_NO_NAME) {
+ major = gssEapDuplicateName(minor, cred->name, &ctx->acceptorName);
if (GSS_ERROR(major))
return major;
}
}
static OM_uint32
-importInitiatorIdentity(OM_uint32 *minor,
- gss_ctx_id_t ctx,
- gss_buffer_t inputToken,
- gss_buffer_t nameBuf)
+setAcceptorIdentity(OM_uint32 *minor,
+ gss_ctx_id_t ctx,
+ VALUE_PAIR **avps)
{
- OM_uint32 major, tmpMinor;
- struct eap_hdr *pdu = (struct eap_hdr *)inputToken->value;
- unsigned char *pos = (unsigned char *)(pdu + 1);
- gss_name_t name;
+ OM_uint32 major;
+ gss_buffer_desc nameBuf;
+ krb5_context krbContext = NULL;
+ krb5_principal krbPrinc;
+
+ /* Awaits further specification */
+ if (ctx->acceptorName == GSS_C_NO_NAME)
+ return GSS_S_COMPLETE;
+
+ GSSEAP_KRB_INIT(&krbContext);
+
+ krbPrinc = ctx->acceptorName->krbPrincipal;
+ assert(krbPrinc != NULL);
- assert(pdu->code == EAP_CODE_RESPONSE);
- assert(pos[0] == EAP_TYPE_IDENTITY);
+ if (krb5_princ_size(krbContext, krbPrinc) < 2)
+ return GSS_S_BAD_NAME;
- nameBuf->value = pos + 1;
- nameBuf->length = inputToken->length - sizeof(*pdu) - 1;
+ /* Acceptor-Service-Name */
+ krbDataToGssBuffer(krb5_princ_component(krbContext, krbPrinc, 0), &nameBuf);
- major = gssEapImportName(minor, nameBuf, GSS_C_NT_USER_NAME, &name);
+ major = addAvpFromBuffer(minor, ctx->acceptorCtx.radHandle, avps,
+ VENDOR_ATTR_GSS_ACCEPTOR_SERVICE_NAME,
+ VENDOR_ID_UKERNA,
+ &nameBuf);
if (GSS_ERROR(major))
return major;
- gssEapReleaseName(&tmpMinor, &ctx->initiatorName);
- ctx->initiatorName = name;
+ /* Acceptor-Host-Name */
+ krbDataToGssBuffer(krb5_princ_component(krbContext, krbPrinc, 1), &nameBuf);
+
+ major = addAvpFromBuffer(minor, ctx->acceptorCtx.radHandle, avps,
+ VENDOR_ATTR_GSS_ACCEPTOR_HOST_NAME,
+ VENDOR_ID_UKERNA,
+ &nameBuf);
+ if (GSS_ERROR(major))
+ return major;
+
+ if (krb5_princ_size(krbContext, krbPrinc) > 2) {
+ /* Acceptor-Service-Specific */
+ krb5_principal_data ssiPrinc = *krbPrinc;
+ char *ssi;
+
+ krb5_princ_size(krbContext, &ssiPrinc) -= 2;
+ krb5_princ_name(krbContext, &ssiPrinc) += 2;
+
+ *minor = krb5_unparse_name_flags(krbContext, &ssiPrinc,
+ KRB5_PRINCIPAL_UNPARSE_NO_REALM, &ssi);
+ if (*minor != 0)
+ return GSS_S_FAILURE;
+
+ nameBuf.value = ssi;
+ nameBuf.length = strlen(ssi);
+
+ major = addAvpFromBuffer(minor, ctx->acceptorCtx.radHandle, avps,
+ VENDOR_ATTR_GSS_ACCEPTOR_SERVICE_SPECIFIC,
+ VENDOR_ID_UKERNA,
+ &nameBuf);
+
+ if (GSS_ERROR(major)) {
+ krb5_free_unparsed_name(krbContext, ssi);
+ return major;
+ }
+ krb5_free_unparsed_name(krbContext, ssi);
+ }
+
+ krbDataToGssBuffer(krb5_princ_realm(krbContext, krbPrinc), &nameBuf);
+ if (nameBuf.length != 0) {
+ /* Acceptor-Realm-Name */
+ major = addAvpFromBuffer(minor, ctx->acceptorCtx.radHandle, avps,
+ VENDOR_ATTR_GSS_ACCEPTOR_REALM_NAME,
+ VENDOR_ID_UKERNA,
+ &nameBuf);
+ if (GSS_ERROR(major))
+ return major;
+ }
return GSS_S_COMPLETE;
}
if (inputToken->length > sizeof(*pdu) &&
pdu->code == EAP_CODE_RESPONSE &&
pos[0] == EAP_TYPE_IDENTITY) {
- major = importInitiatorIdentity(minor, ctx, inputToken, &nameBuf);
+ /*
+ * XXX TODO do we really need to set User-Name? FreeRADIUS does
+ * not appear to require it.
+ */
+ major = addAvpFromBuffer(minor, rh, &send, PW_USER_NAME, 0, &nameBuf);
if (GSS_ERROR(major))
goto cleanup;
- major = addAvpFromBuffer(minor, rh, &send, PW_USER_NAME, &nameBuf);
+ major = setAcceptorIdentity(minor, ctx, &send);
if (GSS_ERROR(major))
goto cleanup;
}
- major = addAvpFromBuffer(minor, rh, &send, PW_EAP_MESSAGE, inputToken);
+ major = addAvpFromBuffer(minor, rh, &send, PW_EAP_MESSAGE, 0, inputToken);
if (GSS_ERROR(major))
goto cleanup;
if (ctx->acceptorCtx.lastStatus == CHALLENGE_RC) {
- major = addAvpFromBuffer(minor, rh, &send, PW_STATE,
+ major = addAvpFromBuffer(minor, rh, &send, PW_STATE, 0,
&ctx->acceptorCtx.state);
if (GSS_ERROR(major))
goto cleanup;
ctx->acceptorCtx.lastStatus = code;
- major = getBufferFromAvps(minor, received, PW_EAP_MESSAGE,
+ major = getBufferFromAvps(minor, received, PW_EAP_MESSAGE, 0,
outputToken, TRUE);
if ((major == GSS_S_UNAVAILABLE && code != OK_RC) ||
GSS_ERROR(major))
goto cleanup;
if (code == CHALLENGE_RC) {
- major = getBufferFromAvps(minor, received, PW_STATE,
+ major = getBufferFromAvps(minor, received, PW_STATE, 0,
&ctx->acceptorCtx.state, TRUE);
if (major != GSS_S_UNAVAILABLE && GSS_ERROR(major))
goto cleanup;
}
static OM_uint32
+eapGssSmAcceptKrbCred(OM_uint32 *minor,
+ gss_ctx_id_t ctx,
+ gss_cred_id_t cred,
+ gss_buffer_t inputToken,
+ gss_channel_bindings_t chanBindings,
+ gss_buffer_t outputToken)
+{
+ /* Called with already established context */
+ *minor = EINVAL;
+ return GSS_S_BAD_STATUS;
+}
+
+static OM_uint32
eapGssSmAcceptEstablished(OM_uint32 *minor,
gss_ctx_id_t ctx,
gss_cred_id_t cred,
{ TOK_TYPE_EAP_RESP, TOK_TYPE_EAP_REQ, eapGssSmAcceptIdentity },
{ TOK_TYPE_EAP_RESP, TOK_TYPE_EAP_REQ, eapGssSmAcceptAuthenticate },
{ TOK_TYPE_GSS_CB, TOK_TYPE_NONE, eapGssSmAcceptGssChannelBindings },
+ { TOK_TYPE_NONE, TOK_TYPE_KRB_CRED, eapGssSmAcceptKrbCred },
{ TOK_TYPE_NONE, TOK_TYPE_NONE, eapGssSmAcceptEstablished },
};
if (major == GSS_S_COMPLETE) {
if (src_name != NULL && ctx->initiatorName != GSS_C_NO_NAME) {
- major = gss_duplicate_name(&tmpMinor, ctx->initiatorName, src_name);
+ major = gssEapDuplicateName(&tmpMinor, ctx->initiatorName, src_name);
if (GSS_ERROR(major))
goto cleanup;
}
if (time_rec != NULL)
- gss_context_time(&tmpMinor, ctx, time_rec);
+ gssEapContextTime(&tmpMinor, ctx, time_rec);
}
assert(ctx->state == EAP_STATE_ESTABLISHED || major == GSS_S_CONTINUE_NEEDED);
projects / mech_eap.git / blobdiff