Merge branch 'main' into fix-1963

mozilla · Jan 7, 2025 · 24d13cc · 24d13cc
2 parents 3bac778 + 5c36c79
commit 24d13cc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
@@ -133,7 +133,7 @@ jobs:
           # Flags to pass to neqo when it runs against another implementation.
           declare -A neqo_flags=(
             ["neqo"]=""
-            ["msquic"]="-o -a hq-interop"
+            ["msquic"]="-a hq-interop"
             ["gquiche"]=""
           )
 

diff --git a/neqo-common/src/codec.rs b/neqo-common/src/codec.rs
@@ -120,9 +120,9 @@ impl<'a> Decoder<'a> {
         let b1 = self.decode_n(1)?;
         match b1 >> 6 {
             0 => Some(b1),
-            1 => Some((b1 & 0x3f) << 8 | self.decode_n(1)?),
-            2 => Some((b1 & 0x3f) << 24 | self.decode_n(3)?),
-            3 => Some((b1 & 0x3f) << 56 | self.decode_n(7)?),
+            1 => Some(((b1 & 0x3f) << 8) | self.decode_n(1)?),
+            2 => Some(((b1 & 0x3f) << 24) | self.decode_n(3)?),
+            3 => Some(((b1 & 0x3f) << 56) | self.decode_n(7)?),
             _ => unreachable!(),
         }
     }

diff --git a/neqo-transport/src/packet/mod.rs b/neqo-transport/src/packet/mod.rs
@@ -202,7 +202,8 @@ impl PacketBuilder {
                 + scid.as_ref().map_or(0, |d| d.as_ref().len())
                 < limit - encoder.len()
         {
-            encoder.encode_byte(PACKET_BIT_LONG | PACKET_BIT_FIXED_QUIC | pt.to_byte(version) << 4);
+            encoder
+                .encode_byte(PACKET_BIT_LONG | PACKET_BIT_FIXED_QUIC | (pt.to_byte(version) << 4));
             encoder.encode_uint(4, version.wire_version());
             encoder.encode_vec(1, dcid.take().as_ref().map_or(&[], AsRef::as_ref));
             encoder.encode_vec(1, scid.take().as_ref().map_or(&[], AsRef::as_ref));