more CI fixes

Signed-off-by: Mike Lodder <redmike7@gmail.com>

Author: mikelodder7

hqc-kem/src/lib.rs

@@ -36,21 +36,31 @@
 //! - `alloc`: Enables PKCS#8 encoding (requires `alloc`)
 //! - `serde`: Serde serialization support
 
+#[cfg(any(feature = "kgen", feature = "ecap", feature = "dcap"))]
 mod code;
 mod error;
+#[cfg(any(feature = "kgen", feature = "ecap", feature = "dcap"))]
 mod fft;
+#[cfg(any(feature = "kgen", feature = "ecap", feature = "dcap"))]
 mod gf256;
+#[cfg(any(feature = "kgen", feature = "ecap", feature = "dcap"))]
 mod kem;
 #[cfg(feature = "kem")]
 mod kem_impl;
 mod params;
 #[cfg(feature = "pkcs8")]
 mod pkcs8_impl;
+#[cfg(any(feature = "kgen", feature = "ecap", feature = "dcap"))]
 mod pke;
+#[cfg(any(feature = "kgen", feature = "ecap", feature = "dcap"))]
 mod poly;
+#[cfg(any(feature = "kgen", feature = "ecap", feature = "dcap"))]
 mod reed_muller;
+#[cfg(any(feature = "kgen", feature = "ecap", feature = "dcap"))]
 mod reed_solomon;
+#[cfg(any(feature = "kgen", feature = "ecap", feature = "dcap"))]
 mod sampling;
+#[cfg(any(feature = "kgen", feature = "ecap", feature = "dcap"))]
 mod shake;
 #[cfg(feature = "kem")]
 mod sizes;

hqc-kem/src/params.rs

@@ -1,12 +1,20 @@
 //! HQC parameter definitions for all security levels.
 
 /// Seed size in bytes.
+#[cfg(any(
+    feature = "kgen",
+    feature = "ecap",
+    feature = "dcap",
+    feature = "pkcs8",
+    feature = "kem"
+))]
 pub(crate) const SEED_BYTES: usize = 32;
 /// Salt size in bytes.
 pub(crate) const SALT_BYTES: usize = 16;
 /// Shared secret size in bytes.
 pub(crate) const SS_BYTES: usize = 32;
 /// GF(2^M) parameter M.
+#[cfg(any(feature = "kgen", feature = "ecap", feature = "dcap"))]
 pub(crate) const PARAM_M: usize = 8;
 
 /// Internal runtime parameter set.
@@ -147,7 +155,9 @@ pub(crate) const HQC_256: HqcParameters = HqcParameters {
 };
 
 // Maximum sizes for stack-allocated arrays.
+#[cfg(any(feature = "kgen", feature = "ecap", feature = "dcap"))]
 pub(crate) const MAX_N1: usize = 90;
+#[cfg(any(feature = "kgen", feature = "ecap", feature = "dcap"))]
 pub(crate) const MAX_DELTA: usize = 29;
 
 mod sealed {

hqc-kem/src/types.rs

@@ -66,36 +66,64 @@ macro_rules! basic_bytes {
 /// HQC encapsulation key (public key).
 #[derive(Clone)]
 pub struct EncapsulationKey<P: HqcParams> {
-    bytes: Vec<u8>,
-    _marker: PhantomData<P>,
+    pub(crate) bytes: Vec<u8>,
+    pub(crate) _marker: PhantomData<P>,
 }
 
 /// HQC decapsulation key (secret key).
 #[derive(Clone)]
 pub struct DecapsulationKey<P: HqcParams> {
-    bytes: Vec<u8>,
-    ek: EncapsulationKey<P>,
-    _marker: PhantomData<P>,
+    pub(crate) bytes: Vec<u8>,
+    pub(crate) ek: EncapsulationKey<P>,
+    pub(crate) _marker: PhantomData<P>,
 }
 
 /// HQC ciphertext.
 #[derive(Clone)]
 pub struct Ciphertext<P: HqcParams> {
-    bytes: Vec<u8>,
-    _marker: PhantomData<P>,
+    pub(crate) bytes: Vec<u8>,
+    pub(crate) _marker: PhantomData<P>,
 }
 
 /// HQC shared secret.
 #[derive(Clone)]
 pub struct SharedSecret<P: HqcParams> {
-    bytes: Vec<u8>,
-    _marker: PhantomData<P>,
+    pub(crate) bytes: Vec<u8>,
+    pub(crate) _marker: PhantomData<P>,
 }
 
 from_bytes!(EncapsulationKey, P::PK_BYTES, InvalidPublicKeySize);
 from_bytes!(Ciphertext, P::CT_BYTES, InvalidCiphertextSize);
 from_bytes!(SharedSecret, P::SS_BYTES, InvalidSharedSecretSize);
 
+// ---------------------------------------------------------------------------
+// Internal constructors (crate-only)
+// ---------------------------------------------------------------------------
+
+#[cfg(any(feature = "kem", feature = "pkcs8"))]
+impl<P: HqcParams> EncapsulationKey<P> {
+    pub(crate) fn from_vec(bytes: Vec<u8>) -> Self {
+        debug_assert_eq!(bytes.len(), P::PK_BYTES);
+        Self {
+            bytes,
+            _marker: PhantomData,
+        }
+    }
+}
+
+#[cfg(any(feature = "kem", feature = "pkcs8"))]
+impl<P: HqcParams> DecapsulationKey<P> {
+    pub(crate) fn from_vec(bytes: Vec<u8>) -> Self {
+        debug_assert_eq!(bytes.len(), P::SK_BYTES);
+        let ek = EncapsulationKey::from_vec(bytes[..P::PK_BYTES].to_vec());
+        Self {
+            bytes,
+            ek,
+            _marker: PhantomData,
+        }
+    }
+}
+
 /// HQC Key Encapsulation Mechanism parameterized by security level.
 ///
 /// Zero-sized marker type providing [`generate_key`](HqcKem::generate_key).
@@ -360,7 +388,7 @@ mod serde_impl {
     use super::*;
 
     macro_rules! ser_impl {
-        ($name:ident, ) => {
+        ($name:ident) => {
             impl<P: HqcParams> serde::Serialize for $name<P> {
                 fn serialize<S: serde::Serializer>(&self, s: S) -> Result<S::Ok, S::Error> {
                     serdect::slice::serialize_hex_lower_or_bin(&self.bytes, s)