From 6423ddeadf7099a1d450a5d99295d275e3f85a53 Mon Sep 17 00:00:00 2001
From: UneBaguette <28904802+UneBaguette@users.noreply.github.com>
Date: Tue, 30 Jun 2026 18:19:45 +0200
Subject: [PATCH] chore: migrate Envelope impl serialize function back to
 concat_ext and fixed Cargo.toml invalid inline table

---
 Cargo.toml      |  9 +++------
 src/envelope.rs | 13 +++----------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 89b9518..9a34bfe 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -68,12 +68,9 @@ serde = { version = "1", default-features = false, features = [
     "derive",
 ], optional = true }
 subtle = { version = "2.6", default-features = false }
-voprf = {
-    package = "voprf-vx",
-    version = "1.0.0-pre.0",
-    default-features = false,
-    features = ["danger"]
-}
+voprf = { package = "voprf-vx", version = "1.0.0-pre.0", default-features = false, features = [
+    "danger",
+] }
 zeroize = { version = "1.9", features = ["zeroize_derive"] }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
diff --git a/src/envelope.rs b/src/envelope.rs
index bed8d87..6bf168f 100644
--- a/src/envelope.rs
+++ b/src/envelope.rs
@@ -24,7 +24,7 @@ use crate::key_exchange::SerializedIdentifiers;
 use crate::key_exchange::group::Group;
 use crate::keypair::{KeyPair, PrivateKey, PublicKey};
 use crate::opaque::Identifiers;
-use crate::serialization::{SliceExt, UpdateExt};
+use crate::serialization::{GenericArrayExt, SliceExt, UpdateExt};
 
 // Constant string used as salt for HKDF computation
 const STR_AUTH_KEY: [u8; 7] = *b"AuthKey";
@@ -260,16 +260,9 @@ impl<CS: CipherSuite> Envelope<CS> {
         OutputSize::<OprfHash<CS>>::USIZE + NonceLen::USIZE
     }
 
-    // TODO: check if ok
     pub(crate) fn serialize(&self) -> GenericArray<u8, EnvelopeLen<CS>> {
-        use generic_array::typenum::Unsigned;
-
-        let mut buf = GenericArray::<u8, EnvelopeLen<CS>>::default();
-
-        buf[..NonceLen::USIZE].copy_from_slice(&self.nonce);
-        buf[NonceLen::USIZE..].copy_from_slice(&self.hmac);
-
-        buf
+        self.nonce
+            .concat_ext(&GenericArray::from_ha0_4(self.hmac.clone()))
     }
 
     pub(crate) fn deserialize_take(bytes: &mut &[u8]) -> Result<Self, ProtocolError> {