Skip to content

Commit

Permalink
Merge branch 'main' into cbmc-6
Browse files Browse the repository at this point in the history
  • Loading branch information
tautschnig authored Jun 25, 2024
2 parents d273960 + 82d79c5 commit 728c1f7
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ jobs:
- name: Run cargo-kani tests after moving
run: |
for dir in function multiple-harnesses verbose; do
for dir in supported-lib-types/rlib multiple-harnesses verbose; do
>&2 echo "Running test $dir"
pushd ${{ github.workspace }}/../post-setup-tests/cargo-ui/$dir
cargo kani
Expand Down
30 changes: 15 additions & 15 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ dependencies = [
"heck",
"proc-macro2",
"quote",
"syn 2.0.66",
"syn 2.0.68",
]

[[package]]
Expand Down Expand Up @@ -482,7 +482,7 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
"syn 2.0.66",
"syn 2.0.68",
]

[[package]]
Expand All @@ -498,9 +498,9 @@ dependencies = [

[[package]]
name = "lazy_static"
version = "1.4.0"
version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"

[[package]]
name = "libc"
Expand Down Expand Up @@ -733,9 +733,9 @@ dependencies = [

[[package]]
name = "proc-macro2"
version = "1.0.85"
version = "1.0.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23"
checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
dependencies = [
"unicode-ident",
]
Expand Down Expand Up @@ -924,7 +924,7 @@ checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.66",
"syn 2.0.68",
]

[[package]]
Expand Down Expand Up @@ -1016,9 +1016,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"

[[package]]
name = "strum"
version = "0.26.2"
version = "0.26.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29"
checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"

[[package]]
name = "strum_macros"
Expand All @@ -1030,7 +1030,7 @@ dependencies = [
"proc-macro2",
"quote",
"rustversion",
"syn 2.0.66",
"syn 2.0.68",
]

[[package]]
Expand All @@ -1045,9 +1045,9 @@ dependencies = [

[[package]]
name = "syn"
version = "2.0.66"
version = "2.0.68"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"
checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
dependencies = [
"proc-macro2",
"quote",
Expand Down Expand Up @@ -1083,7 +1083,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.66",
"syn 2.0.68",
]

[[package]]
Expand Down Expand Up @@ -1149,7 +1149,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.66",
"syn 2.0.68",
]

[[package]]
Expand Down Expand Up @@ -1414,5 +1414,5 @@ checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.66",
"syn 2.0.68",
]
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
# SPDX-License-Identifier: Apache-2.0 OR MIT

[toolchain]
channel = "nightly-2024-06-21"
channel = "nightly-2024-06-23"
components = ["llvm-tools", "rustc-dev", "rust-src", "rustfmt"]
2 changes: 1 addition & 1 deletion tests/perf/s2n-quic
Submodule s2n-quic updated 97 files
+2 −0 .clippy.toml
+1 −10 .github/config/cargo-deny.toml
+1 −1 common/s2n-codec/Cargo.toml
+10 −7 dc/s2n-quic-dc/Cargo.toml
+4 −0 dc/s2n-quic-dc/src/datagram.rs
+8 −0 dc/s2n-quic-dc/src/datagram/tunneled.rs
+80 −0 dc/s2n-quic-dc/src/datagram/tunneled/recv.rs
+97 −0 dc/s2n-quic-dc/src/datagram/tunneled/send.rs
+3 −0 dc/s2n-quic-dc/src/lib.rs
+0 −1 dc/s2n-quic-dc/src/packet/control/encoder.rs
+0 −1 dc/s2n-quic-dc/src/packet/datagram/encoder.rs
+0 −47 dc/s2n-quic-dc/src/packet/reset.rs
+0 −68 dc/s2n-quic-dc/src/packet/secret_control/request_additional_generation.rs
+0 −69 dc/s2n-quic-dc/src/packet/secret_control/request_shards.rs
+0 −1 dc/s2n-quic-dc/src/packet/stream/encoder.rs
+7 −35 dc/s2n-quic-dc/src/path.rs
+14 −0 dc/s2n-quic-dc/src/path/secret.rs
+148 −0 dc/s2n-quic-dc/src/path/secret/key.rs
+865 −0 dc/s2n-quic-dc/src/path/secret/map.rs
+254 −0 dc/s2n-quic-dc/src/path/secret/map/test.rs
+340 −0 dc/s2n-quic-dc/src/path/secret/receiver.rs
+352 −0 dc/s2n-quic-dc/src/path/secret/receiver/tests.rs
+289 −0 dc/s2n-quic-dc/src/path/secret/schedule.rs
+89 −0 dc/s2n-quic-dc/src/path/secret/sender.rs
+38 −0 dc/s2n-quic-dc/src/path/secret/stateless_reset.rs
+1 −0 dc/s2n-quic-dc/src/stream.rs
+8 −4 dc/s2n-quic-dc/src/stream/recv.rs
+0 −2 dc/s2n-quic-dc/src/stream/send.rs
+0 −2 dc/s2n-quic-dc/src/stream/send/probes.rs
+7 −6 dc/s2n-quic-dc/src/stream/send/worker.rs
+0 −158 dc/s2n-quic-dc/src/stream/send/worker/checker.rs
+68 −0 dc/s2n-quic-dc/src/stream/server.rs
+111 −0 dc/s2n-quic-dc/src/stream/server/handshake.rs
+2 −2 quic/s2n-quic-core/Cargo.toml
+22 −0 quic/s2n-quic-core/src/connection/error.rs
+2 −2 quic/s2n-quic-core/src/crypto/application/keyset.rs
+3 −20 quic/s2n-quic-core/src/crypto/application/limited.rs
+0 −3 quic/s2n-quic-core/src/crypto/key.rs
+0 −3 quic/s2n-quic-core/src/crypto/one_rtt.rs
+0 −10 quic/s2n-quic-core/src/crypto/tls/null.rs
+4 −5 quic/s2n-quic-core/src/dc.rs
+17 −1 quic/s2n-quic-core/src/dc/testing.rs
+54 −0 quic/s2n-quic-core/src/event/generated.rs
+1 −1 quic/s2n-quic-core/src/inet/macros.rs
+0 −1 quic/s2n-quic-core/src/path/ecn.rs
+1 −1 quic/s2n-quic-core/src/path/mod.rs
+139 −24 quic/s2n-quic-core/src/path/mtu.rs
+46 −8 quic/s2n-quic-core/src/path/mtu/tests.rs
+0 −1 quic/s2n-quic-core/src/probe.rs
+0 −1 quic/s2n-quic-core/src/recovery/bbr/congestion.rs
+3 −5 quic/s2n-quic-core/src/recovery/congestion_controller.rs
+0 −1 quic/s2n-quic-core/src/recovery/pacing.rs
+0 −1 quic/s2n-quic-core/src/recovery/sent_packets.rs
+3 −3 quic/s2n-quic-crypto/Cargo.toml
+0 −8 quic/s2n-quic-crypto/src/cipher_suite.rs
+0 −5 quic/s2n-quic-crypto/src/cipher_suite/negotiated.rs
+0 −13 quic/s2n-quic-crypto/src/cipher_suite/ring.rs
+0 −10 quic/s2n-quic-crypto/src/one_rtt.rs
+27 −0 quic/s2n-quic-events/events/common.rs
+3 −3 quic/s2n-quic-platform/Cargo.toml
+4 −4 quic/s2n-quic-platform/src/io/testing.rs
+6 −6 quic/s2n-quic-platform/src/io/tokio.rs
+3 −3 quic/s2n-quic-platform/src/io/turmoil.rs
+4 −4 quic/s2n-quic-rustls/Cargo.toml
+0 −8 quic/s2n-quic-rustls/src/cipher_suite.rs
+4 −4 quic/s2n-quic-tls-default/Cargo.toml
+4 −4 quic/s2n-quic-tls/Cargo.toml
+0 −2 quic/s2n-quic-tls/src/callback.rs
+3 −3 quic/s2n-quic-transport/Cargo.toml
+1 −1 quic/s2n-quic-transport/src/connection/connection_container/tests.rs
+2 −3 quic/s2n-quic-transport/src/connection/connection_impl.rs
+1 −8 quic/s2n-quic-transport/src/connection/connection_trait.rs
+7 −1 quic/s2n-quic-transport/src/endpoint/config.rs
+28 −9 quic/s2n-quic-transport/src/endpoint/initial.rs
+42 −22 quic/s2n-quic-transport/src/endpoint/mod.rs
+12 −23 quic/s2n-quic-transport/src/path/manager.rs
+1 −1 quic/s2n-quic-transport/src/path/manager/fuzz_target.rs
+16 −15 quic/s2n-quic-transport/src/path/manager/tests.rs
+0 −6 quic/s2n-quic-transport/src/path/mod.rs
+0 −4 quic/s2n-quic-transport/src/recovery/manager.rs
+3 −1 quic/s2n-quic-transport/src/recovery/manager/tests.rs
+3 −35 quic/s2n-quic-transport/src/space/application.rs
+0 −1 quic/s2n-quic-transport/src/space/handshake.rs
+0 −1 quic/s2n-quic-transport/src/space/initial.rs
+0 −5 quic/s2n-quic-transport/src/space/mod.rs
+8 −5 quic/s2n-quic-transport/src/space/session_context.rs
+0 −1 quic/s2n-quic-transport/src/transmission/application.rs
+10 −10 quic/s2n-quic/Cargo.toml
+40 −0 quic/s2n-quic/src/client/builder.rs
+15 −0 quic/s2n-quic/src/client/providers.rs
+1 −0 quic/s2n-quic/src/provider.rs
+28 −0 quic/s2n-quic/src/provider/mtu.rs
+40 −0 quic/s2n-quic/src/server/builder.rs
+15 −0 quic/s2n-quic/src/server/providers.rs
+89 −9 quic/s2n-quic/src/tests/mtu.rs
+0 −4 specs/todos/tls/4.6.2.toml
+3 −3 tools/xdp/s2n-quic-xdp/Cargo.toml

0 comments on commit 728c1f7

Please sign in to comment.