denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept NULL auth_cfg_t passed to credential_manager_t.get_private()

Browse Source
This commit is contained in:
Martin Willi
2012-03-20 17:31:39 +01:00
parent 6261c0c3b7
commit 5aef6bd0f3
3 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/credentials/credential_manager.c
+32 -26
View File
@@ -1047,42 +1047,45 @@ METHOD(credential_manager_t, get_private, private_key_t*,
}
}
/* if a specific certificate is preferred, check for a matching key */
cert = auth->get(auth, AUTH_RULE_SUBJECT_CERT);
if (cert)
if (auth)
{
private = get_private_by_cert(this, cert, type);
if (private)
/* if a specific certificate is preferred, check for a matching key */
cert = auth->get(auth, AUTH_RULE_SUBJECT_CERT);
if (cert)
{
trustchain = build_trustchain(this, cert, auth);
if (trustchain)
private = get_private_by_cert(this, cert, type);
if (private)
{
auth->merge(auth, trustchain, FALSE);
trustchain->destroy(trustchain);
trustchain = build_trustchain(this, cert, auth);
if (trustchain)
{
auth->merge(auth, trustchain, FALSE);
trustchain->destroy(trustchain);
}
return private;
}
return private;
}
}
/* try to build a trust chain for each certificate found */
enumerator = create_cert_enumerator(this, CERT_ANY, type, id, FALSE);
while (enumerator->enumerate(enumerator, &cert))
{
private = get_private_by_cert(this, cert, type);
if (private)
/* try to build a trust chain for each certificate found */
enumerator = create_cert_enumerator(this, CERT_ANY, type, id, FALSE);
while (enumerator->enumerate(enumerator, &cert))
{
trustchain = build_trustchain(this, cert, auth);
if (trustchain)
private = get_private_by_cert(this, cert, type);
if (private)
{
auth->merge(auth, trustchain, FALSE);
trustchain->destroy(trustchain);
break;
trustchain = build_trustchain(this, cert, auth);
if (trustchain)
{
auth->merge(auth, trustchain, FALSE);
trustchain->destroy(trustchain);
break;
}
private->destroy(private);
private = NULL;
}
private->destroy(private);
private = NULL;
}
enumerator->destroy(enumerator);
}
enumerator->destroy(enumerator);
/* if no valid trustchain was found, fall back to the first usable cert */
if (!private)
@@ -1093,7 +1096,10 @@ METHOD(credential_manager_t, get_private, private_key_t*,
private = get_private_by_cert(this, cert, type);
if (private)
{
auth->add(auth, AUTH_RULE_SUBJECT_CERT, cert->get_ref(cert));
if (auth)
{
auth->add(auth, AUTH_RULE_SUBJECT_CERT, cert->get_ref(cert));
}
break;
}
}