pki: Add EncodeMtcCaCertificate helper function This builds an MTC CA certificate from the fields that MTC CAs are currently configured with (CA ID, cosigner algorithm, and cosigner key), and a serial number range. Unlike the certificate synthesized in MTCAnchor today, it has the CA's key and MTC CA extension, so ParsedCertificate parses its MTC CA fields as for any other MTC CA certificate. It uses the unsigned certificate format from RFC 9925. The certificate's key usage asserts keyCertSign and cRLSign, as a CA certificate normally would, so CRLs signed by the CA's key can be checked against it. Nothing calls this yet. Bug: 575507260 Change-Id: Ib3c8f4d3541213ae9d0f2af2d8e5a2d76a6a6964 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/105208 Reviewed-by: David Benjamin <davidben@google.com> Reviewed-by: Matt Mueller <mattm@google.com> Commit-Queue: Lily Chen <chlily@google.com>
diff --git a/BUILD.bazel b/BUILD.bazel index aef0732..9432af0 100644 --- a/BUILD.bazel +++ b/BUILD.bazel
@@ -198,7 +198,10 @@ srcs = pki_sources, hdrs = pki_headers, copts = ["-DBORINGSSL_IMPLEMENTATION"], + # pki_sources also depend on :crypto's internal headers. + implementation_deps = [":crypto_internal"], internal_hdrs = pki_internal_headers, + # pki_headers depend on :crypto's exported headers. deps = [":crypto"], )
diff --git a/build.json b/build.json index 949c9d4..444080a 100644 --- a/build.json +++ b/build.json
@@ -747,6 +747,7 @@ "pki/certificate_policies.cc", "pki/common_cert_errors.cc", "pki/crl.cc", + "pki/encode_certificate.cc", "pki/encode_values.cc", "pki/extended_key_usage.cc", "pki/general_names.cc", @@ -793,6 +794,7 @@ "pki/certificate_policies.h", "pki/common_cert_errors.h", "pki/crl.h", + "pki/encode_certificate.h", "pki/encode_values.h", "pki/extended_key_usage.h", "pki/general_names.h", @@ -1120,6 +1122,7 @@ "pki/certificate_policies_unittest.cc", "pki/certificate_unittest.cc", "pki/crl_unittest.cc", + "pki/encode_certificate_unittest.cc", "pki/encode_values_unittest.cc", "pki/extended_key_usage_unittest.cc", "pki/general_names_unittest.cc",
diff --git a/crypto/x509/test/mtc/ca_widest_validity/ca_cert.pem b/crypto/x509/test/mtc/ca_widest_validity/ca_cert.pem new file mode 100644 index 0000000..4ad6650 --- /dev/null +++ b/crypto/x509/test/mtc/ca_widest_validity/ca_cert.pem
@@ -0,0 +1,35 @@ +-----BEGIN CERTIFICATE----- +MIIGADCCBe2gAwIBAgIBATAKBggrBgEFBQcGJDAQMQ4wDAYIKwYBBQUHGQEMADAi +GA8wMDAwMDEwMTAwMDAwMFoYDzk5OTkxMjMxMjM1OTU5WjAUMRIwEAYIKwYBBQUH +GQMNBIH9WQEwggUyMAsGCWCGSAFlAwQDEQOCBSEA17K0clSq4NtF55MNSpjSyX2P +E5fReJ2voXAksxbpvslPyZRtQvGbeadBO7qjPnFJy0LtURVpOsBB+suYit61/g4d +hjEYSZW1ksOX0ilOLhT5CqQUujgmiZrEP0zMrLwm6agyuVEY1ctDPL75ZgsAE44I +F/YediyidMNq1VTrIqrBFi5KsBrLoeOMTv2PgLZbMz0PcuVd/nHOnB67mInnxWEG +wP1zgDoq7P6v3teqPLLO2lTRK9jNNqeM+XWUO0er0l6ICsRS5XQu0ejRqCr6huWQ +x1jBWuTShA2SvKGlCQ9ASWWX/KfYuVE/GhvabpUKqpjeRnUH1KT1pPBZkhZYLDVy +9i7aiQWrNYFnDEoCd3oz4Mpylf2PT/bRoKOnaD1l9fX3/GDaAj6CbF+SFEwC99G6 +EHWYdVPqk2f8122ZC3+pnNRa/biDbUPkWfUYffBYR5cJoB6mg1k1+nBGCZDNPcG6 +QBupS6sd3kGsZ6szGdysoGBI1MTu8n7hOpwX0FOPQw8tZC3CQVZg3niHfY2KvHJS +OXjAQuQoX0MZhGxEEmJCl2hEwQ5Va6IVtacZ5Z0MayqW05hZBx/cws3nUkp77a5U +6FsxjoVOj+Ky8+36yXGRKCcKr9HlBEw6T9r9n/MfkHhLjo5FlhRKDa9YZRHT2ZYr +nqla8Ze05fxg8rHtFd46W+9fib3HnZEFHZsoFudPpUUx79wcvnTUSIV/R2vNWPIc +C2U7O3ak4HamVZowJxhVXMY/dIWaq6uSXwI4YcqM0Pe62yhx9n1VMm10URNa1F9K +G6aRGPuyyKMO7JOS7z+XcGbJrdXHEMxkexUU0hfZWMcBfD6Q/SDATmdLkEhuk3Cj +GgAdMvRzl55JBnSefkd/oLdFCPil8jeDErg8Jb04jKCw//dHi69CtxZn7arJfEax +KWQ+WG5bBVoMIRlG1PNuZ1vtWGD6BCoxXZgmFk1qkjfDWl+/SVSQpb1N8ki5XEqu +d4S2BWcxZqxCRbW0sIKgnpMj5i8geMW3Z4NEbe/XNq06NwLUmwiYRJAKYYMzl7xE +GbMNepegs4fBkRR0xNQbU+Mql3rLbw6nXbZbs55Z5wHnaVfe9vLURVnDGncSK1IE +47XCGfFoixTtC8C4AbPm6C3NQ+nA6fQXRM2YFb0byIINi7Ej8E+s0bG2hd1aKxuN +u/PtkzZw8JWhgLTxktCLELj6u9/MKyRRjjLuoKXgyQTKhEeACD87DNLQuLavZ7w1 +W5SUAl3HsKePqA46Lb/rUTKIUdYHgZjpSTZRrnh+wCUfkiujDp9R32Km1yeEzz3S +BTkxdt+jJKUSvZSXCjbdNKUUqGeR8Os28BRbCatkZRtKAxOymWEaKhxIiRYnWYdo +oxFAYLpEQ0ht9RUioc6IswmFwhb45u0XjdVnswSg1Mr7qIKig0LxepqiauWNtjAI +PSw1j99WbD9dYqQoVnvJ6ozpXKoPNUdLC/qPM5olCrTfzyCDvo7vvBBV4Y/hU3Du +yyYFZtg/8GshGq7EPKKbVMzQD4gVokZe8LRlFcx+QfMSTwnv/3OTCatYspoUWaAL +zlA46TjJZ49y6w5O5f2q5m2fhXP8l/xCtJWfS/i2HXhDPoawM11ukZHE2L9IezkF +wQjP1qwksM633LfPUfhNDtaHuV6uscUzwG8NlwI9kqcIJYN7Wbpst9TlawqHwgOG +KujzFbpZJejt76Z5NpoiAnZhUfFqll+fgeznbMBwtVhp5NuXhM8FyDCzJCyDEqNV +MFMwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wMAYIKwYBBQUHASYB +Af8EITAfMAsGCWCGSAFlAwQDEQIHAQAAAAAACAIHAQAAAAAQADAKBggrBgEFBQcG +JAMBAA== +-----END CERTIFICATE-----
diff --git a/crypto/x509/test/mtc/ca_widest_validity/mtc_testdata_config.json b/crypto/x509/test/mtc/ca_widest_validity/mtc_testdata_config.json new file mode 100644 index 0000000..11257be --- /dev/null +++ b/crypto/x509/test/mtc/ca_widest_validity/mtc_testdata_config.json
@@ -0,0 +1,30 @@ +{ + "Version": "plants-07", + "ID": "32473.1", + "LogNumber": 1, + "Cosigners": [ + { + "CosignerID": "32473.1", + "SignatureAlgorithm": "mldsa44", + "PrivateKey": "MDQCAQAwCwYJYIZIAWUDBAMRBCKAIAABAgMEBQYHCAkKCwwNDg8QERITFBUWFxgZGhscHR4f" + } + ], + "CACert": { + "//0": "The CA certificate has the widest validity period, so that it matches pki's EncodeMtcCaCertificate.", + "NotBefore": "0000-01-01T00:00:00Z", + "NotAfter": "9999-12-31T23:59:59Z", + "IsCA": true, + "KeyUsage": [ + "CertSign", + "CRLSign" + ], + "MinSerial": { + "Log": 1, + "Index": 8 + }, + "MaxSerial": { + "Log": 1, + "Index": 4096 + } + } +}
diff --git a/gen/sources.bzl b/gen/sources.bzl index 313231e..7ac17b8 100644 --- a/gen/sources.bzl +++ b/gen/sources.bzl
@@ -1018,6 +1018,7 @@ "crypto/x509/test/mtc/ca_id_too_long/cert_1_0.pem", "crypto/x509/test/mtc/ca_min_serial_too_low/ca_cert.pem", "crypto/x509/test/mtc/ca_min_serial_too_low/cert_1_0.pem", + "crypto/x509/test/mtc/ca_widest_validity/ca_cert.pem", "crypto/x509/test/mtc/cert_10_0.pem", "crypto/x509/test/mtc/cert_10_1.pem", "crypto/x509/test/mtc/cert_2034_0.pem", @@ -1324,6 +1325,7 @@ "pki/certificate_policies.cc", "pki/common_cert_errors.cc", "pki/crl.cc", + "pki/encode_certificate.cc", "pki/encode_values.cc", "pki/extended_key_usage.cc", "pki/general_names.cc", @@ -1371,6 +1373,7 @@ "pki/certificate_policies.h", "pki/common_cert_errors.h", "pki/crl.h", + "pki/encode_certificate.h", "pki/encode_values.h", "pki/extended_key_usage.h", "pki/general_names.h", @@ -1409,6 +1412,7 @@ "pki/certificate_policies_unittest.cc", "pki/certificate_unittest.cc", "pki/crl_unittest.cc", + "pki/encode_certificate_unittest.cc", "pki/encode_values_unittest.cc", "pki/extended_key_usage_unittest.cc", "pki/general_names_unittest.cc", @@ -1452,6 +1456,7 @@ "crypto/x509/test/mtc/ca_id_too_long/cert_1_0.pem", "crypto/x509/test/mtc/ca_min_serial_too_low/ca_cert.pem", "crypto/x509/test/mtc/ca_min_serial_too_low/cert_1_0.pem", + "crypto/x509/test/mtc/ca_widest_validity/ca_cert.pem", "crypto/x509/test/mtc/cert_10_0.pem", "crypto/x509/test/mtc/cert_10_1.pem", "crypto/x509/test/mtc/cert_2034_0.pem",
diff --git a/gen/sources.cmake b/gen/sources.cmake index 01b63a2..88e1169 100644 --- a/gen/sources.cmake +++ b/gen/sources.cmake
@@ -1050,6 +1050,7 @@ crypto/x509/test/mtc/ca_id_too_long/cert_1_0.pem crypto/x509/test/mtc/ca_min_serial_too_low/ca_cert.pem crypto/x509/test/mtc/ca_min_serial_too_low/cert_1_0.pem + crypto/x509/test/mtc/ca_widest_validity/ca_cert.pem crypto/x509/test/mtc/cert_10_0.pem crypto/x509/test/mtc/cert_10_1.pem crypto/x509/test/mtc/cert_2034_0.pem @@ -1374,6 +1375,7 @@ pki/certificate_policies.cc pki/common_cert_errors.cc pki/crl.cc + pki/encode_certificate.cc pki/encode_values.cc pki/extended_key_usage.cc pki/general_names.cc @@ -1425,6 +1427,7 @@ pki/certificate_policies.h pki/common_cert_errors.h pki/crl.h + pki/encode_certificate.h pki/encode_values.h pki/extended_key_usage.h pki/general_names.h @@ -1465,6 +1468,7 @@ pki/certificate_policies_unittest.cc pki/certificate_unittest.cc pki/crl_unittest.cc + pki/encode_certificate_unittest.cc pki/encode_values_unittest.cc pki/extended_key_usage_unittest.cc pki/general_names_unittest.cc @@ -1510,6 +1514,7 @@ crypto/x509/test/mtc/ca_id_too_long/cert_1_0.pem crypto/x509/test/mtc/ca_min_serial_too_low/ca_cert.pem crypto/x509/test/mtc/ca_min_serial_too_low/cert_1_0.pem + crypto/x509/test/mtc/ca_widest_validity/ca_cert.pem crypto/x509/test/mtc/cert_10_0.pem crypto/x509/test/mtc/cert_10_1.pem crypto/x509/test/mtc/cert_2034_0.pem
diff --git a/gen/sources.gni b/gen/sources.gni index 8506326..7e987e5 100644 --- a/gen/sources.gni +++ b/gen/sources.gni
@@ -1018,6 +1018,7 @@ "crypto/x509/test/mtc/ca_id_too_long/cert_1_0.pem", "crypto/x509/test/mtc/ca_min_serial_too_low/ca_cert.pem", "crypto/x509/test/mtc/ca_min_serial_too_low/cert_1_0.pem", + "crypto/x509/test/mtc/ca_widest_validity/ca_cert.pem", "crypto/x509/test/mtc/cert_10_0.pem", "crypto/x509/test/mtc/cert_10_1.pem", "crypto/x509/test/mtc/cert_2034_0.pem", @@ -1324,6 +1325,7 @@ "pki/certificate_policies.cc", "pki/common_cert_errors.cc", "pki/crl.cc", + "pki/encode_certificate.cc", "pki/encode_values.cc", "pki/extended_key_usage.cc", "pki/general_names.cc", @@ -1371,6 +1373,7 @@ "pki/certificate_policies.h", "pki/common_cert_errors.h", "pki/crl.h", + "pki/encode_certificate.h", "pki/encode_values.h", "pki/extended_key_usage.h", "pki/general_names.h", @@ -1409,6 +1412,7 @@ "pki/certificate_policies_unittest.cc", "pki/certificate_unittest.cc", "pki/crl_unittest.cc", + "pki/encode_certificate_unittest.cc", "pki/encode_values_unittest.cc", "pki/extended_key_usage_unittest.cc", "pki/general_names_unittest.cc", @@ -1452,6 +1456,7 @@ "crypto/x509/test/mtc/ca_id_too_long/cert_1_0.pem", "crypto/x509/test/mtc/ca_min_serial_too_low/ca_cert.pem", "crypto/x509/test/mtc/ca_min_serial_too_low/cert_1_0.pem", + "crypto/x509/test/mtc/ca_widest_validity/ca_cert.pem", "crypto/x509/test/mtc/cert_10_0.pem", "crypto/x509/test/mtc/cert_10_1.pem", "crypto/x509/test/mtc/cert_2034_0.pem",
diff --git a/gen/sources.json b/gen/sources.json index 5315eb6..89af634 100644 --- a/gen/sources.json +++ b/gen/sources.json
@@ -997,6 +997,7 @@ "crypto/x509/test/mtc/ca_id_too_long/cert_1_0.pem", "crypto/x509/test/mtc/ca_min_serial_too_low/ca_cert.pem", "crypto/x509/test/mtc/ca_min_serial_too_low/cert_1_0.pem", + "crypto/x509/test/mtc/ca_widest_validity/ca_cert.pem", "crypto/x509/test/mtc/cert_10_0.pem", "crypto/x509/test/mtc/cert_10_1.pem", "crypto/x509/test/mtc/cert_2034_0.pem", @@ -1306,6 +1307,7 @@ "pki/certificate_policies.cc", "pki/common_cert_errors.cc", "pki/crl.cc", + "pki/encode_certificate.cc", "pki/encode_values.cc", "pki/extended_key_usage.cc", "pki/general_names.cc", @@ -1351,6 +1353,7 @@ "pki/certificate_policies.h", "pki/common_cert_errors.h", "pki/crl.h", + "pki/encode_certificate.h", "pki/encode_values.h", "pki/extended_key_usage.h", "pki/general_names.h", @@ -1390,6 +1393,7 @@ "pki/certificate_policies_unittest.cc", "pki/certificate_unittest.cc", "pki/crl_unittest.cc", + "pki/encode_certificate_unittest.cc", "pki/encode_values_unittest.cc", "pki/extended_key_usage_unittest.cc", "pki/general_names_unittest.cc", @@ -1432,6 +1436,7 @@ "crypto/x509/test/mtc/ca_id_too_long/cert_1_0.pem", "crypto/x509/test/mtc/ca_min_serial_too_low/ca_cert.pem", "crypto/x509/test/mtc/ca_min_serial_too_low/cert_1_0.pem", + "crypto/x509/test/mtc/ca_widest_validity/ca_cert.pem", "crypto/x509/test/mtc/cert_10_0.pem", "crypto/x509/test/mtc/cert_10_1.pem", "crypto/x509/test/mtc/cert_2034_0.pem",
diff --git a/gen/sources.mk b/gen/sources.mk index a971b0f..5a412b6 100644 --- a/gen/sources.mk +++ b/gen/sources.mk
@@ -1003,6 +1003,7 @@ crypto/x509/test/mtc/ca_id_too_long/cert_1_0.pem \ crypto/x509/test/mtc/ca_min_serial_too_low/ca_cert.pem \ crypto/x509/test/mtc/ca_min_serial_too_low/cert_1_0.pem \ + crypto/x509/test/mtc/ca_widest_validity/ca_cert.pem \ crypto/x509/test/mtc/cert_10_0.pem \ crypto/x509/test/mtc/cert_10_1.pem \ crypto/x509/test/mtc/cert_2034_0.pem \ @@ -1300,6 +1301,7 @@ pki/certificate_policies.cc \ pki/common_cert_errors.cc \ pki/crl.cc \ + pki/encode_certificate.cc \ pki/encode_values.cc \ pki/extended_key_usage.cc \ pki/general_names.cc \ @@ -1345,6 +1347,7 @@ pki/certificate_policies.h \ pki/common_cert_errors.h \ pki/crl.h \ + pki/encode_certificate.h \ pki/encode_values.h \ pki/extended_key_usage.h \ pki/general_names.h \ @@ -1382,6 +1385,7 @@ pki/certificate_policies_unittest.cc \ pki/certificate_unittest.cc \ pki/crl_unittest.cc \ + pki/encode_certificate_unittest.cc \ pki/encode_values_unittest.cc \ pki/extended_key_usage_unittest.cc \ pki/general_names_unittest.cc \ @@ -1424,6 +1428,7 @@ crypto/x509/test/mtc/ca_id_too_long/cert_1_0.pem \ crypto/x509/test/mtc/ca_min_serial_too_low/ca_cert.pem \ crypto/x509/test/mtc/ca_min_serial_too_low/cert_1_0.pem \ + crypto/x509/test/mtc/ca_widest_validity/ca_cert.pem \ crypto/x509/test/mtc/cert_10_0.pem \ crypto/x509/test/mtc/cert_10_1.pem \ crypto/x509/test/mtc/cert_2034_0.pem \
diff --git a/pki/encode_certificate.cc b/pki/encode_certificate.cc new file mode 100644 index 0000000..28c45c0 --- /dev/null +++ b/pki/encode_certificate.cc
@@ -0,0 +1,177 @@ +// Copyright 2026 The BoringSSL Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#include "encode_certificate.h" + +#include <openssl/bytestring.h> +#include <openssl/nid.h> +#include <openssl/pool.h> + +#include "../crypto/bytestring/internal.h" +#include "encode_values.h" + +BSSL_NAMESPACE_BEGIN + +namespace { + +// draft-ietf-plants-merkle-tree-certs-07, Section 5.5: mtcMinSerial. +constexpr uint64_t kMtcMinSerial = uint64_t{1} << 48; + +// `EncodeMtcCaCertificate` produces a certificate that is not issued by anyone, +// so its serial number is arbitrary, but RFC 5280, Section 4.1.2.2, requires it +// to be positive. +constexpr uint64_t kMtcCaCertSerialNumber = 1; + +constexpr uint8_t kRdnaTrustAnchorIDOid[] = {OBJ_ENC_rdna_trustAnchorID}; +constexpr uint8_t kKeyUsageOid[] = {OBJ_ENC_key_usage}; +constexpr uint8_t kBasicConstraintsOid[] = {OBJ_ENC_basic_constraints}; +constexpr uint8_t kMtcCertificationAuthoritySha256Oid[] = { + OBJ_ENC_pe_mtcCertificationAuthority_SHA256}; + +// The validity for MTC CA certificates is as wide as possible, to never +// constrain path building. +// notBefore is the earliest time representable as a GeneralizedTime, +// 00000101000000Z. notAfter is the value from RFC 5280, Section 4.1.2.5, for +// a certificate with no well-defined expiration date, 99991231235959Z. +// clang-format off +constexpr uint8_t kMtcCaCertValidity[] = { + 0x30, 34, // SEQUENCE (34 bytes) + 0x18, 15, // GeneralizedTime (15 bytes) + '0', '0', '0', '0', '0', '1', '0', '1', '0', '0', '0', '0', '0', '0', 'Z', + 0x18, 15, // GeneralizedTime (15 bytes) + '9', '9', '9', '9', '1', '2', '3', '1', '2', '3', '5', '9', '5', '9', 'Z', +}; +// clang-format on + +// KeyUsage extension for MTC CA certificates: a BIT STRING with keyCertSign +// (bit 5) and cRLSign (bit 6) set. +// clang-format off +constexpr uint8_t kMtcCaCertKeyUsage[] = { + 0x03, 2, 1, 0b00000110, // BIT STRING (2 bytes, 1 unused bit) +}; +// clang-format on + +// BasicConstraints extension for CA certificates: a SEQUENCE with cA set to +// TRUE. +// clang-format off +constexpr uint8_t kMtcCaCertBasicConstraints[] = { + 0x30, 3, // SEQUENCE (3 bytes) + 0x01, 1, 0xff, // BOOLEAN (1 byte) +}; +// clang-format on + +} // namespace + +UniquePtr<CRYPTO_BUFFER> EncodeMtcCaCertificate( + Span<const uint8_t> ca_id, SignatureAlgorithm ca_cosign_sigalg, + Span<const uint8_t> ca_cosign_key, uint64_t min_serial, uint64_t max_serial, + CRYPTO_BUFFER_POOL *pool) { + if (ca_cosign_sigalg == SignatureAlgorithm::kMtcProof) { + return nullptr; + } + // minSerial and maxSerial are INTEGER (mtcMinSerial..mtcMaxSerial), where + // mtcMaxSerial is the largest uint64_t. If `min_serial` > `max_serial`, the + // range is empty, and the MTC CA has no valid serial numbers. + if (min_serial < kMtcMinSerial || max_serial < kMtcMinSerial) { + return nullptr; + } + CBS key_cbs(ca_cosign_key), ca_id_cbs(ca_id); + // Ensure `ca_cosign_key` is a single SEQUENCE, so it cannot be misparsed as + // other Certificate fields. + if (!CBS_get_asn1(&key_cbs, nullptr, CBS_ASN1_SEQUENCE) || + CBS_len(&key_cbs) != 0) { + return nullptr; + } + if (!CBS_is_valid_asn1_relative_oid(&ca_id_cbs)) { + return nullptr; + } + + // MTCCertificationAuthority + ScopedCBB mtc_ca_cbb; + CBB mtc_ca; + if (!CBB_init(mtc_ca_cbb.get(), 32) || + !CBB_add_asn1(mtc_ca_cbb.get(), &mtc_ca, CBS_ASN1_SEQUENCE) || + // sigAlg + !AddSignatureAlgorithmIdentifier(&mtc_ca, ca_cosign_sigalg) || + // minSerial, maxSerial + !CBB_add_asn1_uint64(&mtc_ca, min_serial) || + !CBB_add_asn1_uint64(&mtc_ca, max_serial) || + !CBB_flush(mtc_ca_cbb.get())) { + return nullptr; + } + + ScopedCBB cbb; + CBB cert, tbs_cert, version, subject, rdn, attr, extensions_wrapper, + extensions, signature; + if (!CBB_init(cbb.get(), 256 + ca_cosign_key.size()) || + !CBB_add_asn1(cbb.get(), &cert, CBS_ASN1_SEQUENCE) || + !CBB_add_asn1(&cert, &tbs_cert, CBS_ASN1_SEQUENCE) || + // version: v3 + !CBB_add_asn1(&tbs_cert, &version, + CBS_ASN1_CONTEXT_SPECIFIC | CBS_ASN1_CONSTRUCTED | 0) || + !CBB_add_asn1_uint64(&version, 2) || + // serialNumber + !CBB_add_asn1_uint64(&tbs_cert, kMtcCaCertSerialNumber) || + // signature (TBSCertificate) + !der::EncodeUnsignedAlgorithmIdentifier(&tbs_cert) || + // issuer + !der::EncodeUnsignedIssuerName(&tbs_cert) || + // validity + !CBB_add_bytes(&tbs_cert, kMtcCaCertValidity, + sizeof(kMtcCaCertValidity)) || + // subject + !CBB_add_asn1(&tbs_cert, &subject, CBS_ASN1_SEQUENCE) || + !CBB_add_asn1(&subject, &rdn, CBS_ASN1_SET) || + !CBB_add_asn1(&rdn, &attr, CBS_ASN1_SEQUENCE)) { + return nullptr; + } + + // draft-ietf-plants-merkle-tree-certs, Section 5.1: The CA ID's distinguished + // name has a single attribute of type id-rdna-trustAnchorID, whose value is a + // RELATIVE-OID containing the CA ID. + if (!CBB_add_asn1_element(&attr, CBS_ASN1_OBJECT, kRdnaTrustAnchorIDOid, + sizeof(kRdnaTrustAnchorIDOid)) || + !CBB_add_asn1_element(&attr, CBS_ASN1_RELATIVE_OID, ca_id.data(), + ca_id.size())) { + return nullptr; + } + + // subjectPublicKeyInfo + if (!CBB_add_bytes(&tbs_cert, ca_cosign_key.data(), ca_cosign_key.size()) || + // extensions + !CBB_add_asn1(&tbs_cert, &extensions_wrapper, + CBS_ASN1_CONTEXT_SPECIFIC | CBS_ASN1_CONSTRUCTED | 3) || + !CBB_add_asn1(&extensions_wrapper, &extensions, CBS_ASN1_SEQUENCE) || + !der::EncodeExtension(&extensions, kKeyUsageOid, /*critical=*/true, + kMtcCaCertKeyUsage) || + !der::EncodeExtension(&extensions, kBasicConstraintsOid, + /*critical=*/true, kMtcCaCertBasicConstraints) || + !der::EncodeExtension(&extensions, kMtcCertificationAuthoritySha256Oid, + /*critical=*/true, CBBAsSpan(mtc_ca_cbb.get())) || + // Outer signatureAlgorithm in the Certificate + !der::EncodeUnsignedAlgorithmIdentifier(&cert) || + // signatureValue (BIT STRING of length zero, per RFC 9925) + !CBB_add_asn1(&cert, &signature, CBS_ASN1_BITSTRING) || + !CBB_add_u8(&signature, 0)) { + return nullptr; + } + + if (!CBB_flush(cbb.get())) { + return nullptr; + } + CBS der(CBBAsSpan(cbb.get())); + return UniquePtr<CRYPTO_BUFFER>(CRYPTO_BUFFER_new_from_CBS(&der, pool)); +} + +BSSL_NAMESPACE_END
diff --git a/pki/encode_certificate.h b/pki/encode_certificate.h new file mode 100644 index 0000000..6b67372 --- /dev/null +++ b/pki/encode_certificate.h
@@ -0,0 +1,43 @@ +// Copyright 2026 The BoringSSL Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#ifndef BSSL_PKI_ENCODE_CERTIFICATE_H_ +#define BSSL_PKI_ENCODE_CERTIFICATE_H_ + +#include <stdint.h> + +#include <openssl/base.h> +#include <openssl/pool.h> +#include <openssl/span.h> + +#include "signature_algorithm.h" + +BSSL_NAMESPACE_BEGIN + +// Returns an MTC CA certificate encoded according to +// draft-ietf-plants-merkle-tree-certs-07, Section 5.5, or nullptr on error. +// The certificate is allocated from `pool` (which may be null). `ca_id` +// contains the DER encoding of the relative OID of the CA's ID, and +// `ca_cosign_sigalg` and `ca_cosign_key` (a DER-encoded SubjectPublicKeyInfo) +// describe the CA cosigner algorithm and key. Its allowed serial number range +// is set to `min_serial`..`max_serial`, inclusive, which is empty if +// `min_serial` > `max_serial`. The certificate is unsigned (RFC 9925). +OPENSSL_EXPORT UniquePtr<CRYPTO_BUFFER> EncodeMtcCaCertificate( + Span<const uint8_t> ca_id, SignatureAlgorithm ca_cosign_sigalg, + Span<const uint8_t> ca_cosign_key, uint64_t min_serial, uint64_t max_serial, + CRYPTO_BUFFER_POOL *pool); + +BSSL_NAMESPACE_END + +#endif // BSSL_PKI_ENCODE_CERTIFICATE_H_
diff --git a/pki/encode_certificate_unittest.cc b/pki/encode_certificate_unittest.cc new file mode 100644 index 0000000..d8c3a98 --- /dev/null +++ b/pki/encode_certificate_unittest.cc
@@ -0,0 +1,149 @@ +// Copyright 2026 The BoringSSL Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#include "encode_certificate.h" + +#include <vector> + +#include <gtest/gtest.h> + +#include <openssl/pool.h> + +#include "../crypto/test/test_util.h" +#include "input.h" +#include "parsed_certificate.h" +#include "signature_algorithm.h" +#include "test_helpers.h" + +BSSL_NAMESPACE_BEGIN + +namespace { + +// The widest valid serial number range for an MTC CA. +constexpr uint64_t kMinSerial = uint64_t{1} << 48; +constexpr uint64_t kMaxSerial = UINT64_MAX; + +// Encodes an MTC CA certificate and parses it as for any other certificate. +std::shared_ptr<const ParsedCertificate> EncodeAndParseMtcCaCertificate( + Span<const uint8_t> ca_id, SignatureAlgorithm ca_cosign_sigalg, + Span<const uint8_t> ca_cosign_key, uint64_t min_serial, + uint64_t max_serial) { + UniquePtr<CRYPTO_BUFFER> cert = + EncodeMtcCaCertificate(ca_id, ca_cosign_sigalg, ca_cosign_key, min_serial, + max_serial, /*pool=*/nullptr); + if (!cert) { + return nullptr; + } + return ParsedCertificate::Create(std::move(cert), {}, nullptr); +} + +} // namespace + +// Tests that the encoded MTC CA certificate exactly matches a certificate +// generated independently with the same fields, by the demo tool in +// crypto/x509/test/mtc. +TEST(EncodeCertificateTest, EncodeMtcCaCertificate) { + std::shared_ptr<const ParsedCertificate> expected = + ReadCryptoX509MTCTestCert("ca_widest_validity/ca_cert.pem"); + ASSERT_TRUE(expected); + + static const uint8_t kCaId[] = {0x81, 0xfd, 0x59, 0x01}; // 32473.1 + UniquePtr<CRYPTO_BUFFER> cert = EncodeMtcCaCertificate( + kCaId, SignatureAlgorithm::kMldsa44, expected->tbs().spki_tlv, + /*min_serial=*/(uint64_t{1} << 48) | 8, + /*max_serial=*/(uint64_t{1} << 48) | 4096, /*pool=*/nullptr); + ASSERT_TRUE(cert); + EXPECT_EQ( + Bytes(CRYPTO_BUFFER_data(cert.get()), CRYPTO_BUFFER_len(cert.get())), + Bytes(expected->der_cert().data(), expected->der_cert().size())); +} + +TEST(EncodeCertificateTest, EncodeMtcCaCertificateSignatureAlgorithms) { + std::shared_ptr<const ParsedCertificate> ca_cert = + ReadCryptoX509MTCTestCert("ca_cert.pem"); + ASSERT_TRUE(ca_cert); + static const uint8_t kCaId[] = {42}; + + for (int i = 0; i <= static_cast<int>(SignatureAlgorithm::kMaxValue); i++) { + SignatureAlgorithm alg = static_cast<SignatureAlgorithm>(i); + SCOPED_TRACE(i); + std::shared_ptr<const ParsedCertificate> cert = + EncodeAndParseMtcCaCertificate(kCaId, alg, ca_cert->tbs().spki_tlv, + kMinSerial, kMaxSerial); + if (alg == SignatureAlgorithm::kMtcProof) { + EXPECT_FALSE(cert); + continue; + } + ASSERT_TRUE(cert); + EXPECT_EQ( + ParseSignatureAlgorithm(cert->mtc_ca_info()->ca_cosign_algorithm_tlv), + alg); + } +} + +TEST(EncodeCertificateTest, EncodeMtcCaCertificateInvalid) { + std::shared_ptr<const ParsedCertificate> ca_cert = + ReadCryptoX509MTCTestCert("ca_cert.pem"); + ASSERT_TRUE(ca_cert); + der::Input spki = ca_cert->tbs().spki_tlv; + static const uint8_t kCaId[] = {42}; + // A non-minimal RELATIVE-OID component. + static const uint8_t kInvalidCaId[] = {0x80, 0x01}; + static const uint8_t kInvalidSpki[] = {0x01, 0x02, 0x03}; + // A valid SubjectPublicKeyInfo followed by trailing data. + std::vector<uint8_t> spki_trailing_data(spki.begin(), spki.end()); + spki_trailing_data.push_back(0x05); + spki_trailing_data.push_back(0x00); + + auto encode = [](Span<const uint8_t> ca_id, Span<const uint8_t> key, + uint64_t min_serial = kMinSerial, + uint64_t max_serial = kMaxSerial) { + return EncodeMtcCaCertificate(ca_id, SignatureAlgorithm::kMldsa44, key, + min_serial, max_serial, /*pool=*/nullptr); + }; + EXPECT_TRUE(encode(kCaId, spki)); + EXPECT_FALSE(encode(kInvalidCaId, spki)); + EXPECT_FALSE(encode({}, spki)); + EXPECT_FALSE(encode(kCaId, kInvalidSpki)); + EXPECT_FALSE(encode(kCaId, {})); + EXPECT_FALSE(encode(kCaId, spki_trailing_data)); + + // Serial numbers must be at least mtcMinSerial. The range may be empty. + EXPECT_TRUE(encode(kCaId, spki, kMinSerial, kMinSerial)); + EXPECT_TRUE(encode(kCaId, spki, kMinSerial + 1, kMinSerial)); + EXPECT_FALSE(encode(kCaId, spki, kMinSerial - 1, kMaxSerial)); + EXPECT_FALSE(encode(kCaId, spki, kMinSerial, kMinSerial - 1)); +} + +// Tests that the certificate is allocated from the given pool. +TEST(EncodeCertificateTest, EncodeMtcCaCertificatePool) { + std::shared_ptr<const ParsedCertificate> ca_cert = + ReadCryptoX509MTCTestCert("ca_cert.pem"); + ASSERT_TRUE(ca_cert); + static const uint8_t kCaId[] = {42}; + + UniquePtr<CRYPTO_BUFFER_POOL> pool(CRYPTO_BUFFER_POOL_new()); + ASSERT_TRUE(pool); + UniquePtr<CRYPTO_BUFFER> cert1 = EncodeMtcCaCertificate( + kCaId, SignatureAlgorithm::kMldsa44, ca_cert->tbs().spki_tlv, kMinSerial, + kMaxSerial, pool.get()); + ASSERT_TRUE(cert1); + UniquePtr<CRYPTO_BUFFER> cert2 = EncodeMtcCaCertificate( + kCaId, SignatureAlgorithm::kMldsa44, ca_cert->tbs().spki_tlv, kMinSerial, + kMaxSerial, pool.get()); + ASSERT_TRUE(cert2); + EXPECT_EQ(cert1.get(), cert2.get()); +} + +BSSL_NAMESPACE_END
diff --git a/pki/encode_values.cc b/pki/encode_values.cc index a577780..21cf36d 100644 --- a/pki/encode_values.cc +++ b/pki/encode_values.cc
@@ -14,10 +14,12 @@ #include "encode_values.h" -#include "parse_values.h" - +#include <openssl/bytestring.h> +#include <openssl/nid.h> #include <openssl/posix_time.h> +#include "parse_values.h" + BSSL_NAMESPACE_BEGIN namespace der { @@ -115,5 +117,44 @@ return true; } +bool EncodeUnsignedAlgorithmIdentifier(CBB *cbb) { + // RFC 9925, Section 3.1: The AlgorithmIdentifier for id-alg-unsigned + // (1.3.6.1.5.5.7.6.36), with the parameters field omitted. + // clang-format off + static const uint8_t kUnsignedAlgorithmIdentifier[] = { + 0x30, 10, // SEQUENCE (10 bytes) + 0x06, 8, OBJ_ENC_alg_unsigned, // OBJECT IDENTIFIER (8 bytes) + }; + // clang-format on + return CBB_add_bytes(cbb, kUnsignedAlgorithmIdentifier, + sizeof(kUnsignedAlgorithmIdentifier)); +} + +bool EncodeUnsignedIssuerName(CBB *cbb) { + // RFC 9925, Section 3.2: A Name with a single attribute of type + // id-rdna-unsigned (1.3.6.1.5.5.7.25.1), whose value is an empty UTF8String. + // clang-format off + static const uint8_t kUnsignedIssuerName[] = { + 0x30, 16, // SEQUENCE (16 bytes) + 0x31, 14, // SET (14 bytes) + 0x30, 12, // SEQUENCE (12 bytes) + 0x06, 8, OBJ_ENC_rdna_unsigned, // OBJECT IDENTIFIER (8 bytes) + 0x0c, 0, // UTF8String (0 bytes) + }; + // clang-format on + return CBB_add_bytes(cbb, kUnsignedIssuerName, sizeof(kUnsignedIssuerName)); +} + +bool EncodeExtension(CBB *cbb, Span<const uint8_t> oid, bool critical, + Span<const uint8_t> value) { + CBB extension; + return CBB_add_asn1(cbb, &extension, CBS_ASN1_SEQUENCE) && + CBB_add_asn1_element(&extension, CBS_ASN1_OBJECT, oid.data(), + oid.size()) && + (!critical || CBB_add_asn1_bool(&extension, 1)) && + CBB_add_asn1_octet_string(&extension, value.data(), value.size()) && + CBB_flush(cbb); +} + } // namespace der BSSL_NAMESPACE_END
diff --git a/pki/encode_values.h b/pki/encode_values.h index a5c823b..8cef623 100644 --- a/pki/encode_values.h +++ b/pki/encode_values.h
@@ -19,6 +19,7 @@ #include <stdint.h> #include <openssl/base.h> +#include <openssl/span.h> BSSL_NAMESPACE_BEGIN namespace der { @@ -51,6 +52,22 @@ OPENSSL_EXPORT bool EncodeUTCTime(const GeneralizedTime &time, uint8_t out[kUTCTimeLength]); +// Writes the DER encoding of the id-alg-unsigned AlgorithmIdentifier (RFC 9925, +// Section 3.1) to `cbb`, for the signature algorithm of an unsigned +// certificate. Returns true on success and false on error. +OPENSSL_EXPORT bool EncodeUnsignedAlgorithmIdentifier(CBB *cbb); + +// Writes the DER encoding of the placeholder issuer Name for an unsigned +// certificate (RFC 9925, Section 3.2) to `cbb`. Returns true on success and +// false on error. +OPENSSL_EXPORT bool EncodeUnsignedIssuerName(CBB *cbb); + +// Writes the DER encoding of an X.509 Extension (RFC 5280, Section 4.2) with +// OID `oid`, criticality `critical`, and DER-encoded extension value `value` +// to `cbb`. Returns true on success and false on error. +OPENSSL_EXPORT bool EncodeExtension(CBB *cbb, Span<const uint8_t> oid, + bool critical, Span<const uint8_t> value); + } // namespace der BSSL_NAMESPACE_END
diff --git a/pki/encode_values_unittest.cc b/pki/encode_values_unittest.cc index f50ed63..e0581fc 100644 --- a/pki/encode_values_unittest.cc +++ b/pki/encode_values_unittest.cc
@@ -17,6 +17,12 @@ #include <string_view> #include <gtest/gtest.h> + +#include <openssl/bytestring.h> +#include <openssl/nid.h> +#include <openssl/span.h> + +#include "../crypto/bytestring/internal.h" #include "parse_values.h" BSSL_NAMESPACE_BEGIN @@ -168,5 +174,50 @@ EXPECT_FALSE(EncodeUTCTime(time, out)); } +TEST(EncodeValuesTest, EncodeUnsignedAlgorithmIdentifier) { + ScopedCBB cbb; + ASSERT_TRUE(CBB_init(cbb.get(), 0)); + ASSERT_TRUE(EncodeUnsignedAlgorithmIdentifier(cbb.get())); + // SEQUENCE { OBJECT IDENTIFIER 1.3.6.1.5.5.7.6.36 } + static const uint8_t kExpected[] = {0x30, 0x0a, 0x06, 0x08, + OBJ_ENC_alg_unsigned}; + EXPECT_EQ(CBBAsSpan(cbb.get()), Span(kExpected)); +} + +TEST(EncodeValuesTest, EncodeUnsignedIssuerName) { + ScopedCBB cbb; + ASSERT_TRUE(CBB_init(cbb.get(), 0)); + ASSERT_TRUE(EncodeUnsignedIssuerName(cbb.get())); + // SEQUENCE { SET { SEQUENCE { + // OBJECT IDENTIFIER 1.3.6.1.5.5.7.25.1, UTF8String "" } } } + static const uint8_t kExpected[] = { + 0x30, 0x10, 0x31, 0x0e, 0x30, 0x0c, 0x06, 0x08, OBJ_ENC_rdna_unsigned, + 0x0c, 0x00}; + EXPECT_EQ(CBBAsSpan(cbb.get()), Span(kExpected)); +} + +TEST(EncodeValuesTest, EncodeExtension) { + static const uint8_t kOid[] = {OBJ_ENC_basic_constraints}; + static const uint8_t kValue[] = {0x30, 0x00}; + + ScopedCBB cbb; + ASSERT_TRUE(CBB_init(cbb.get(), 0)); + ASSERT_TRUE(EncodeExtension(cbb.get(), kOid, /*critical=*/false, kValue)); + // SEQUENCE { OBJECT IDENTIFIER, OCTET STRING { SEQUENCE {} } } + static const uint8_t kNonCritical[] = { + 0x30, 0x09, 0x06, 0x03, OBJ_ENC_basic_constraints, + 0x04, 0x02, 0x30, 0x00}; + EXPECT_EQ(CBBAsSpan(cbb.get()), Span(kNonCritical)); + + cbb.Reset(); + ASSERT_TRUE(CBB_init(cbb.get(), 0)); + ASSERT_TRUE(EncodeExtension(cbb.get(), kOid, /*critical=*/true, kValue)); + // SEQUENCE { OBJECT IDENTIFIER, BOOLEAN TRUE, OCTET STRING { SEQUENCE {} } } + static const uint8_t kCritical[] = { + 0x30, 0x0c, 0x06, 0x03, OBJ_ENC_basic_constraints, 0x01, 0x01, 0xff, + 0x04, 0x02, 0x30, 0x00}; + EXPECT_EQ(CBBAsSpan(cbb.get()), Span(kCritical)); +} + } // namespace der::test BSSL_NAMESPACE_END
diff --git a/pki/trust_store.h b/pki/trust_store.h index be359ec..1b9b849 100644 --- a/pki/trust_store.h +++ b/pki/trust_store.h
@@ -242,8 +242,8 @@ const CRYPTO_BUFFER *ca_key() const { return ca_key_.get(); } der::Input NormalizedSubject() const; CertificateTrust CertTrust() const; - // TODO(crbug.com/575507260): Replace synthesized certificate with a real MTC - // CA certificate. + // TODO(crbug.com/575507260): Replace synthesized certificate with an MTC CA + // certificate from EncodeMtcCaCertificate(). std::shared_ptr<const ParsedCertificate> AsCert() const; std::optional<TreeHashConstSpan> SubtreeHash(uint16_t log_number,