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

certificate: Extract helper function to filter certificates

Browse Source
This commit is contained in:
Tobias Brunner
2020-07-20 14:05:38 +02:00
parent dd7505af3e
commit 306c0c9f8e
4 changed files with 56 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/credentials/sets/mem_cred.c
+1 -30
View File
@@ -84,42 +84,13 @@ CALLBACK(cert_data_destroy, void,
CALLBACK(certs_filter, bool,
cert_data_t *data, enumerator_t *orig, va_list args)
{
public_key_t *public;
certificate_t *cert, **out;
VA_ARGS_VGET(args, out);
while (orig->enumerate(orig, &cert))
{
if (data->cert != CERT_ANY && data->cert != cert->get_type(cert))
{
continue;
}
public = cert->get_public_key(cert);
if (public)
{
if (data->key == KEY_ANY || data->key == public->get_type(public))
{
if (data->id && public->has_fingerprint(public,
data->id->get_encoding(data->id)))
{
public->destroy(public);
*out = cert;
return TRUE;
}
}
else
{
public->destroy(public);
continue;
}
public->destroy(public);
}
else if (data->key != KEY_ANY)
{
continue;
}
if (!data->id || cert->has_subject(cert, data->id))
if (certificate_matches(cert, data->cert, data->key, data->id))
{
*out = cert;
return TRUE;