removed deprecated iterator methods (has_next & current)
added iterator hook to manipulate iterator the clean way
This commit is contained in:
@@ -385,16 +385,15 @@ static bool verify(const private_crl_t *this, const rsa_public_key_t *signer)
|
||||
static void get_status(const private_crl_t *this, certinfo_t *certinfo)
|
||||
{
|
||||
chunk_t serialNumber = certinfo->get_serialNumber(certinfo);
|
||||
iterator_t *iterator = this->revokedCertificates->create_iterator(this->revokedCertificates, TRUE);
|
||||
|
||||
iterator_t *iterator;
|
||||
revokedCert_t *revokedCert;
|
||||
|
||||
certinfo->set_nextUpdate(certinfo, this->nextUpdate);
|
||||
certinfo->set_status(certinfo, CERT_GOOD);
|
||||
|
||||
while (iterator->has_next(iterator))
|
||||
|
||||
iterator = this->revokedCertificates->create_iterator(this->revokedCertificates, TRUE);
|
||||
while (iterator->iterate(iterator, (void**)&revokedCert))
|
||||
{
|
||||
revokedCert_t *revokedCert;
|
||||
|
||||
iterator->current(iterator, (void**)&revokedCert);
|
||||
if (chunk_equals(serialNumber, revokedCert->userCertificate))
|
||||
{
|
||||
certinfo->set_status(certinfo, CERT_REVOKED);
|
||||
|
||||
@@ -930,13 +930,12 @@ static bool is_self_signed(const private_x509_t *this)
|
||||
static bool equals_subjectAltName(const private_x509_t *this, identification_t *id)
|
||||
{
|
||||
bool found = FALSE;
|
||||
iterator_t *iterator = this->subjectAltNames->create_iterator(this->subjectAltNames, TRUE);
|
||||
|
||||
while (iterator->has_next(iterator))
|
||||
identification_t *subjectAltName;
|
||||
iterator_t *iterator;
|
||||
|
||||
iterator = this->subjectAltNames->create_iterator(this->subjectAltNames, TRUE);
|
||||
while (iterator->iterate(iterator, (void**)&subjectAltName))
|
||||
{
|
||||
identification_t *subjectAltName;
|
||||
|
||||
iterator->current(iterator, (void**)&subjectAltName);
|
||||
if (id->equals(id, subjectAltName))
|
||||
{
|
||||
found = TRUE;
|
||||
|
||||
Reference in New Issue
Block a user