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

x509: Set IKE compliance flag depending on keyUsage

Browse Source
This commit is contained in:
Tobias Brunner
2018-05-22 09:50:47 +02:00
parent 9fcf4fdda1
commit 920366e688
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/x509/x509_cert.c
+10 -2
View File
@@ -704,6 +704,9 @@ static void parse_keyUsage(chunk_t blob, private_x509_cert_t *this)
KU_DECIPHER_ONLY = 8, KU_DECIPHER_ONLY = 8,
}; };
/* to be compliant with RFC 4945 specific KUs have to be included */
this->flags &= ~X509_IKE_COMPLIANT;
if (asn1_unwrap(&blob, &blob) == ASN1_BIT_STRING && blob.len) if (asn1_unwrap(&blob, &blob) == ASN1_BIT_STRING && blob.len)
{ {
int bit, byte, unused = blob.ptr[0]; int bit, byte, unused = blob.ptr[0];
@@ -724,10 +727,12 @@ static void parse_keyUsage(chunk_t blob, private_x509_cert_t *this)
case KU_CRL_SIGN: case KU_CRL_SIGN:
this->flags |= X509_CRL_SIGN; this->flags |= X509_CRL_SIGN;
break; break;
case KU_KEY_CERT_SIGN:
/* we use the caBasicConstraint, MUST be set */
case KU_DIGITAL_SIGNATURE: case KU_DIGITAL_SIGNATURE:
case KU_NON_REPUDIATION: case KU_NON_REPUDIATION:
this->flags |= X509_IKE_COMPLIANT;
break;
case KU_KEY_CERT_SIGN:
/* we use the caBasicConstraint, MUST be set */
case KU_KEY_ENCIPHERMENT: case KU_KEY_ENCIPHERMENT:
case KU_DATA_ENCIPHERMENT: case KU_DATA_ENCIPHERMENT:
case KU_KEY_AGREEMENT: case KU_KEY_AGREEMENT:
@@ -1381,6 +1386,9 @@ static bool parse_certificate(private_x509_cert_t *this)
parser = asn1_parser_create(certObjects, this->encoding); parser = asn1_parser_create(certObjects, this->encoding);
/* unless we see a keyUsage extension we are compliant with RFC 4945 */
this->flags |= X509_IKE_COMPLIANT;
while (parser->iterate(parser, &objectID, &object)) while (parser->iterate(parser, &objectID, &object))
{ {
u_int level = parser->get_level(parser)+1; u_int level = parser->get_level(parser)+1;