public = cert->get_public_key(cert);
if (public)
{
- if (public->get_fingerprint(public, KEY_ID_PUBKEY_INFO_SHA1, &chunk))
+ if (public->get_fingerprint(public, KEY_ID_PUBKEY_SHA1, &chunk))
{
keyid = identification_create_from_encoding(ID_KEY_ID, chunk);
private = get_private_by_keyid(this, type, keyid);
static bool private_filter(id_data_t *data,
private_key_t **in, private_key_t **out)
{
- key_encoding_type_t type;
private_key_t *key;
chunk_t keyid;
*out = key;
return TRUE;
}
- for (type = KEY_ID_PUBKEY_INFO_SHA1; type < KEY_ID_PUBKEY_SHA1; type++)
+ if (key->get_fingerprint(key, KEY_ID_PUBKEY_SHA1, &keyid) &&
+ chunk_equals(keyid, data->id->get_encoding(data->id)))
{
- if (key->get_fingerprint(key, type, &keyid) &&
- chunk_equals(keyid, data->id->get_encoding(data->id)))
- {
- *out = key;
- return TRUE;
- }
+ *out = key;
+ return TRUE;
}
return FALSE;
}
*/
static bool certs_filter(id_data_t *data, certificate_t **in, certificate_t **out)
{
- key_encoding_type_t type;
public_key_t *public;
certificate_t *cert = *in;
chunk_t keyid;
public = cert->get_public_key(cert);
if (public)
{
- for (type = KEY_ID_PUBKEY_INFO_SHA1; type < KEY_ID_PUBKEY_SHA1; type++)
+ if (public->get_fingerprint(public, KEY_ID_PUBKEY_SHA1, &keyid) &&
+ chunk_equals(keyid, data->id->get_encoding(data->id)))
{
- if (public->get_fingerprint(public, type, &keyid) &&
- chunk_equals(keyid, data->id->get_encoding(data->id)))
- {
- public->destroy(public);
- *out = *in;
- return TRUE;
- }
+ public->destroy(public);
+ *out = *in;
+ return TRUE;
}
public->destroy(public);
}