/*
- * 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.
*/
+/*
+ * Utility routines for credential handles.
+ */
+
#include "gssapiP_eap.h"
OM_uint32
if (cred->radiusConfigFile != NULL)
GSSEAP_FREE(cred->radiusConfigFile);
+ if (cred->radiusConfigStanza != NULL)
+ GSSEAP_FREE(cred->radiusConfigStanza);
#ifdef GSSEAP_ENABLE_REAUTH
if (cred->krbCredCache != NULL) {
gssEapAcquireCred(OM_uint32 *minor,
const gss_name_t desiredName,
const gss_buffer_t password,
- OM_uint32 timeReq,
+ OM_uint32 timeReq GSSEAP_UNUSED,
const gss_OID_set desiredMechs,
int credUsage,
gss_cred_id_t *pCred,
{
OM_uint32 major, tmpMinor;
gss_cred_id_t cred;
+#ifdef GSSEAP_DEBUG
+ gss_buffer_desc envPassword;
+#endif
/* XXX TODO validate with changed set_cred_option API */
*pCred = GSS_C_NO_CREDENTIAL;
if (GSS_ERROR(major))
goto cleanup;
+ switch (credUsage) {
+ case GSS_C_BOTH:
+ cred->flags |= CRED_FLAG_INITIATE | CRED_FLAG_ACCEPT;
+ break;
+ case GSS_C_INITIATE:
+ cred->flags |= CRED_FLAG_INITIATE;
+ break;
+ case GSS_C_ACCEPT:
+ cred->flags |= CRED_FLAG_ACCEPT;
+ break;
+ default:
+ major = GSS_S_FAILURE;
+ *minor = GSSEAP_BAD_USAGE;
+ goto cleanup;
+ break;
+ }
+
if (desiredName != GSS_C_NO_NAME) {
+ GSSEAP_MUTEX_LOCK(&desiredName->mutex);
+
major = gssEapDuplicateName(minor, desiredName, &cred->name);
- if (GSS_ERROR(major))
+ if (GSS_ERROR(major)) {
+ GSSEAP_MUTEX_UNLOCK(&desiredName->mutex);
goto cleanup;
+ }
+
+ GSSEAP_MUTEX_UNLOCK(&desiredName->mutex);
} else {
- if (cred->flags & CRED_FLAG_INITIATE) {
- gss_buffer_desc buf;
+ gss_buffer_desc nameBuf = GSS_C_EMPTY_BUFFER;
+ gss_OID nameType = GSS_C_NO_OID;
+ char loginName[256];
+
+ if (cred->flags & CRED_FLAG_ACCEPT) {
+ char serviceName[5 + MAXHOSTNAMELEN] = "host@";
+
+ /* default host-based service is host@localhost */
+ if (gethostname(&serviceName[5], MAXHOSTNAMELEN) != 0) {
+ major = GSS_S_FAILURE;
+ *minor = GSSEAP_NO_HOSTNAME;
+ goto cleanup;
+ }
+
+ nameBuf.value = serviceName;
+ nameBuf.length = strlen((char *)nameBuf.value);
- buf.value = getlogin(); /* XXX */
- buf.length = strlen((char *)buf.value);
+ nameType = GSS_C_NT_HOSTBASED_SERVICE;
+ } else if (cred->flags & CRED_FLAG_INITIATE) {
+ /* XXX FIXME temporary implementation */
+ snprintf(loginName, sizeof(loginName), "%s@", getlogin());
+ nameBuf.value = loginName;
+ nameBuf.length = strlen(loginName);
+
+ nameType = GSS_C_NT_USER_NAME;
+ }
- major = gssEapImportName(minor, &buf,
- GSS_C_NT_USER_NAME, &cred->name);
+ if (nameBuf.length != 0) {
+ gss_OID mech = GSS_C_NO_OID;
+
+ if (cred->mechanisms != GSS_C_NO_OID_SET &&
+ cred->mechanisms->count == 1)
+ mech = &cred->mechanisms->elements[0];
+
+ major = gssEapImportName(minor, &nameBuf, nameType, mech, &cred->name);
if (GSS_ERROR(major))
goto cleanup;
}
cred->flags |= CRED_FLAG_DEFAULT_IDENTITY;
}
+#ifdef GSSEAP_DEBUG
+ if (password == GSS_C_NO_BUFFER &&
+ (cred->flags & CRED_FLAG_DEFAULT_IDENTITY) &&
+ (envPassword.value = getenv("GSSEAP_CREDS")) != NULL) {
+ envPassword.length = strlen((char *)envPassword.value);
+ major = duplicateBuffer(minor, &envPassword, &cred->password);
+ if (GSS_ERROR(major))
+ goto cleanup;
+ } else
+#endif /* GSSEAP_DEBUG */
if (password != GSS_C_NO_BUFFER) {
major = duplicateBuffer(minor, password, &cred->password);
if (GSS_ERROR(major))
goto cleanup;
cred->flags |= CRED_FLAG_PASSWORD;
- } else if (credUsage == GSS_C_INITIATE) {
+ } else if (cred->flags & CRED_FLAG_INITIATE) {
/*
* OK, here we need to ask the supplicant if we have creds or it
* will acquire them, so GS2 can know whether to prompt for a
&& !gssEapCanReauthP(cred, GSS_C_NO_NAME, timeReq)
#endif
major = GSS_S_CRED_UNAVAIL;
+ *minor = GSSEAP_MISSING_PASSWORD;
goto cleanup;
}
- switch (credUsage) {
- case GSS_C_BOTH:
- cred->flags |= CRED_FLAG_INITIATE | CRED_FLAG_ACCEPT;
- break;
- case GSS_C_INITIATE:
- cred->flags |= CRED_FLAG_INITIATE;
- break;
- case GSS_C_ACCEPT:
- cred->flags |= CRED_FLAG_ACCEPT;
- break;
- default:
- major = GSS_S_FAILURE;
- goto cleanup;
- break;
- }
-
major = gssEapValidateMechs(minor, desiredMechs);
if (GSS_ERROR(major))
goto cleanup;
*timeRec = GSS_C_INDEFINITE;
*pCred = cred;
+
major = GSS_S_COMPLETE;
+ *minor = 0;
cleanup:
if (GSS_ERROR(major))