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

has_subject() now resolves ID_KEY_IDs

Browse Source
This commit is contained in:
Andreas Steffen
2010-09-09 17:15:46 +02:00
parent 89821331e0
commit f85f0c2795
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/x509/x509_cert.c
+13 -3
View File
@@ -1098,6 +1098,11 @@ static identification_t* get_issuer(private_x509_cert_t *this)
return this->issuer; return this->issuer;
} }
/**
* Forward declaration
*/
static chunk_t get_subjectKeyIdentifier(private_x509_cert_t *this);
/** /**
* Implementation of certificate_t.has_subject. * Implementation of certificate_t.has_subject.
*/ */
@@ -1107,14 +1112,19 @@ static id_match_t has_subject(private_x509_cert_t *this, identification_t *subje
enumerator_t *enumerator; enumerator_t *enumerator;
id_match_t match, best; id_match_t match, best;
if (this->encoding_hash.ptr && subject->get_type(subject) == ID_KEY_ID) if (subject->get_type(subject) == ID_KEY_ID)
{ {
if (chunk_equals(this->encoding_hash, subject->get_encoding(subject))) chunk_t keyid = subject->get_encoding(subject);
if (this->encoding_hash.ptr && chunk_equals(this->encoding_hash, keyid))
{
return ID_MATCH_PERFECT;
}
if (chunk_equals(get_subjectKeyIdentifier(this), keyid))
{ {
return ID_MATCH_PERFECT; return ID_MATCH_PERFECT;
} }
} }
best = this->subject->matches(this->subject, subject); best = this->subject->matches(this->subject, subject);
enumerator = this->subjectAltNames->create_enumerator(this->subjectAltNames); enumerator = this->subjectAltNames->create_enumerator(this->subjectAltNames);
while (enumerator->enumerate(enumerator, &current)) while (enumerator->enumerate(enumerator, &current))