synta-certificate 0.3.3

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
//! Composite ML-KEM key generation, encapsulation, and decapsulation for the
//! OpenSSL backend.
//!
//! This whole module makes no sense without ML-KEM support, so it is
//! feature-gated as a unit: `#[cfg(all(feature = "pqc", ossl_mlkem))]` on
//! the `pub mod composite_kem;` declaration in `openssl_backend/mod.rs`,
//! rather than on individual functions within it.  When that condition
//! isn't met, `openssl_backend/mod.rs` defines a fallback API (same
//! signatures, clear "not supported" errors) instead of re-exporting from
//! this module.  Reuses a couple of generic DER helpers from
//! [`super::composite`] (composite ML-DSA's backend module) —
//! `encode_standalone_spki`, `encode_standalone_pkcs8`, `ec_curve_oid_comps`,
//! `ec_alg_params` — which have no ML-DSA-specific behavior.  The
//! traditional component's *private* key does need KEM-specific encoding for
//! EC/X25519/X448 (see [`ec_composite_privkey_der`] /
//! [`trad_privkey_to_composite_sk`]): the composite-KEM draft mandates an
//! exact wire shape for it that neither OpenSSL's default PKCS#8 export nor
//! `composite_mldsa`'s generic helpers produce.  RSA needs no such
//! reshaping — its standard PKCS#8/SPKI content already matches the draft's
//! required `RSAPrivateKey`/`RSAPublicKey` DER exactly.

use super::OpensslKeyError;
use crate::crypto::composite_kem::{
    combiner_input, split_composite_kem_ciphertext, split_composite_kem_privkey,
    split_composite_kem_spki_content, CompositeKemSpec, TradKemAlg,
};
use crate::crypto::composite_mldsa::{extract_spki_bitstring_payload, pkcs8_private_key_content};
use native_ossl::pkey::{DeriveCtx, KeygenCtx, Pkey, Private, Public};
use native_ossl::util::SecretBuf;

/// Map an ML-KEM variant string to the OpenSSL algorithm name.
fn mlkem_name_cstr(variant: &str) -> Result<&'static std::ffi::CStr, OpensslKeyError> {
    match variant {
        "ML-KEM-768" => Ok(c"ML-KEM-768"),
        "ML-KEM-1024" => Ok(c"ML-KEM-1024"),
        other => Err(OpensslKeyError(format!(
            "unsupported ML-KEM variant: {other}"
        ))),
    }
}

/// Map an ML-KEM variant string to its standalone OID.
fn mlkem_oid_for(variant: &str) -> Result<&'static [u32], OpensslKeyError> {
    match variant {
        "ML-KEM-768" => Ok(crate::oids::ML_KEM_768),
        "ML-KEM-1024" => Ok(crate::oids::ML_KEM_1024),
        other => Err(OpensslKeyError(format!(
            "unsupported ML-KEM variant: {other}"
        ))),
    }
}

/// Fixed field width (bytes) of an EC private scalar for the given curve,
/// per SEC1's zero-padded encoding convention.
fn ec_scalar_len(curve: &str) -> Result<usize, OpensslKeyError> {
    match curve {
        "P-256" => Ok(32),
        "P-384" => Ok(48),
        "P-521" => Ok(66),
        "brainpoolP256r1" => Ok(32),
        "brainpoolP384r1" => Ok(48),
        other => Err(OpensslKeyError(format!("unsupported EC curve: {other}"))),
    }
}

/// Build the DER for a composite-shaped `ECPrivateKey` (RFC 5915):
/// `SEQUENCE { version(1), privateKey OCTET STRING, parameters [0] EXPLICIT
/// OBJECT IDENTIFIER }` — no `publicKey` field, matching
/// draft-ietf-lamps-pq-composite-kem §4's ECDH private-key encoding
/// requirement exactly (present curve parameters, absent public key).
/// OpenSSL's own default PKCS#8 export does the opposite for EC keys
/// (omits `parameters`, includes `publicKey`), so this builds the required
/// bytes directly rather than exporting and reshaping OpenSSL's DER.
fn ec_composite_privkey_der(d: &[u8], curve: &str) -> Result<Vec<u8>, OpensslKeyError> {
    use synta::tag::{Tag, TAG_SEQUENCE};
    use synta::types::string::OctetStringRef;
    use synta::{Encoder, Encoding, Integer, ObjectIdentifier};

    let curve_oid_comps = super::composite::ec_curve_oid_comps(curve)?;
    let curve_oid = ObjectIdentifier::new(curve_oid_comps)
        .map_err(|e| OpensslKeyError(format!("invalid curve OID: {e}")))?;
    let d_octet = OctetStringRef::new(d);

    (|| -> synta::Result<Vec<u8>> {
        let mut enc = Encoder::new(Encoding::Der);
        enc.start_constructed_no_guard(Tag::universal_constructed(TAG_SEQUENCE))?;
        enc.encode(&Integer::from_i64(1))?;
        enc.encode(&d_octet)?;
        enc.start_constructed_no_guard(Tag::context_specific_constructed(0))?;
        enc.encode(&curve_oid)?;
        enc.end_constructed()?;
        enc.end_constructed()?;
        enc.finish()
    })()
    .map_err(|e| OpensslKeyError(format!("composite ECPrivateKey DER encoding failed: {e}")))
}

/// Extract the traditional-component private key in the exact wire format
/// required by draft-ietf-lamps-pq-composite-kem §4 for embedding in a
/// composite private key: the standard PKCS#8 private-key content for RSA
/// (no reshaping needed — see module docs), a bare raw scalar for
/// X25519/X448, or a spec-shaped `ECPrivateKey` (see
/// [`ec_composite_privkey_der`]) for ECDH.
///
/// Returned in a [`SecretBuf`] since this is the raw private component.
fn trad_privkey_to_composite_sk(
    trad_alg: &TradKemAlg,
    pkey: &Pkey<Private>,
) -> Result<SecretBuf, OpensslKeyError> {
    match trad_alg {
        TradKemAlg::Rsa { .. } => Ok(SecretBuf::new(
            pkcs8_private_key_content(&pkey.to_pkcs8_der()?).map_err(OpensslKeyError)?,
        )),
        TradKemAlg::X25519 | TradKemAlg::X448 => {
            let exported = pkey.export()?;
            let raw = exported
                .get_octet_string(c"priv")
                .map_err(|e| OpensslKeyError(format!("failed to export priv: {e}")))?;
            Ok(SecretBuf::from_slice(raw))
        }
        TradKemAlg::Ec { curve } => {
            let exported = pkey.export()?;
            let scalar_len = ec_scalar_len(curve)?;
            let raw = SecretBuf::new(
                exported
                    .get_bn(c"priv")
                    .map_err(|e| OpensslKeyError(format!("failed to export EC priv: {e}")))?,
            );
            let raw_bytes = raw.as_ref();
            if raw_bytes.len() > scalar_len {
                return Err(OpensslKeyError(format!(
                    "EC private scalar longer than curve width ({} > {scalar_len})",
                    raw_bytes.len()
                )));
            }
            let mut d = SecretBuf::with_len(scalar_len);
            d.as_mut_slice()[scalar_len - raw_bytes.len()..].copy_from_slice(raw_bytes);
            Ok(SecretBuf::new(ec_composite_privkey_der(d.as_ref(), curve)?))
        }
    }
}

/// Reconstruct a live traditional-KEM private key from the composite wire
/// format produced by [`trad_privkey_to_composite_sk`].
fn trad_privkey_from_composite_sk(
    trad_alg: &TradKemAlg,
    trad_sk: &[u8],
) -> Result<Pkey<Private>, OpensslKeyError> {
    match trad_alg {
        TradKemAlg::Rsa { .. } => {
            use synta::{Element, Null};

            let pkcs8 = super::composite::encode_standalone_pkcs8(
                crate::oids::RSA_ENCRYPTION,
                Some(Element::Null(Null)),
                trad_sk,
            )?;
            Ok(Pkey::<Private>::from_der(&pkcs8)?)
        }
        TradKemAlg::X25519 => {
            use native_ossl::params::ParamBuilder;
            use native_ossl::typed_params::curve25519;

            let params = ParamBuilder::new()?
                .set(curve25519::PRIV_KEY, trad_sk)?
                .build()?;
            Ok(Pkey::<Private>::from_params(None, c"X25519", &params)?)
        }
        TradKemAlg::X448 => {
            use native_ossl::params::ParamBuilder;
            use native_ossl::typed_params::curve25519;

            let params = ParamBuilder::new()?
                .set(curve25519::PRIV_KEY, trad_sk)?
                .build()?;
            Ok(Pkey::<Private>::from_params(None, c"X448", &params)?)
        }
        TradKemAlg::Ec { curve } => {
            // `trad_sk` is already a complete standalone `ECPrivateKey`
            // (RFC 5915) DER blob (see `ec_composite_privkey_der`): version,
            // `privateKey` OCTET STRING, and explicit curve parameters —
            // just missing the optional `publicKey` field. Wrap it in a
            // standard PKCS#8 envelope and let OpenSSL's DER decoder
            // reconstruct the key, the same `Pkey::from_der` path already
            // used above for RSA (and by composite ML-DSA's own EC
            // reconstruction in `composite.rs`).
            //
            // This intentionally avoids `EVP_PKEY_fromdata` with only the
            // private scalar set (e.g. via `EcPrivKeyBuilder`): whether that
            // reliably derives the public point when it's absent has varied
            // across OpenSSL 3.x point releases, while DER-decoding an
            // `ECPrivateKey` missing the optional `publicKey` field has
            // derived it correctly since long before the provider API
            // existed (the field has always been OPTIONAL in the ASN.1).
            let params = super::composite::ec_alg_params(curve)?;
            let pkcs8 = super::composite::encode_standalone_pkcs8(
                crate::oids::EC_PUBLIC_KEY,
                Some(params),
                trad_sk,
            )?;
            Ok(Pkey::<Private>::from_der(&pkcs8)?)
        }
    }
}

/// Build a standalone SPKI DER for the traditional component.
fn encode_trad_kem_spki(trad_alg: &TradKemAlg, raw_pk: &[u8]) -> Result<Vec<u8>, OpensslKeyError> {
    match trad_alg {
        TradKemAlg::Rsa { .. } => {
            use synta::{Element, Null};

            super::composite::encode_standalone_spki(
                crate::oids::RSA_ENCRYPTION,
                Some(Element::Null(Null)),
                raw_pk,
            )
        }
        TradKemAlg::Ec { curve } => {
            let params = super::composite::ec_alg_params(curve)?;
            super::composite::encode_standalone_spki(
                crate::oids::EC_PUBLIC_KEY,
                Some(params),
                raw_pk,
            )
        }
        TradKemAlg::X25519 => {
            super::composite::encode_standalone_spki(crate::oids::X25519, None, raw_pk)
        }
        TradKemAlg::X448 => {
            super::composite::encode_standalone_spki(crate::oids::X448, None, raw_pk)
        }
    }
}

/// SHA3-256 KEM combiner: hash the assembled combiner input.
fn kem_combine_hash(input: &[u8]) -> Result<Vec<u8>, OpensslKeyError> {
    let md = native_ossl::digest::DigestAlg::fetch(c"SHA3-256", None)
        .map_err(|e| OpensslKeyError(format!("SHA3-256 not available: {e}")))?;
    Ok(md.digest_to_vec(input)?)
}

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

/// Generate a live traditional-KEM component keypair (used both for the
/// long-term composite key and for per-encapsulation ephemeral keys of the
/// DH-based algorithms).
fn generate_trad_kem_pkey(trad_alg: &TradKemAlg) -> Result<Pkey<Private>, OpensslKeyError> {
    use native_ossl::params::ParamBuilder;
    use native_ossl::typed_params::{ec, keygen};

    match trad_alg {
        TradKemAlg::Rsa { bits } => {
            let params = ParamBuilder::new()?
                .set(keygen::BITS, bits)?
                .push_uint(c"e", 65537u32)?
                .build()?;
            let mut kgen = KeygenCtx::new(c"RSA")?;
            kgen.set_params(&params)?;
            Ok(kgen.generate()?)
        }
        TradKemAlg::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()?.set(ec::GROUP, curve_cstr)?.build()?;
            let mut kgen = KeygenCtx::new(c"EC")?;
            kgen.set_params(&params)?;
            Ok(kgen.generate()?)
        }
        TradKemAlg::X25519 => {
            let mut kgen = KeygenCtx::new(c"X25519")?;
            Ok(kgen.generate()?)
        }
        TradKemAlg::X448 => {
            let mut kgen = KeygenCtx::new(c"X448")?;
            Ok(kgen.generate()?)
        }
    }
}

/// Generate a long-term traditional-KEM component and export its composite
/// private-key bytes ([`trad_privkey_to_composite_sk`]) / SPKI-BIT-STRING
/// public-key bytes for embedding in a composite private/public key.
/// Returns `(trad_sk, trad_pk)`.
fn generate_trad_kem_key(trad_alg: &TradKemAlg) -> Result<(SecretBuf, Vec<u8>), OpensslKeyError> {
    let pkey = generate_trad_kem_pkey(trad_alg)?;
    let spki_der = pkey.public_key_to_der()?;
    let trad_sk = trad_privkey_to_composite_sk(trad_alg, &pkey)?;
    let trad_pk = extract_spki_bitstring_payload(&spki_der).map_err(OpensslKeyError)?;
    Ok((trad_sk, trad_pk))
}

// ── Traditional component Encaps/Decaps ────────────────────────────────────────

/// Perform the traditional-component half of Encaps.
///
/// DH-based algorithms (`Ec`/`X25519`/`X448`, draft §2.2) generate an
/// ephemeral keypair and DH against the recipient's static public key.
/// RSA-OAEP (draft §2.1) is structurally different — no ephemeral keypair
/// or key agreement: it generates a random 32-byte secret and OAEP-encrypts
/// it directly.  Returns `(trad_ct, trad_ss)`.
fn trad_kem_encapsulate(
    trad_alg: &TradKemAlg,
    trad_pk: &[u8],
) -> Result<(Vec<u8>, SecretBuf), OpensslKeyError> {
    match trad_alg {
        TradKemAlg::Rsa { .. } => {
            let spki = encode_trad_kem_spki(trad_alg, trad_pk)?;
            let pub_pkey = Pkey::<Public>::from_der(&spki)?;
            let mut shared_secret = SecretBuf::with_len(32);
            native_ossl::rand::Rand::fill_private(shared_secret.as_mut_slice())?;
            let ct = super::key_transport::rsa_oaep_encrypt_with_key(
                &pub_pkey,
                shared_secret.as_ref(),
                "sha256",
            )?;
            Ok((ct, shared_secret))
        }
        TradKemAlg::Ec { .. } | TradKemAlg::X25519 | TradKemAlg::X448 => {
            let trad_static_spki = encode_trad_kem_spki(trad_alg, trad_pk)?;
            let trad_static_pkey = Pkey::<Public>::from_der(&trad_static_spki)?;
            let eph_pkey = generate_trad_kem_pkey(trad_alg)?;
            let trad_ct = extract_spki_bitstring_payload(&eph_pkey.public_key_to_der()?)
                .map_err(OpensslKeyError)?;

            let mut derive_ctx = DeriveCtx::new(&eph_pkey)?;
            derive_ctx.set_peer(&trad_static_pkey)?;
            let len = derive_ctx.derive_len()?;
            let mut trad_ss = SecretBuf::with_len(len);
            derive_ctx.derive(trad_ss.as_mut_slice())?;
            Ok((trad_ct, trad_ss))
        }
    }
}

/// Perform the traditional-component half of Decaps against an already
/// reconstructed static private key.  Mirrors [`trad_kem_encapsulate`]'s
/// branching.
fn trad_kem_decapsulate(
    trad_alg: &TradKemAlg,
    trad_pkey: &Pkey<Private>,
    trad_ct: &[u8],
) -> Result<SecretBuf, OpensslKeyError> {
    match trad_alg {
        TradKemAlg::Rsa { .. } => Ok(SecretBuf::new(
            super::key_transport::rsa_oaep_decrypt_with_key(trad_pkey, trad_ct, "sha256")?,
        )),
        TradKemAlg::Ec { .. } | TradKemAlg::X25519 | TradKemAlg::X448 => {
            let eph_spki = encode_trad_kem_spki(trad_alg, trad_ct)?;
            let eph_pkey = Pkey::<Public>::from_der(&eph_spki)?;

            let mut derive_ctx = DeriveCtx::new(trad_pkey)?;
            derive_ctx.set_peer(&eph_pkey)?;
            let len = derive_ctx.derive_len()?;
            let mut trad_ss = SecretBuf::with_len(len);
            derive_ctx.derive(trad_ss.as_mut_slice())?;
            Ok(trad_ss)
        }
    }
}

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

/// Generate a composite ML-KEM key (OpenSSL backend).
///
/// Returns a [`crate::crypto::BackendPrivateKey`] whose PKCS#8 DER encodes
/// both component keys as `mlkem_seed (64 bytes) || trad_sk` in the
/// `privateKey` OCTET STRING, and whose SPKI DER encodes `mlkem_pk || trad_pk`
/// in the `subjectPublicKey` BIT STRING (draft-ietf-lamps-pq-composite-kem §4).
pub(crate) fn priv_generate_composite_kem(
    sub_arc: u32,
) -> Result<crate::crypto::BackendPrivateKey, OpensslKeyError> {
    let spec = crate::crypto::composite_kem::composite_spec(sub_arc)
        .ok_or_else(|| OpensslKeyError(format!("unknown composite ML-KEM sub-arc: {sub_arc}")))?;

    // Generate ML-KEM component; export its 64-byte FIPS 203 seed (d || z).
    let mlkem_name = mlkem_name_cstr(spec.mlkem_variant)?;
    let mut kgen = KeygenCtx::new(mlkem_name)?;
    let mlkem_pkey: Pkey<Private> = kgen.generate()?;
    let mlkem_seed = SecretBuf::new({
        let params = mlkem_pkey.export()?;
        params
            .get_octet_string(c"seed")
            .map_err(|e| {
                OpensslKeyError(format!("failed to export {} seed: {e}", spec.mlkem_variant))
            })?
            .to_vec()
    });
    let mlkem_spki = mlkem_pkey.public_key_to_der()?;
    let mlkem_pk = extract_spki_bitstring_payload(&mlkem_spki).map_err(OpensslKeyError)?;

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

    // Build composite OID and encoded keys.  `composite_oid_components` /
    // `encode_composite_spki` / `encode_composite_pkcs8` live in
    // `composite_mldsa` but are generic byte-concatenation helpers shared
    // across both composite families (same `id-alg` OID arc).
    let oid_comps = crate::crypto::composite_mldsa::composite_oid_components(spec.sub_arc);
    let spki_der =
        crate::crypto::composite_mldsa::encode_composite_spki(&oid_comps, &mlkem_pk, &trad_pk)
            .map_err(OpensslKeyError)?;
    let pkcs8_der = crate::crypto::composite_mldsa::encode_composite_pkcs8(
        &oid_comps,
        mlkem_seed.as_ref(),
        trad_sk.as_ref(),
    )
    .map_err(OpensslKeyError)?;

    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,
    })
}

// ── Composite encapsulation ───────────────────────────────────────────────────

/// Encapsulate against a composite ML-KEM public key (OpenSSL backend).
///
/// `spki_der` is the composite `SubjectPublicKeyInfo` DER; `spec` must match
/// its algorithm OID (callers resolve this via
/// [`crate::crypto::composite_kem::composite_spec_from_oid`] before calling).
/// Returns `(ciphertext, shared_secret)`, where `ciphertext = mlkemCT || tradCT`
/// and `shared_secret` is the 32-byte SHA3-256 combiner output.
pub(crate) fn composite_kem_encapsulate_from_spki(
    spki_der: &[u8],
    spec: &'static CompositeKemSpec,
) -> Result<(Vec<u8>, Vec<u8>), OpensslKeyError> {
    let payload = extract_spki_bitstring_payload(spki_der).map_err(OpensslKeyError)?;
    let (mlkem_pk, trad_pk) =
        split_composite_kem_spki_content(&payload, spec).map_err(OpensslKeyError)?;

    // ML-KEM component: standalone Encaps against the recipient's ML-KEM key.
    let mlkem_oid = mlkem_oid_for(spec.mlkem_variant)?;
    let mlkem_spki = super::composite::encode_standalone_spki(mlkem_oid, None, mlkem_pk)?;
    let (mlkem_ct, mlkem_ss) = super::symmetric::pub_ml_kem_encapsulate(&mlkem_spki)?;
    let mlkem_ss = SecretBuf::new(mlkem_ss);

    // Traditional component: DH-based ephemeral exchange or RSA-OAEP
    // promotion, depending on the algorithm (see `trad_kem_encapsulate`).
    let (trad_ct, trad_ss) = trad_kem_encapsulate(&spec.trad_alg, trad_pk)?;

    let combined = SecretBuf::new(combiner_input(
        mlkem_ss.as_ref(),
        trad_ss.as_ref(),
        &trad_ct,
        trad_pk,
        spec.label,
    ));
    let ss = kem_combine_hash(combined.as_ref())?;

    let mut ct = Vec::with_capacity(mlkem_ct.len() + trad_ct.len());
    ct.extend_from_slice(&mlkem_ct);
    ct.extend_from_slice(&trad_ct);
    Ok((ct, ss))
}

// ── Composite decapsulation ───────────────────────────────────────────────────

/// Decapsulate a composite ML-KEM ciphertext (OpenSSL backend).
///
/// `pkcs8_der` is the composite private key's PKCS#8 DER; `spec` must match
/// its algorithm OID (callers resolve this the same way as for encapsulation).
pub(crate) fn composite_kem_decapsulate_from_pkcs8(
    pkcs8_der: &[u8],
    ciphertext: &[u8],
    spec: &'static CompositeKemSpec,
) -> Result<Vec<u8>, OpensslKeyError> {
    use native_ossl::params::ParamBuilder;
    use native_ossl::typed_params::ml_kem;

    let privkey_content =
        SecretBuf::new(pkcs8_private_key_content(pkcs8_der).map_err(OpensslKeyError)?);
    let (mlkem_seed, trad_sk) =
        split_composite_kem_privkey(privkey_content.as_ref()).map_err(OpensslKeyError)?;
    let (mlkem_ct, trad_ct) =
        split_composite_kem_ciphertext(ciphertext, spec).map_err(OpensslKeyError)?;

    // ML-KEM component: reconstruct the keypair from its 64-byte seed, decapsulate.
    let mlkem_name = mlkem_name_cstr(spec.mlkem_variant)?;
    let seed_params = ParamBuilder::new()?
        .set(ml_kem::SEED, mlkem_seed)?
        .build()?;
    let mlkem_pkey = Pkey::<Private>::from_params(None, mlkem_name, &seed_params)?;
    let mlkem_pkcs8 = mlkem_pkey.to_pkcs8_der()?;
    let mlkem_ss = SecretBuf::new(super::symmetric::priv_ml_kem_decapsulate(
        &mlkem_pkcs8,
        mlkem_ct,
    )?);

    // Traditional component: reconstruct our static keypair, then either
    // RSA-OAEP-decrypt or DH against the ephemeral public key the sender
    // placed in tradCT (see `trad_kem_decapsulate`).
    let trad_pkey = trad_privkey_from_composite_sk(&spec.trad_alg, trad_sk)?;
    let trad_pk =
        extract_spki_bitstring_payload(&trad_pkey.public_key_to_der()?).map_err(OpensslKeyError)?;
    let trad_ss = trad_kem_decapsulate(&spec.trad_alg, &trad_pkey, trad_ct)?;

    let combined = SecretBuf::new(combiner_input(
        mlkem_ss.as_ref(),
        trad_ss.as_ref(),
        trad_ct,
        &trad_pk,
        spec.label,
    ));
    kem_combine_hash(combined.as_ref())
}

#[cfg(test)]
mod tests {
    use super::*;

    /// Composite private-key content (`mlkemSeed(64) || tradSK`) must match
    /// draft-ietf-lamps-pq-composite-kem-18 Appendix A Table 3 exactly for
    /// all non-RSA variants (RSA sizes vary slightly with integer encoding,
    /// which is why the draft marks them with an asterisk in Table 3 and
    /// this test only covers the fixed-size EC/X25519/X448 variants).
    /// Regression test for two bugs where `pkcs8_private_key_content`
    /// (designed for composite ML-DSA's OpenSSL-default key shapes) leaked
    /// a stray RFC 8410 OCTET STRING wrapper for X25519, and OpenSSL's
    /// default `ECPrivateKey` shape (missing curve `parameters`, spurious
    /// `publicKey`) for the ECDH variants — both fixed by
    /// [`trad_privkey_to_composite_sk`].
    #[test]
    fn composite_privkey_size_matches_spec() {
        use crate::crypto::composite_kem::{
            SUB_ARC_MLKEM1024_ECDH_BRAINPOOL_P384R1, SUB_ARC_MLKEM1024_ECDH_P384,
            SUB_ARC_MLKEM1024_ECDH_P521, SUB_ARC_MLKEM1024_X448,
            SUB_ARC_MLKEM768_ECDH_BRAINPOOL_P256R1, SUB_ARC_MLKEM768_ECDH_P256,
            SUB_ARC_MLKEM768_ECDH_P384, SUB_ARC_MLKEM768_X25519,
        };

        for (sub_arc, expected_len) in [
            (SUB_ARC_MLKEM768_X25519, 96usize),
            (SUB_ARC_MLKEM768_ECDH_P256, 115),
            (SUB_ARC_MLKEM768_ECDH_P384, 128),
            (SUB_ARC_MLKEM768_ECDH_BRAINPOOL_P256R1, 116),
            (SUB_ARC_MLKEM1024_ECDH_P384, 128),
            (SUB_ARC_MLKEM1024_ECDH_BRAINPOOL_P384R1, 132),
            (SUB_ARC_MLKEM1024_X448, 120),
            (SUB_ARC_MLKEM1024_ECDH_P521, 146),
        ] {
            let key = priv_generate_composite_kem(sub_arc).expect("keygen");
            let der = key.pkcs8_der.get().expect("pkcs8 cached").clone();
            let content = pkcs8_private_key_content(&der).expect("content");
            assert_eq!(
                content.len(),
                expected_len,
                "sub_arc {sub_arc}: composite private key size doesn't match Appendix A Table 3"
            );
        }
    }
}