Skip to content

Commit

Permalink
Vend warp w/ patch for TLS w/ cert + key in same pem
Browse files Browse the repository at this point in the history
Summary:
Broken by:
D68332922 [rust] Update warp package 0.3.0 -> 0.3.7

In the old code the builder roughly did: "give me the pkcs8 private key" nope, give me the "rsa private key" ok/nope ...

In the 3.7 code it checks that _all_ of the entries in the pem file are keys before using the last entry.

filed an issue w/ the maintainer: seanmonstar/warp#1113 sent them a PR and this diff vends it back to us

NOTE: looks like I picked up master with this which also includes some dependency bumps but no warp code changes.

Reviewed By: neagan

Differential Revision: D68513414

fbshipit-source-id: 9667a2afa5fb9fdeb43a1f7b6b106c103d71d1d5
  • Loading branch information
Jeff Thomas authored and facebook-github-bot committed Jan 22, 2025
1 parent 1413f14 commit 492c8ee
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions eden/fs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ pyo3-build-config = { package = "pyo3-build-config", version = "0.21.2", git = "
quickcheck = { git = "https://github.com/jakoschiko/quickcheck", rev = "6ecdf5bb4b0132ce66670b4d46453aa022ea892c" }
uefisettings = { git = "https://github.com/linuxboot/uefisettings", rev = "f16daed1d2bd1216204fd24e876c6477d03aebb3" }
uefisettings_backend_thrift = { git = "https://github.com/linuxboot/uefisettings", rev = "f16daed1d2bd1216204fd24e876c6477d03aebb3" }
warp = { git = "https://github.com/jdthomas/warp.git", rev = "c794232d182abaa3add8184e7d661e084cc516c5", features = ["tls"] }

[patch."https://github.com/rust-vmm/vfio"]
vfio-bindings = "0.3.1"
Expand Down
1 change: 1 addition & 0 deletions eden/mononoke/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ pyo3-build-config = { package = "pyo3-build-config", version = "0.21.2", git = "
quickcheck = { git = "https://github.com/jakoschiko/quickcheck", rev = "6ecdf5bb4b0132ce66670b4d46453aa022ea892c" }
uefisettings = { git = "https://github.com/linuxboot/uefisettings", rev = "f16daed1d2bd1216204fd24e876c6477d03aebb3" }
uefisettings_backend_thrift = { git = "https://github.com/linuxboot/uefisettings", rev = "f16daed1d2bd1216204fd24e876c6477d03aebb3" }
warp = { git = "https://github.com/jdthomas/warp.git", rev = "c794232d182abaa3add8184e7d661e084cc516c5", features = ["tls"] }

[patch."https://github.com/rust-vmm/vfio"]
vfio-bindings = "0.3.1"
Expand Down

0 comments on commit 492c8ee

Please sign in to comment.