projects
/
mech_eap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/eap-tls'
[mech_eap.git]
/
mech_eap
/
util_cred.c
diff --git
a/mech_eap/util_cred.c
b/mech_eap/util_cred.c
index
5973ebe
..
487aa47
100644
(file)
--- a/
mech_eap/util_cred.c
+++ b/
mech_eap/util_cred.c
@@
-243,13
+243,14
@@
cleanup:
gss_OID
gssEapPrimaryMechForCred(gss_cred_id_t cred)
{
gss_OID
gssEapPrimaryMechForCred(gss_cred_id_t cred)
{
- gss_OID
name
Mech = GSS_C_NO_OID;
+ gss_OID
cred
Mech = GSS_C_NO_OID;
- if (cred->mechanisms != GSS_C_NO_OID_SET &&
+ if (cred != GSS_C_NO_CREDENTIAL &&
+ cred->mechanisms != GSS_C_NO_OID_SET &&
cred->mechanisms->count == 1)
cred->mechanisms->count == 1)
-
name
Mech = &cred->mechanisms->elements[0];
+
cred
Mech = &cred->mechanisms->elements[0];
- return
name
Mech;
+ return
cred
Mech;
}
OM_uint32
}
OM_uint32
@@
-735,7
+736,8
@@
staticIdentityFileResolveInitiatorCred(OM_uint32 *minor, gss_cred_id_t cred)
isDefaultIdentity = TRUE;
} else {
major = gssEapCompareName(minor, cred->name,
isDefaultIdentity = TRUE;
} else {
major = gssEapCompareName(minor, cred->name,
- defaultIdentityName, &isDefaultIdentity);
+ defaultIdentityName, 0,
+ &isDefaultIdentity);
if (GSS_ERROR(major))
goto cleanup;
}
if (GSS_ERROR(major))
goto cleanup;
}