fix(s2n-quic-crypto): pin zeroize_derive until fixed (#1681)

aws · Mar 29, 2023 · da7943f · da7943f
1 parent f73aa00
commit da7943f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/.github/interop/required.json b/.github/interop/required.json
@@ -120,9 +120,7 @@
     "picoquic": [
       "client"
     ],
-    "quic-go": [
-      "client"
-    ],
+    "quic-go": [],
     "quiche": [],
     "xquic": []
   },
@@ -379,4 +377,4 @@
     "quiche": [],
     "xquic": []
   }
-}
+}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -768,6 +768,13 @@ jobs:
         with:
           lfs: true
 
+      - uses: actions-rs/toolchain@v1.0.7
+        id: toolchain
+        with:
+          toolchain: stable
+          profile: minimal
+          override: true
+
       - uses: camshaft/install@v1
         with:
           crate: bpf-linker

diff --git a/quic/s2n-quic-crypto/Cargo.toml b/quic/s2n-quic-crypto/Cargo.toml
@@ -21,6 +21,9 @@ ring = { version = "0.16", default-features = false }
 s2n-codec = { version = "=0.4.0", path = "../../common/s2n-codec", default-features = false }
 s2n-quic-core = { version = "=0.18.1", path = "../s2n-quic-core", default-features = false }
 zeroize = { version = "1.5", default-features = false, features = ["zeroize_derive"] }
+# 1.4 broke derive bounds; see https://github.com/RustCrypto/utils/issues/878#issuecomment-1488918669
+# TODO remove this dependency once the issue is resolved
+zeroize_derive = { version = "<1.4" }
 
 [dev-dependencies]
 aes = "0.8"