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

Credential backends use has_fingerprint() methods to select keys/certificates

Browse Source
This commit is contained in:
Martin Willi
2009-09-21 17:03:00 +02:00
parent 640ed4d5a5
commit c84b139a87
4 changed files with 7 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/plugins/stroke/stroke_cred.c
+2 -6
View File
@@ -107,7 +107,6 @@ static bool private_filter(id_data_t *data,
private_key_t **in, private_key_t **out)
{
private_key_t *key;
chunk_t keyid;
key = *in;
if (data->id == NULL)
@@ -115,8 +114,7 @@ static bool private_filter(id_data_t *data,
*out = key;
return TRUE;
}
if (key->get_fingerprint(key, KEY_ID_PUBKEY_SHA1, &keyid) &&
chunk_equals(keyid, data->id->get_encoding(data->id)))
if (key->has_fingerprint(key, data->id->get_encoding(data->id)))
{
*out = key;
return TRUE;
@@ -149,7 +147,6 @@ static bool certs_filter(id_data_t *data, certificate_t **in, certificate_t **ou
{
public_key_t *public;
certificate_t *cert = *in;
chunk_t keyid;
if (data->type != CERT_ANY && data->type != cert->get_type(cert))
{
@@ -164,8 +161,7 @@ static bool certs_filter(id_data_t *data, certificate_t **in, certificate_t **ou
public = cert->get_public_key(cert);
if (public)
{
if (public->get_fingerprint(public, KEY_ID_PUBKEY_SHA1, &keyid) &&
chunk_equals(keyid, data->id->get_encoding(data->id)))
if (public->has_fingerprint(public, data->id->get_encoding(data->id)))
{
public->destroy(public);
*out = *in;