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

Change interface for enumerator_create_filter() callback

Browse Source 
This avoids the unportable 5 pointer hack, but requires enumerating in
the callback.
This commit is contained in:
Tobias Brunner
2017-05-26 13:56:44 +02:00
parent 95a63bf281
commit 525cc46cab
50 changed files with 1331 additions and 929 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/x509/x509_ocsp_response.c
+30 -24
View File
@@ -228,32 +228,38 @@ METHOD(ocsp_response_t, create_cert_enumerator, enumerator_t*,
return this->certs->create_enumerator(this->certs);
}
/**
* enumerator filter callback for create_response_enumerator
*/
static bool filter(void *data, single_response_t **response,
chunk_t *serialNumber,
void *p2, cert_validation_t *status,
void *p3, time_t *revocationTime,
void *p4, crl_reason_t *revocationReason)
CALLBACK(filter, bool,
void *data, enumerator_t *orig, va_list args)
{
if (serialNumber)
single_response_t *response;
cert_validation_t *status;
crl_reason_t *revocationReason;
chunk_t *serialNumber;
time_t *revocationTime;
VA_ARGS_VGET(args, serialNumber, status, revocationTime, revocationReason);
if (orig->enumerate(orig, &response))
{
*serialNumber = (*response)->serialNumber;
if (serialNumber)
{
*serialNumber = response->serialNumber;
}
if (status)
{
*status = response->status;
}
if (revocationTime)
{
*revocationTime = response->revocationTime;
}
if (revocationReason)
{
*revocationReason = response->revocationReason;
}
return TRUE;
}
if (status)
{
*status = (*response)->status;
}
if (revocationTime)
{
*revocationTime = (*response)->revocationTime;
}
if (revocationReason)
{
*revocationReason = (*response)->revocationReason;
}
return TRUE;
return FALSE;
}
METHOD(ocsp_response_t, create_response_enumerator, enumerator_t*,
@@ -261,7 +267,7 @@ METHOD(ocsp_response_t, create_response_enumerator, enumerator_t*,
{
return enumerator_create_filter(
this->responses->create_enumerator(this->responses),
(void*)filter, NULL, NULL);
filter, NULL, NULL);
}
/**