extern int wpa_debug_level;
#endif
-/* */
-static u8 componentToAttrMap[] =
-{
- 128, /* GSS-Acceptor-Service-Name */
- 129, /* GSS-Acceptor-Host-Name */
- 130 /* GSS-Acceptor-Service-specific */
-};
-#define CHBIND_REALM_FLAG (1 << sizeof(componentToAttrMap))
+#define CHBIND_SERVICE_NAME_FLAG 0x01
+#define CHBIND_HOST_NAME_FLAG 0x02
+#define CHBIND_SERVICE_SPECIFIC_FLAG 0x04
+#define CHBIND_REALM_NAME_FLAG 0x08
+
+extern void TestFunc();
static OM_uint32
peerInitEapChannelBinding(OM_uint32 *minor, gss_ctx_id_t ctx)
{
- struct wpabuf *buf;
- radius_vendor_attr vendor_attr;
- int component, components = 0;
- unsigned int requested = 0;
- krb5_principal princ;
- /* must have acceptor name, but already checked in
- * eapGssSmInitAcceptorName(), so maybe redunadant
- * to do so here as well? */
- if (!ctx->acceptorName) {
+ struct wpabuf *buf = NULL;
+ unsigned int chbindReqFlags = 0;
+ krb5_principal princ = NULL;
+ gss_buffer_desc nameBuf = GSS_C_EMPTY_BUFFER;
+ OM_uint32 major = GSS_S_COMPLETE;
+ krb5_context krbContext = NULL;
+
+ /* XXX is this check redundant? */
+ if (ctx->acceptorName == GSS_C_NO_NAME) {
+ major = GSS_S_BAD_NAME;
*minor = GSSEAP_NO_ACCEPTOR_NAME;
- return GSS_S_BAD_NAME;
+ goto cleanup;
}
princ = ctx->acceptorName->krbPrincipal;
- if (KRB_PRINC_LENGTH(princ) > sizeof(componentToAttrMap)) {
- *minor = GSSEAP_BAD_ACCEPTOR_NAME;
- return GSS_S_BAD_NAME;
+
+ krbPrincComponentToGssBuffer(princ, 0, &nameBuf);
+ if (nameBuf.length > 0) {
+ major = gssEapRadiusAddAttr(minor, &buf, PW_GSS_ACCEPTOR_SERVICE_NAME,
+ 0, &nameBuf);
+ if (GSS_ERROR(major))
+ goto cleanup;
+
+ chbindReqFlags |= CHBIND_SERVICE_NAME_FLAG;
}
- /* allocate a buffer to hold channel binding data to be used by libeap */
- buf = wpabuf_alloc(256);
- if (!buf) {
- *minor = ENOMEM;
- return GSS_S_FAILURE;
+ krbPrincComponentToGssBuffer(princ, 1, &nameBuf);
+ if (nameBuf.length > 0) {
+ major = gssEapRadiusAddAttr(minor, &buf, PW_GSS_ACCEPTOR_HOST_NAME,
+ 0, &nameBuf);
+ if (GSS_ERROR(major))
+ goto cleanup;
+
+ chbindReqFlags |= CHBIND_HOST_NAME_FLAG;
}
- for (component=0; component < KRB_PRINC_LENGTH(princ); component++)
- {
- krb5_data* name_data = KRB_PRINC_COMPONENT(princ, component);
- if (name_data->length > 0)
- {
- components++;
- vendor_attr = radius_vendor_attr_start(buf, VENDORPEC_UKERNA);
- vendor_attr = radius_vendor_attr_add_subtype(vendor_attr,
- componentToAttrMap[component],
- name_data->data,
- name_data->length);
- requested |= 1<<component;
- vendor_attr = radius_vendor_attr_finish(vendor_attr);
- }
+ GSSEAP_KRB_INIT(&krbContext);
+
+ *minor = krbPrincUnparseServiceSpecifics(krbContext, princ, &nameBuf);
+ if (*minor != 0)
+ goto cleanup;
+
+ if (nameBuf.length > 0) {
+ major = gssEapRadiusAddAttr(minor, &buf,
+ PW_GSS_ACCEPTOR_SERVICE_SPECIFICS,
+ 0, &nameBuf);
+ if (GSS_ERROR(major))
+ goto cleanup;
+
+ chbindReqFlags |= CHBIND_SERVICE_SPECIFIC_FLAG;
}
- if (KRB_PRINC_REALM(princ) && (KRB_PRINC_REALM(princ)->length > 0)) {
- components++;
- requested |= CHBIND_REALM_FLAG;
- vendor_attr = radius_vendor_attr_start(buf, VENDORPEC_UKERNA);
- vendor_attr = radius_vendor_attr_add_subtype(vendor_attr, 131,
- KRB_PRINC_REALM(princ)->data,
- KRB_PRINC_REALM(princ)->length);
- vendor_attr = radius_vendor_attr_finish(vendor_attr);
+ krbFreeUnparsedName(krbContext, &nameBuf);
+ krbPrincRealmToGssBuffer(princ, &nameBuf);
+
+ if (nameBuf.length > 0) {
+ major = gssEapRadiusAddAttr(minor, &buf,
+ PW_GSS_ACCEPTOR_REALM_NAME,
+ 0, &nameBuf);
+ chbindReqFlags |= CHBIND_REALM_NAME_FLAG;
}
- if ((components==0) || (vendor_attr == VENDOR_ATTR_INVALID)) {
- wpabuf_free(buf);
+ if (chbindReqFlags == 0) {
+ major = GSS_S_BAD_NAME;
*minor = GSSEAP_BAD_ACCEPTOR_NAME;
- return GSS_S_BAD_NAME;
+ goto cleanup;
}
- /* @TODO: realloc buf to actual size? */
+
ctx->initiatorCtx.chbindData = buf;
- ctx->initiatorCtx.chbindReqFlags = requested;
- return GSS_S_COMPLETE;
+ ctx->initiatorCtx.chbindReqFlags = chbindReqFlags;
+
+ buf = NULL;
+
+ major = GSS_S_COMPLETE;
+ *minor = 0;
+
+cleanup:
+ krbFreeUnparsedName(krbContext, &nameBuf);
+ wpabuf_free(buf);
+
+ return major;
}
static void
peerProcessChbindResponse(void *context, int code, int nsid,
u8 *data, size_t len)
{
- radius_parser msg, vendor_specific;
+ radius_parser msg;
gss_ctx_id_t ctx = (gss_ctx_id_t )context;
void *vsadata;
u8 type;
u32 vendor_id;
- u32 accepted = 0;
+ u32 chbindRetFlags = 0;
size_t vsadata_len;
- int i;
if (nsid != CHBIND_NSID_RADIUS)
return;
+
msg = radius_parser_start(data, len);
- if (!msg)
+ if (msg == NULL)
return;
+
while (radius_parser_parse_tlv(msg, &type, &vendor_id, &vsadata,
&vsadata_len) == 0) {
- void *unused_data;
- size_t unused_len;
- u8 vendor_type;
-
- if ((type != RADIUS_ATTR_VENDOR_SPECIFIC) ||
- (vendor_id != VENDORPEC_UKERNA))
- continue;
- vendor_specific = radius_parser_start(vsadata, vsadata_len);
- if (!vendor_specific)
- continue;
- while (radius_parser_parse_vendor_specific(vendor_specific,
- &vendor_type,
- &unused_data,
- &unused_len) == 0) {
- if (vendor_type == 131) {
- accepted |= CHBIND_REALM_FLAG;
- } else {
- for (i=0; i<sizeof(componentToAttrMap); i++) {
- if (componentToAttrMap[i]==vendor_type) {
- accepted |= 1<<i;
- break;
- }
- }
- }
+ switch (type) {
+ case PW_GSS_ACCEPTOR_SERVICE_NAME:
+ chbindRetFlags |= CHBIND_SERVICE_NAME_FLAG;
+ break;
+ case PW_GSS_ACCEPTOR_HOST_NAME:
+ chbindRetFlags |= CHBIND_HOST_NAME_FLAG;
+ break;
+ case PW_GSS_ACCEPTOR_SERVICE_SPECIFICS:
+ chbindRetFlags |= CHBIND_SERVICE_SPECIFIC_FLAG;
+ break;
+ case PW_GSS_ACCEPTOR_REALM_NAME:
+ chbindRetFlags |= CHBIND_REALM_NAME_FLAG;
+ break;
}
- radius_parser_finish(vendor_specific);
}
+
radius_parser_finish(msg);
- if ((code == CHBIND_CODE_SUCCESS) &&
- (accepted == ctx->initiatorCtx.chbindReqFlags)) {
+
+ if (code == CHBIND_CODE_SUCCESS &&
+ ((chbindRetFlags & ctx->initiatorCtx.chbindReqFlags) == ctx->initiatorCtx.chbindReqFlags)) {
ctx->flags |= CTX_FLAG_EAP_CHBIND_ACCEPT;
- /* Accepted! */
- } else {
- /* log failures? */
- }
+ ctx->gssFlags |= GSS_C_MUTUAL_FLAG;
+ } /* else log failures? */
}
static OM_uint32
eapPeerConfig->altsubject_match = (unsigned char *)cred->subjectAltNameConstraint.value;
/* eap channel binding */
- if (ctx->initiatorCtx.chbindData)
- {
+ if (ctx->initiatorCtx.chbindData != NULL) {
struct eap_peer_chbind_config *chbind_config =
- (struct eap_peer_chbind_config *)
- GSSEAP_MALLOC(sizeof(struct eap_peer_chbind_config));
+ (struct eap_peer_chbind_config *)GSSEAP_MALLOC(sizeof(struct eap_peer_chbind_config));
if (chbind_config == NULL) {
*minor = ENOMEM;
return GSS_S_FAILURE;
eapPeerConfig->chbind_config = NULL;
eapPeerConfig->chbind_config_len = 0;
}
+
*minor = 0;
return GSS_S_COMPLETE;
}
* Mark an initiator context as ready for cryptographic operations
*/
static OM_uint32
-initReady(OM_uint32 *minor, gss_ctx_id_t ctx, OM_uint32 reqFlags)
+initReady(OM_uint32 *minor, gss_ctx_id_t ctx)
{
OM_uint32 major;
const unsigned char *key;
size_t keyLength;
-#if 1
- /* XXX actually check for mutual auth */
- if (reqFlags & GSS_C_MUTUAL_FLAG)
- ctx->gssFlags |= GSS_C_MUTUAL_FLAG;
-#endif
-
/* Cache encryption type derived from selected mechanism OID */
major = gssEapOidToEnctype(minor, ctx->mechanismUsed, &ctx->encryptionType);
if (GSS_ERROR(major))
outputToken, NULL);
if (GSS_ERROR(major))
return major;
- } else if (inputToken != GSS_C_NO_BUFFER &&
- ctx->acceptorName == GSS_C_NO_NAME) {
- /* Accept target name hint from acceptor */
+ } else if (inputToken != GSS_C_NO_BUFFER) {
+ OM_uint32 tmpMinor;
+ gss_name_t nameHint;
+ int equal;
+
+ /* Accept target name hint from acceptor or verify acceptor */
major = gssEapImportName(minor, inputToken,
GSS_C_NT_USER_NAME,
ctx->mechanismUsed,
- &ctx->acceptorName);
+ &nameHint);
if (GSS_ERROR(major))
return major;
+
+ if (ctx->acceptorName != GSS_C_NO_NAME) {
+ /* verify name hint matched asserted acceptor name */
+ major = gssEapCompareName(minor,
+ nameHint,
+ ctx->acceptorName,
+ COMPARE_NAME_FLAG_IGNORE_EMPTY_REALMS,
+ &equal);
+ if (GSS_ERROR(major)) {
+ gssEapReleaseName(&tmpMinor, &nameHint);
+ return major;
+ }
+
+ gssEapReleaseName(&tmpMinor, &nameHint);
+
+ if (!equal) {
+ *minor = GSSEAP_WRONG_ACCEPTOR_NAME;
+ return GSS_S_DEFECTIVE_TOKEN;
+ }
+ } else { /* acceptor name is no_name */
+ /* accept acceptor name hint */
+ ctx->acceptorName = nameHint;
+ nameHint = GSS_C_NO_NAME;
+ }
}
+
/*
* Currently, other parts of the code assume that the acceptor name
* is available, hence this check.
/*
* Generate channel binding data
*/
- if (ctx->initiatorCtx.chbindData == NULL)
- {
+ if (ctx->initiatorCtx.chbindData == NULL) {
major = peerInitEapChannelBinding(minor, ctx);
if (GSS_ERROR(major))
return major;
resp = eap_get_eapRespData(ctx->initiatorCtx.eap);
} else if (ctx->flags & CTX_FLAG_EAP_SUCCESS) {
- major = initReady(minor, ctx, reqFlags);
+ major = initReady(minor, ctx);
if (GSS_ERROR(major))
goto cleanup;
OM_uint32 *smFlags)
{
OM_uint32 major;
- gss_buffer_desc buffer = GSS_C_EMPTY_BUFFER;
+ krb5_error_code code;
+ krb5_context krbContext;
+ krb5_data data;
+ krb5_checksum cksum;
+ gss_buffer_desc cksumBuffer;
- if (chanBindings != GSS_C_NO_CHANNEL_BINDINGS)
- buffer = chanBindings->application_data;
+ if (chanBindings == GSS_C_NO_CHANNEL_BINDINGS ||
+ chanBindings->application_data.length == 0)
+ return GSS_S_CONTINUE_NEEDED;
- major = gssEapWrap(minor, ctx, TRUE, GSS_C_QOP_DEFAULT,
- &buffer, NULL, outputToken);
- if (GSS_ERROR(major))
- return major;
+ GSSEAP_KRB_INIT(&krbContext);
+
+ KRB_DATA_INIT(&data);
+
+ gssBufferToKrbData(&chanBindings->application_data, &data);
+
+ code = krb5_c_make_checksum(krbContext, ctx->checksumType,
+ &ctx->rfc3961Key,
+ KEY_USAGE_GSSEAP_CHBIND_MIC,
+ &data, &cksum);
+ if (code != 0) {
+ *minor = code;
+ return GSS_S_FAILURE;
+ }
+
+ cksumBuffer.length = KRB_CHECKSUM_LENGTH(&cksum);
+ cksumBuffer.value = KRB_CHECKSUM_DATA(&cksum);
- GSSEAP_ASSERT(outputToken->value != NULL);
+ major = duplicateBuffer(minor, &cksumBuffer, outputToken);
+ if (GSS_ERROR(major)) {
+ krb5_free_checksum_contents(krbContext, &cksum);
+ return major;
+ }
*minor = 0;
*smFlags |= SM_FLAG_OUTPUT_TOKEN_CRITICAL;
+ krb5_free_checksum_contents(krbContext, &cksum);
+
return GSS_S_CONTINUE_NEEDED;
}
return GSS_S_CONTINUE_NEEDED;
}
-
+
#ifdef GSSEAP_ENABLE_REAUTH
static OM_uint32
eapGssSmInitReauthCreds(OM_uint32 *minor,
{
ITOK_TYPE_ACCEPTOR_NAME_RESP,
ITOK_TYPE_ACCEPTOR_NAME_REQ,
- GSSEAP_STATE_INITIAL | GSSEAP_STATE_AUTHENTICATE,
+ GSSEAP_STATE_INITIAL | GSSEAP_STATE_AUTHENTICATE |
+ GSSEAP_STATE_ACCEPTOR_EXTS,
0,
eapGssSmInitAcceptorName
},
ITOK_TYPE_NONE,
ITOK_TYPE_GSS_CHANNEL_BINDINGS,
GSSEAP_STATE_INITIATOR_EXTS,
- SM_ITOK_FLAG_REQUIRED,
+ 0,
eapGssSmInitGssChannelBindings
},
{
goto cleanup;
}
}
- if (ret_flags != NULL) {
- if ((major == GSS_S_COMPLETE) &&
- (ctx->flags & CTX_FLAG_EAP_CHBIND_ACCEPT))
- *ret_flags = ctx->gssFlags | GSS_C_MUTUAL_FLAG;
- else
- *ret_flags = ctx->gssFlags & (~GSS_C_MUTUAL_FLAG);
- }
- if (major == GSS_S_COMPLETE)
- major = major;
+
+ if (ret_flags != NULL)
+ *ret_flags = ctx->gssFlags;
+
if (time_rec != NULL)
gssEapContextTime(&tmpMinor, ctx, time_rec);
projects / mech_eap.git / blobdiff