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

handle ID_KEY_ID as a ID_PUBKEY_SHA1 for authentication

Browse Source
This commit is contained in:
Martin Willi
2008-05-14 06:49:31 +00:00
parent c0d1ebde71
commit 0fd4caea66
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/credentials/credential_manager.c
+1 -2
View File
@@ -447,7 +447,6 @@ static certificate_t *fetch_ocsp(private_credential_manager_t *this, char *url,
request->destroy(request); request->destroy(request);
DBG1(DBG_CFG, " requesting ocsp status from '%s' ...", url); DBG1(DBG_CFG, " requesting ocsp status from '%s' ...", url);
/* TODO: unlock manager while fetching? */
if (lib->fetcher->fetch(lib->fetcher, url, &receive, if (lib->fetcher->fetch(lib->fetcher, url, &receive,
FETCH_REQUEST_DATA, send, FETCH_REQUEST_DATA, send,
FETCH_REQUEST_TYPE, "application/ocsp-request", FETCH_REQUEST_TYPE, "application/ocsp-request",
@@ -682,7 +681,6 @@ static certificate_t* fetch_crl(private_credential_manager_t *this, char *url)
certificate_t *crl; certificate_t *crl;
chunk_t chunk; chunk_t chunk;
/* TODO: unlock the manager while fetching? */
DBG1(DBG_CFG, " fetching crl from '%s' ...", url); DBG1(DBG_CFG, " fetching crl from '%s' ...", url);
if (lib->fetcher->fetch(lib->fetcher, url, &chunk, FETCH_END) != SUCCESS) if (lib->fetcher->fetch(lib->fetcher, url, &chunk, FETCH_END) != SUCCESS)
{ {
@@ -1424,6 +1422,7 @@ static private_key_t *get_private(private_credential_manager_t *this,
{ {
case ID_PUBKEY_SHA1: case ID_PUBKEY_SHA1:
case ID_PUBKEY_INFO_SHA1: case ID_PUBKEY_INFO_SHA1:
case ID_KEY_ID:
return get_private_by_keyid(this, type, id); return get_private_by_keyid(this, type, id);
default: default:
break; break;
src/charon/plugins/stroke/stroke_cred.c
+10 -2
View File
@@ -104,14 +104,22 @@ static bool private_filter(id_data_t *data,
private_key_t **in, private_key_t **out) private_key_t **in, private_key_t **out)
{ {
identification_t *candidate; identification_t *candidate;
id_type_t type;
if (data->id == NULL) if (data->id == NULL)
{ {
*out = *in; *out = *in;
return TRUE; return TRUE;
} }
candidate = (*in)->get_id(*in, data->id->get_type(data->id)); type = data->id->get_type(data->id);
if (candidate && data->id->equals(data->id, candidate)) if (type == ID_KEY_ID)
{ /* handle ID_KEY_ID as a ID_PUBKEY_SHA1 */
type = ID_PUBKEY_SHA1;
}
candidate = (*in)->get_id(*in, type);
if (candidate &&
chunk_equals(candidate->get_encoding(candidate),
data->id->get_encoding(data->id)))
{ {
*out = *in; *out = *in;
return TRUE; return TRUE;