Attachment 944645 Details for Bug 1148895 – Use X509v3 Subject Key Identifier in p11_x509_calc_keyid()

[patch] Use X509v3 Subject Key Identifier in p11_x509_calc_keyid()

use-x509v3-subject-key-id.patch (text/plain), 1.13 KB, created by David Woodhouse on 2014-10-07 15:43:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Woodhouse

Created: 2014-10-07 15:43:19 UTC

Size: 1.13 KB

patch

obsolete

>diff --git a/trust/x509.c b/trust/x509.c
>index b93d26c..9f5a0a6 100644
>--- a/trust/x509.c
>+++ b/trust/x509.c
>@@ -100,11 +100,29 @@ p11_x509_calc_keyid (node_asn *cert,
> 	int start, end;
> 	size_t len;
> 	int ret;
>+	unsigned char *ski;
>+	size_t ski_len;
> 
> 	return_val_if_fail (cert != NULL, NULL);
> 	return_val_if_fail (der != NULL, NULL);
> 	return_val_if_fail (keyid != NULL, NULL);
> 
>+	ski = p11_x509_find_extension (cert, P11_OID_SUBJECT_KEY_IDENTIFIER, der, der_len, &ski_len);
>+	if (ski) {
>+		unsigned long tag;
>+		unsigned char cls;
>+		long octet_len;
>+		int tag_len, len_len;
>+
>+		if (asn1_get_tag_der (ski, ski_len, &cls, &tag_len, &tag) == ASN1_SUCCESS &&
>+		    (octet_len = asn1_get_length_der (ski + tag_len, ski_len - tag_len, &len_len)) >= 0 &&
>+		     tag_len + len_len + octet_len == ski_len &&
>+		     octet_len == P11_DIGEST_SHA1_LEN) {
>+			    memcpy(keyid, ski + tag_len + len_len, octet_len);
>+			    return true;
>+		    }
>+	}
>+
> 	ret = asn1_der_decoding_startEnd (cert, der, der_len, "tbsCertificate.subjectPublicKeyInfo", &start, &end);
> 	return_val_if_fail (ret == ASN1_SUCCESS, false);
> 	return_val_if_fail (end >= start, false);

Actions: View | Diff

Attachments on bug 1148895: 943419 | 943420 | 943493 | 943494 | 944600 | 944645