synta-certificate 0.2.6

X.509 certificate structures for synta ASN.1 library
Documentation
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
//! Composite ML-DSA key generation, signing, and verification for the OpenSSL backend.
//!
//! Feature-gated: `#[cfg(all(feature = "openssl", feature = "pqc", ossl_mldsa))]`
//! on the core key-generation and signing paths.  The verification path (in
//! `signature.rs`) has its own guards and calls into this module.

use super::OpensslKeyError;
use crate::crypto::composite_mldsa::{
    build_m_prime_from_hash, extract_spki_bitstring_payload, split_composite_sig,
    split_composite_spki_content, CompHash, CompositeMlDsaSpec, TradAlg,
};
#[cfg(all(feature = "pqc", ossl_mldsa))]
use crate::crypto::composite_mldsa::{
    composite_oid_components, encode_composite_pkcs8, encode_composite_spki,
    pkcs8_private_key_content, split_composite_privkey,
};
use crate::crypto::{ErasedCertificateSigner, PrivateKeyError};
#[cfg(all(feature = "pqc", ossl_mldsa))]
use native_ossl::pkey::{KeygenCtx, Private, Signer};
use native_ossl::pkey::{Pkey, Public, SignInit, Verifier};

// Brainpool curve OIDs — not in crate::oids, defined inline.
// brainpoolP256r1 = 1.3.36.3.3.2.8.1.1.7
const EC_CURVE_BRAINPOOL_P256R1: &[u32] = &[1, 3, 36, 3, 3, 2, 8, 1, 1, 7];
// brainpoolP384r1 = 1.3.36.3.3.2.8.1.1.11
const EC_CURVE_BRAINPOOL_P384R1: &[u32] = &[1, 3, 36, 3, 3, 2, 8, 1, 1, 11];

// ── DER helpers ───────────────────────────────────────────────────────────────

/// Build a standalone SubjectPublicKeyInfo DER from raw public key bytes.
///
/// `alg_params` is an optional pre-encoded `Element` for the AlgorithmIdentifier
/// parameters field (e.g. curve OID for EC, NULL for RSA, absent for EdDSA/ML-DSA).
fn encode_standalone_spki(
    alg_oid_comps: &[u32],
    alg_params: Option<synta::types::constructed::Element>,
    raw_pk: &[u8],
) -> Result<Vec<u8>, OpensslKeyError> {
    use synta::tag::{Tag, TAG_SEQUENCE};
    use synta::types::string::BitStringRef;
    use synta::{Encoder, Encoding, ObjectIdentifier};

    let oid = ObjectIdentifier::new(alg_oid_comps)
        .map_err(|e| OpensslKeyError(format!("invalid OID: {e}")))?;
    let pk_bit = BitStringRef::new(raw_pk, 0)
        .map_err(|e| OpensslKeyError(format!("BIT STRING encoding failed: {e}")))?;

    (|| -> synta::Result<Vec<u8>> {
        let mut enc = Encoder::new(Encoding::Der);
        enc.start_constructed_no_guard(Tag::universal_constructed(TAG_SEQUENCE))?;
        enc.start_constructed_no_guard(Tag::universal_constructed(TAG_SEQUENCE))?;
        enc.encode(&oid)?;
        if let Some(params) = alg_params {
            enc.encode(&params)?;
        }
        enc.end_constructed()?;
        enc.encode(&pk_bit)?;
        enc.end_constructed()?;
        enc.finish()
    })()
    .map_err(|e| OpensslKeyError(format!("SPKI DER encoding failed: {e}")))
}

/// Build a standalone OneAsymmetricKey (PKCS#8) DER.
///
/// `privkey_content` is the raw content of the `privateKey` OCTET STRING —
/// i.e. the bytes that [`pkcs8_private_key_content`] returns for each component.
#[cfg(all(feature = "pqc", ossl_mldsa))]
fn encode_standalone_pkcs8(
    alg_oid_comps: &[u32],
    alg_params: Option<synta::types::constructed::Element>,
    privkey_content: &[u8],
) -> Result<Vec<u8>, OpensslKeyError> {
    use synta::types::string::OctetStringRef;
    use synta::ObjectIdentifier;

    let oid = ObjectIdentifier::new(alg_oid_comps)
        .map_err(|e| OpensslKeyError(format!("invalid OID: {e}")))?;
    let alg = crate::AlgorithmIdentifier {
        algorithm: oid,
        parameters: alg_params,
    };
    let pki = crate::pkcs8_types::OneAsymmetricKey {
        version: synta::Integer::from_i64(0),
        private_key_algorithm: alg,
        private_key: OctetStringRef::new(privkey_content),
        attributes: None,
        public_key: None,
    };
    pki.to_der()
        .map_err(|e| OpensslKeyError(format!("PKCS#8 DER encoding failed: {e}")))
}

/// Return the curve-OID component array for an EC curve name.
fn ec_curve_oid_comps(curve: &str) -> Result<&'static [u32], OpensslKeyError> {
    match curve {
        "P-256" => Ok(crate::oids::EC_CURVE_P256),
        "P-384" => Ok(crate::oids::EC_CURVE_P384),
        "P-521" => Ok(crate::oids::EC_CURVE_P521),
        "brainpoolP256r1" => Ok(EC_CURVE_BRAINPOOL_P256R1),
        "brainpoolP384r1" => Ok(EC_CURVE_BRAINPOOL_P384R1),
        other => Err(OpensslKeyError(format!("unsupported EC curve: {other}"))),
    }
}

/// Build an `Element::ObjectIdentifier(curve_oid)` for use as EC AlgorithmIdentifier params.
fn ec_alg_params(curve: &str) -> Result<synta::types::constructed::Element<'_>, OpensslKeyError> {
    use synta::{types::constructed::Element, ObjectIdentifier};
    let comps = ec_curve_oid_comps(curve)?;
    let oid = ObjectIdentifier::new(comps)
        .map_err(|e| OpensslKeyError(format!("invalid curve OID: {e}")))?;
    Ok(Element::ObjectIdentifier(oid))
}

// ── M' computation (hash TBS then assemble) ───────────────────────────────────

/// Hash `tbs_der` with the algorithm specified in `spec.hash`, then assemble M'.
pub(crate) fn build_m_prime(
    tbs_der: &[u8],
    spec: &CompositeMlDsaSpec,
) -> Result<Vec<u8>, OpensslKeyError> {
    let tbs_hash = match &spec.hash {
        CompHash::Sha256 => {
            let md = super::alg_cache::sha256()
                .ok_or_else(|| OpensslKeyError("SHA-256 not available".to_string()))?;
            md.digest_to_vec(tbs_der)?
        }
        CompHash::Sha512 => {
            let md = super::alg_cache::sha512()
                .ok_or_else(|| OpensslKeyError("SHA-512 not available".to_string()))?;
            md.digest_to_vec(tbs_der)?
        }
        CompHash::Shake256_64 => {
            // SHAKE256 with 64-byte (512-bit) output via EVP_DigestFinalXOF.
            let md = native_ossl::digest::DigestAlg::fetch(c"SHAKE-256", None)
                .map_err(|e| OpensslKeyError(format!("SHAKE-256 not available: {e}")))?;
            let mut ctx = native_ossl::digest::DigestCtx::new_empty()?;
            ctx.reinit(&md, None)?;
            ctx.update(tbs_der)?;
            let mut out = vec![0u8; 64];
            ctx.finish_xof(&mut out)?;
            out
        }
    };
    Ok(build_m_prime_from_hash(&tbs_hash, spec))
}

// ── Traditional key generation ────────────────────────────────────────────────

/// Generate a traditional component key.  Returns `(trad_sk, trad_pk)` where:
/// - `trad_sk` = content of `privateKey` OCTET STRING from the traditional PKCS#8
/// - `trad_pk` = content of BIT STRING from the traditional SPKI
#[cfg(all(feature = "pqc", ossl_mldsa))]
fn generate_trad_key(trad_alg: &TradAlg) -> Result<(Vec<u8>, Vec<u8>), OpensslKeyError> {
    use native_ossl::params::ParamBuilder;

    match trad_alg {
        TradAlg::RsaPss { bits, .. } | TradAlg::RsaPkcs15 { bits, .. } => {
            let params = ParamBuilder::new()?
                .push_uint(c"bits", *bits)?
                .push_uint(c"e", 65537u32)?
                .build()?;
            let mut kgen = KeygenCtx::new(c"RSA")?;
            kgen.set_params(&params)?;
            let pkey: Pkey<Private> = kgen.generate()?;
            let pkcs8_der = pkey.to_pkcs8_der()?;
            let spki_der = pkey.public_key_to_der()?;
            let trad_sk = pkcs8_private_key_content(&pkcs8_der).map_err(OpensslKeyError)?;
            let trad_pk = extract_spki_bitstring_payload(&spki_der).map_err(OpensslKeyError)?;
            Ok((trad_sk, trad_pk))
        }
        TradAlg::Ec { curve, .. } => {
            let curve_cstr: &std::ffi::CStr = match *curve {
                "P-256" => c"P-256",
                "P-384" => c"P-384",
                "P-521" => c"P-521",
                "brainpoolP256r1" => c"brainpoolP256r1",
                "brainpoolP384r1" => c"brainpoolP384r1",
                other => return Err(OpensslKeyError(format!("unsupported EC curve: {other}"))),
            };
            let params = ParamBuilder::new()?
                .push_utf8_string(c"group", curve_cstr)?
                .build()?;
            let mut kgen = KeygenCtx::new(c"EC")?;
            kgen.set_params(&params)?;
            let pkey: Pkey<Private> = kgen.generate()?;
            let pkcs8_der = pkey.to_pkcs8_der()?;
            let spki_der = pkey.public_key_to_der()?;
            let trad_sk = pkcs8_private_key_content(&pkcs8_der).map_err(OpensslKeyError)?;
            let trad_pk = extract_spki_bitstring_payload(&spki_der).map_err(OpensslKeyError)?;
            Ok((trad_sk, trad_pk))
        }
        TradAlg::Ed25519 => {
            let mut kgen = KeygenCtx::new(c"ED25519")?;
            let pkey: Pkey<Private> = kgen.generate()?;
            let pkcs8_der = pkey.to_pkcs8_der()?;
            let spki_der = pkey.public_key_to_der()?;
            let trad_sk = pkcs8_private_key_content(&pkcs8_der).map_err(OpensslKeyError)?;
            let trad_pk = extract_spki_bitstring_payload(&spki_der).map_err(OpensslKeyError)?;
            Ok((trad_sk, trad_pk))
        }
        TradAlg::Ed448 => {
            let mut kgen = KeygenCtx::new(c"ED448")?;
            let pkey: Pkey<Private> = kgen.generate()?;
            let pkcs8_der = pkey.to_pkcs8_der()?;
            let spki_der = pkey.public_key_to_der()?;
            let trad_sk = pkcs8_private_key_content(&pkcs8_der).map_err(OpensslKeyError)?;
            let trad_pk = extract_spki_bitstring_payload(&spki_der).map_err(OpensslKeyError)?;
            Ok((trad_sk, trad_pk))
        }
    }
}

// ── Composite key generation ──────────────────────────────────────────────────

/// Generate a composite ML-DSA key (OpenSSL backend).
///
/// Returns a [`BackendPrivateKey`] whose PKCS#8 DER encodes both component keys
/// as `mldsa_seed (32 bytes) || trad_sk` in the `privateKey` OCTET STRING, and
/// whose SPKI DER encodes `mldsa_pk || trad_pk` in the `subjectPublicKey` BIT STRING.
#[cfg(all(feature = "pqc", ossl_mldsa))]
pub(crate) fn priv_generate_composite_mldsa(
    sub_arc: u32,
) -> Result<crate::crypto::BackendPrivateKey, OpensslKeyError> {
    let spec = crate::crypto::composite_mldsa::composite_spec(sub_arc)
        .ok_or_else(|| OpensslKeyError(format!("unknown composite ML-DSA sub-arc: {sub_arc}")))?;

    // Generate ML-DSA component.
    let mldsa_name: &std::ffi::CStr = match spec.mldsa_variant {
        "ML-DSA-44" => c"ML-DSA-44",
        "ML-DSA-65" => c"ML-DSA-65",
        "ML-DSA-87" => c"ML-DSA-87",
        other => return Err(OpensslKeyError(format!("unknown ML-DSA variant: {other}"))),
    };
    let mut kgen = KeygenCtx::new(mldsa_name)?;
    let mldsa_pkey: Pkey<Private> = kgen.generate()?;

    // Extract the 32-byte ML-DSA seed via the "seed" OSSL_PARAM.
    let mldsa_seed = {
        let params = mldsa_pkey.export()?;
        params
            .get_octet_string(c"seed")
            .map_err(|e| {
                OpensslKeyError(format!("failed to export {} seed: {e}", spec.mldsa_variant))
            })?
            .to_vec()
    };

    // Extract ML-DSA raw public key from SPKI BIT STRING.
    let mldsa_spki = mldsa_pkey.public_key_to_der()?;
    let mldsa_pk = extract_spki_bitstring_payload(&mldsa_spki).map_err(OpensslKeyError)?;

    // Generate traditional component.
    let (trad_sk, trad_pk) = generate_trad_key(&spec.trad_alg)?;

    // Build composite OID and encoded keys.
    let oid_comps = composite_oid_components(spec.sub_arc);

    let spki_der =
        encode_composite_spki(&oid_comps, &mldsa_pk, &trad_pk).map_err(OpensslKeyError)?;
    let pkcs8_der =
        encode_composite_pkcs8(&oid_comps, &mldsa_seed, &trad_sk).map_err(OpensslKeyError)?;

    // Composite keys have no live Pkey, but we cache the SPKI to avoid
    // re-parsing the composite PKCS#8 (which OpenSSL cannot parse).
    let pkcs8_cell = std::sync::OnceLock::new();
    pkcs8_cell.set(pkcs8_der).expect("fresh OnceLock");
    Ok(crate::crypto::BackendPrivateKey {
        pkcs8_der: pkcs8_cell,
        spki_cache: Some(spki_der),
        pkey: None,
        pkcs11: None,
    })
}

#[cfg(not(all(feature = "pqc", ossl_mldsa)))]
pub(crate) fn priv_generate_composite_mldsa(
    sub_arc: u32,
) -> Result<crate::crypto::BackendPrivateKey, OpensslKeyError> {
    let _ = sub_arc;
    Err(OpensslKeyError(
        "composite ML-DSA key generation requires OpenSSL with ML-DSA support \
         and the 'pqc' feature"
            .to_string(),
    ))
}

// ── Composite signer ──────────────────────────────────────────────────────────

/// OpenSSL-backed signer for composite ML-DSA keys.
#[cfg(all(feature = "pqc", ossl_mldsa))]
pub(crate) struct CompositeMLDsaOpenSSLSigner {
    spec: &'static CompositeMlDsaSpec,
    mldsa_pkey: Pkey<Private>,
    trad_pkey: Pkey<Private>,
}

#[cfg(all(feature = "pqc", ossl_mldsa))]
impl CompositeMLDsaOpenSSLSigner {
    /// Reconstruct component Pkeys from a composite PKCS#8 DER buffer.
    fn from_composite_pkcs8(
        pkcs8_der: &[u8],
        spec: &'static CompositeMlDsaSpec,
    ) -> Result<Self, OpensslKeyError> {
        // Extract composite private key content: mldsa_seed (32) || trad_sk.
        let privkey = pkcs8_private_key_content(pkcs8_der).map_err(OpensslKeyError)?;
        let (mldsa_seed, trad_sk) = split_composite_privkey(&privkey).map_err(OpensslKeyError)?;

        // Reconstruct the ML-DSA Pkey directly from the 32-byte seed via
        // EVP_PKEY_fromdata with the "seed" OSSL_PARAM.  OpenSSL regenerates
        // the full keypair from the seed.
        let mldsa_name: &std::ffi::CStr = match spec.mldsa_variant {
            "ML-DSA-44" => c"ML-DSA-44",
            "ML-DSA-65" => c"ML-DSA-65",
            "ML-DSA-87" => c"ML-DSA-87",
            other => return Err(OpensslKeyError(format!("unknown ML-DSA variant: {other}"))),
        };
        let seed_params = native_ossl::params::ParamBuilder::new()?
            .push_octet_slice(c"seed", mldsa_seed)?
            .build()?;
        let mldsa_pkey = Pkey::<Private>::from_params(None, mldsa_name, &seed_params)?;

        // Reconstruct traditional standalone PKCS#8.
        let trad_pkcs8 = encode_trad_pkcs8(&spec.trad_alg, trad_sk)?;
        let trad_pkey = Pkey::<Private>::from_der(&trad_pkcs8)?;

        Ok(Self {
            spec,
            mldsa_pkey,
            trad_pkey,
        })
    }

    /// Sign M' with the ML-DSA component (with composite label as context string).
    ///
    /// Uses `EVP_PKEY_sign` (via `MessageSigner::sign`) rather than the
    /// streaming `sign_message_update` path, which returns NOT_SUPPORTED for
    /// ML-DSA in OpenSSL 3.5.
    fn sign_mldsa(&self, m_prime: &[u8]) -> Result<Vec<u8>, OpensslKeyError> {
        use native_ossl::pkey::{MessageSigner, SigAlg};

        let alg_name: &std::ffi::CStr = match self.spec.mldsa_variant {
            "ML-DSA-44" => c"ML-DSA-44",
            "ML-DSA-65" => c"ML-DSA-65",
            "ML-DSA-87" => c"ML-DSA-87",
            _ => return Err(OpensslKeyError("unknown ML-DSA variant".to_string())),
        };
        let ctx_params = native_ossl::params::ParamBuilder::new()?
            .push_octet_slice(c"context-string", self.spec.label.as_bytes())?
            .build()?;
        let mut alg = SigAlg::fetch(alg_name, None)?;
        let mut signer = MessageSigner::new(&self.mldsa_pkey, &mut alg, Some(&ctx_params))?;
        let mut sig = vec![0u8; self.spec.mldsa_sig_size];
        let written = signer.sign(m_prime, Some(&mut sig))?;
        sig.truncate(written);
        Ok(sig)
    }

    /// Sign M' with the traditional component.
    fn sign_trad(&self, m_prime: &[u8]) -> Result<Vec<u8>, OpensslKeyError> {
        use native_ossl::params::ParamBuilder;

        match &self.spec.trad_alg {
            TradAlg::RsaPss { hash, .. } => {
                let hash_cstr: &std::ffi::CStr = match *hash {
                    "sha256" => c"SHA2-256",
                    "sha512" => c"SHA2-512",
                    other => return Err(OpensslKeyError(format!("unsupported hash: {other}"))),
                };
                let md = super::alg_cache::digest_by_name(hash_cstr).ok_or_else(|| {
                    OpensslKeyError(format!("digest not available: {hash_cstr:?}"))
                })?;
                let pss_params = ParamBuilder::new()?
                    .push_utf8_string(c"pad-mode", c"pss")?
                    .push_utf8_string(c"mgf1-digest", hash_cstr)?
                    .push_int(c"saltlen", -1i32)? // -1 = digest length (hash-size salt)
                    .build()?;
                let init = SignInit {
                    digest: Some(&md),
                    params: Some(&pss_params),
                };
                let mut signer = Signer::new(&self.trad_pkey, &init)?;
                signer.update(m_prime)?;
                Ok(signer.finish()?)
            }
            TradAlg::RsaPkcs15 { hash, .. } => {
                let hash_cstr: &std::ffi::CStr = match *hash {
                    "sha256" => c"SHA2-256",
                    "sha512" => c"SHA2-512",
                    other => return Err(OpensslKeyError(format!("unsupported hash: {other}"))),
                };
                let md = super::alg_cache::digest_by_name(hash_cstr).ok_or_else(|| {
                    OpensslKeyError(format!("digest not available: {hash_cstr:?}"))
                })?;
                let init = SignInit {
                    digest: Some(&md),
                    params: None,
                };
                let mut signer = Signer::new(&self.trad_pkey, &init)?;
                signer.update(m_prime)?;
                Ok(signer.finish()?)
            }
            TradAlg::Ec { hash, .. } => {
                let hash_cstr: &std::ffi::CStr = match *hash {
                    "sha256" => c"SHA2-256",
                    "sha512" => c"SHA2-512",
                    other => return Err(OpensslKeyError(format!("unsupported hash: {other}"))),
                };
                let md = super::alg_cache::digest_by_name(hash_cstr).ok_or_else(|| {
                    OpensslKeyError(format!("digest not available: {hash_cstr:?}"))
                })?;
                let init = SignInit {
                    digest: Some(&md),
                    params: None,
                };
                let mut signer = Signer::new(&self.trad_pkey, &init)?;
                signer.update(m_prime)?;
                Ok(signer.finish()?)
            }
            TradAlg::Ed25519 | TradAlg::Ed448 => {
                let mut signer = Signer::new(&self.trad_pkey, &SignInit::default())?;
                Ok(signer.sign_oneshot(m_prime)?)
            }
        }
    }
}

/// Build a traditional standalone PKCS#8 DER from the raw private key content.
#[cfg(all(feature = "pqc", ossl_mldsa))]
fn encode_trad_pkcs8(trad_alg: &TradAlg, trad_sk: &[u8]) -> Result<Vec<u8>, OpensslKeyError> {
    use synta::{Element, Null};

    match trad_alg {
        TradAlg::RsaPss { .. } | TradAlg::RsaPkcs15 { .. } => encode_standalone_pkcs8(
            crate::oids::RSA_ENCRYPTION,
            Some(Element::Null(Null)),
            trad_sk,
        ),
        TradAlg::Ec { curve, .. } => {
            let params = ec_alg_params(curve)?;
            encode_standalone_pkcs8(crate::oids::EC_PUBLIC_KEY, Some(params), trad_sk)
        }
        TradAlg::Ed25519 => encode_standalone_pkcs8(crate::oids::ED25519, None, trad_sk),
        TradAlg::Ed448 => encode_standalone_pkcs8(crate::oids::ED448, None, trad_sk),
    }
}

#[cfg(all(feature = "pqc", ossl_mldsa))]
impl ErasedCertificateSigner for CompositeMLDsaOpenSSLSigner {
    fn signature_algorithm_der_erased(&self) -> Result<Vec<u8>, PrivateKeyError> {
        let comps = composite_oid_components(self.spec.sub_arc);
        let oid = synta::ObjectIdentifier::new(&comps)
            .map_err(|e| PrivateKeyError::new(OpensslKeyError(e.to_string())))?;
        let alg = crate::AlgorithmIdentifier {
            algorithm: oid,
            parameters: None,
        };
        alg.to_der()
            .map_err(|e| PrivateKeyError::new(OpensslKeyError(e.to_string())))
    }

    fn sign_tbs_erased(&self, tbs_der: &[u8]) -> Result<Vec<u8>, PrivateKeyError> {
        let m_prime = build_m_prime(tbs_der, self.spec).map_err(PrivateKeyError::new)?;
        let mldsa_sig = self.sign_mldsa(&m_prime).map_err(PrivateKeyError::new)?;
        let trad_sig = self.sign_trad(&m_prime).map_err(PrivateKeyError::new)?;
        let mut sig = Vec::with_capacity(mldsa_sig.len() + trad_sig.len());
        sig.extend_from_slice(&mldsa_sig);
        sig.extend_from_slice(&trad_sig);
        Ok(sig)
    }
}

// ── Factory: signer from raw PKCS#8 bytes ─────────────────────────────────────

/// Construct a boxed [`ErasedCertificateSigner`] for a composite ML-DSA key.
///
/// Called from [`BackendPrivateKey::as_signer`] when the PKCS#8 OID is in the
/// composite ML-DSA arc.
#[cfg(all(feature = "pqc", ossl_mldsa))]
pub(crate) fn composite_mldsa_signer_from_pkcs8(
    pkcs8_der: &[u8],
    spec: &'static CompositeMlDsaSpec,
) -> Box<dyn ErasedCertificateSigner> {
    match CompositeMLDsaOpenSSLSigner::from_composite_pkcs8(pkcs8_der, spec) {
        Ok(signer) => Box::new(signer),
        Err(e) => Box::new(FailedCompositeSigner(format!(
            "composite signer init failed: {e}"
        ))),
    }
}

#[cfg(not(all(feature = "pqc", ossl_mldsa)))]
pub(crate) fn composite_mldsa_signer_from_pkcs8(
    _pkcs8_der: &[u8],
    _spec: &'static CompositeMlDsaSpec,
) -> Box<dyn ErasedCertificateSigner> {
    Box::new(UnsupportedCompositeSigner)
}

/// Reports an initialization error on first use (for debugging).
#[cfg(all(feature = "pqc", ossl_mldsa))]
struct FailedCompositeSigner(String);

#[cfg(all(feature = "pqc", ossl_mldsa))]
impl ErasedCertificateSigner for FailedCompositeSigner {
    fn signature_algorithm_der_erased(&self) -> Result<Vec<u8>, PrivateKeyError> {
        Err(PrivateKeyError::new(OpensslKeyError(self.0.clone())))
    }

    fn sign_tbs_erased(&self, _tbs_der: &[u8]) -> Result<Vec<u8>, PrivateKeyError> {
        Err(PrivateKeyError::new(OpensslKeyError(self.0.clone())))
    }
}

#[cfg(not(all(feature = "pqc", ossl_mldsa)))]
struct UnsupportedCompositeSigner;

#[cfg(not(all(feature = "pqc", ossl_mldsa)))]
impl ErasedCertificateSigner for UnsupportedCompositeSigner {
    fn signature_algorithm_der_erased(&self) -> Result<Vec<u8>, PrivateKeyError> {
        Err(PrivateKeyError::new(OpensslKeyError(
            "composite ML-DSA signing not supported in this build".to_string(),
        )))
    }

    fn sign_tbs_erased(&self, _tbs_der: &[u8]) -> Result<Vec<u8>, PrivateKeyError> {
        Err(PrivateKeyError::new(OpensslKeyError(
            "composite ML-DSA signing not supported in this build".to_string(),
        )))
    }
}

// ── Composite signature verification ─────────────────────────────────────────

/// Verify a composite ML-DSA signature.
///
/// Called from `signature::do_verify_signature` when the signature OID is in
/// the composite ML-DSA arc.
///
/// `issuer_spki_der` is the composite SubjectPublicKeyInfo DER.
/// `signature_bits` is the raw `mldsa_sig || trad_sig` concatenation.
pub(crate) fn verify_composite_mldsa_signature(
    tbs_der: &[u8],
    sub_arc: u32,
    signature_bits: &[u8],
    issuer_spki_der: &[u8],
) -> Result<(), super::signature::OpensslVerifierError> {
    use super::signature::OpensslVerifierError;

    let spec = crate::crypto::composite_mldsa::composite_spec(sub_arc).ok_or_else(|| {
        OpensslVerifierError(format!("unknown composite ML-DSA sub-arc: {sub_arc}"))
    })?;

    // Extract composite SPKI BIT STRING content: mldsa_pk || trad_pk.
    let spki_payload =
        extract_spki_bitstring_payload(issuer_spki_der).map_err(OpensslVerifierError)?;
    let (mldsa_pk, trad_pk) =
        split_composite_spki_content(&spki_payload, spec).map_err(OpensslVerifierError)?;

    // Split signature: mldsa_sig || trad_sig.
    let (mldsa_sig, trad_sig) =
        split_composite_sig(signature_bits, spec).map_err(OpensslVerifierError)?;

    // Reconstruct M' from TBS.
    let m_prime = build_m_prime(tbs_der, spec).map_err(|e| OpensslVerifierError(e.to_string()))?;

    // Reconstruct ML-DSA SPKI and verify.
    let mldsa_oid: &[u32] = match spec.mldsa_variant {
        "ML-DSA-44" => crate::oids::ML_DSA_44,
        "ML-DSA-65" => crate::oids::ML_DSA_65,
        "ML-DSA-87" => crate::oids::ML_DSA_87,
        other => {
            return Err(OpensslVerifierError(format!(
                "unknown ML-DSA variant: {other}"
            )))
        }
    };
    let mldsa_spki = encode_standalone_spki(mldsa_oid, None, mldsa_pk)
        .map_err(|e| OpensslVerifierError(e.to_string()))?;
    let mldsa_result = verify_mldsa_component(&mldsa_spki, &m_prime, mldsa_sig, spec)
        .map_err(|e| OpensslVerifierError(e.to_string()));

    // Reconstruct traditional SPKI and verify.
    // Both components are always checked to avoid a timing oracle that would reveal
    // which component failed.
    let trad_spki = encode_trad_spki(&spec.trad_alg, trad_pk)
        .map_err(|e| OpensslVerifierError(e.to_string()))?;
    let trad_result = verify_trad_component(&trad_spki, &m_prime, trad_sig, &spec.trad_alg)
        .map_err(|e| OpensslVerifierError(e.to_string()));

    mldsa_result.and(trad_result)
}

/// Build a traditional standalone SPKI DER from raw public key bytes.
fn encode_trad_spki(trad_alg: &TradAlg, raw_pk: &[u8]) -> Result<Vec<u8>, OpensslKeyError> {
    use synta::{Element, Null};

    match trad_alg {
        TradAlg::RsaPss { .. } | TradAlg::RsaPkcs15 { .. } => encode_standalone_spki(
            crate::oids::RSA_ENCRYPTION,
            Some(Element::Null(Null)),
            raw_pk,
        ),
        TradAlg::Ec { curve, .. } => {
            let params = ec_alg_params(curve)?;
            encode_standalone_spki(crate::oids::EC_PUBLIC_KEY, Some(params), raw_pk)
        }
        TradAlg::Ed25519 => encode_standalone_spki(crate::oids::ED25519, None, raw_pk),
        TradAlg::Ed448 => encode_standalone_spki(crate::oids::ED448, None, raw_pk),
    }
}

/// Verify the ML-DSA component signature with the composite label as context string.
fn verify_mldsa_component(
    mldsa_spki_der: &[u8],
    m_prime: &[u8],
    mldsa_sig: &[u8],
    spec: &CompositeMlDsaSpec,
) -> Result<(), OpensslKeyError> {
    #[cfg(all(feature = "pqc", ossl_mldsa))]
    {
        use native_ossl::pkey::{MessageVerifier, SigAlg};

        let pkey = Pkey::<Public>::from_der(mldsa_spki_der)?;
        let alg_name: &std::ffi::CStr = match spec.mldsa_variant {
            "ML-DSA-44" => c"ML-DSA-44",
            "ML-DSA-65" => c"ML-DSA-65",
            "ML-DSA-87" => c"ML-DSA-87",
            _ => return Err(OpensslKeyError("unknown ML-DSA variant".to_string())),
        };
        let ctx_params = native_ossl::params::ParamBuilder::new()?
            .push_octet_slice(c"context-string", spec.label.as_bytes())?
            .build()?;
        let mut alg = SigAlg::fetch(alg_name, None)?;
        let mut ver = MessageVerifier::new(&pkey, &mut alg, Some(&ctx_params))?;
        if ver.verify(m_prime, mldsa_sig)? {
            Ok(())
        } else {
            Err(OpensslKeyError(
                "ML-DSA component signature invalid".to_string(),
            ))
        }
    }
    #[cfg(not(all(feature = "pqc", ossl_mldsa)))]
    {
        let _ = (mldsa_spki_der, m_prime, mldsa_sig, spec);
        Err(OpensslKeyError(
            "composite ML-DSA verification requires OpenSSL with ML-DSA support \
             and the 'pqc' feature"
                .to_string(),
        ))
    }
}

/// Verify the traditional component signature.
fn verify_trad_component(
    trad_spki_der: &[u8],
    m_prime: &[u8],
    trad_sig: &[u8],
    trad_alg: &TradAlg,
) -> Result<(), OpensslKeyError> {
    use native_ossl::params::ParamBuilder;

    let pkey = Pkey::<Public>::from_der(trad_spki_der)?;

    match trad_alg {
        TradAlg::RsaPss { hash, .. } => {
            let hash_cstr: &std::ffi::CStr = match *hash {
                "sha256" => c"SHA2-256",
                "sha512" => c"SHA2-512",
                other => return Err(OpensslKeyError(format!("unsupported hash: {other}"))),
            };
            let md = super::alg_cache::digest_by_name(hash_cstr)
                .ok_or_else(|| OpensslKeyError(format!("digest not available: {hash_cstr:?}")))?;
            let pss_params = ParamBuilder::new()?
                .push_utf8_string(c"pad-mode", c"pss")?
                .push_utf8_string(c"mgf1-digest", hash_cstr)?
                .push_int(c"saltlen", -1i32)?
                .build()?;
            let init = SignInit {
                digest: Some(&md),
                params: Some(&pss_params),
            };
            let mut ver = Verifier::new(&pkey, &init)?;
            ver.update(m_prime)?;
            if ver.verify(trad_sig)? {
                Ok(())
            } else {
                Err(OpensslKeyError(
                    "RSA-PSS component signature invalid".to_string(),
                ))
            }
        }
        TradAlg::RsaPkcs15 { hash, .. } => {
            let hash_cstr: &std::ffi::CStr = match *hash {
                "sha256" => c"SHA2-256",
                "sha512" => c"SHA2-512",
                other => return Err(OpensslKeyError(format!("unsupported hash: {other}"))),
            };
            let md = super::alg_cache::digest_by_name(hash_cstr)
                .ok_or_else(|| OpensslKeyError(format!("digest not available: {hash_cstr:?}")))?;
            let init = SignInit {
                digest: Some(&md),
                params: None,
            };
            let mut ver = Verifier::new(&pkey, &init)?;
            ver.update(m_prime)?;
            if ver.verify(trad_sig)? {
                Ok(())
            } else {
                Err(OpensslKeyError(
                    "RSA-PKCS1v15 component signature invalid".to_string(),
                ))
            }
        }
        TradAlg::Ec { hash, .. } => {
            let hash_cstr: &std::ffi::CStr = match *hash {
                "sha256" => c"SHA2-256",
                "sha512" => c"SHA2-512",
                other => return Err(OpensslKeyError(format!("unsupported hash: {other}"))),
            };
            let md = super::alg_cache::digest_by_name(hash_cstr)
                .ok_or_else(|| OpensslKeyError(format!("digest not available: {hash_cstr:?}")))?;
            let init = SignInit {
                digest: Some(&md),
                params: None,
            };
            let mut ver = Verifier::new(&pkey, &init)?;
            ver.update(m_prime)?;
            if ver.verify(trad_sig)? {
                Ok(())
            } else {
                Err(OpensslKeyError(
                    "ECDSA component signature invalid".to_string(),
                ))
            }
        }
        TradAlg::Ed25519 | TradAlg::Ed448 => {
            let mut ver = Verifier::new(&pkey, &SignInit::default())?;
            if ver.verify_oneshot(m_prime, trad_sig)? {
                Ok(())
            } else {
                Err(OpensslKeyError(
                    "EdDSA component signature invalid".to_string(),
                ))
            }
        }
    }
}