diff --git a/0001-patch-revendor-for-openssl.patch b/0001-patch-revendor-for-openssl.patch new file mode 100644 index 0000000..c5f930c --- /dev/null +++ b/0001-patch-revendor-for-openssl.patch @@ -0,0 +1,1100 @@ +diff -Naur sevctl-0.1.0-orig/Cargo.lock sevctl-0.1.0/Cargo.lock +--- sevctl-0.1.0-orig/Cargo.lock 2021-03-30 12:01:39.000000000 -0500 ++++ sevctl-0.1.0/Cargo.lock 2021-08-19 16:03:57.450197447 -0500 +@@ -1,5 +1,7 @@ + # This file is automatically @generated by Cargo. + # It is not intended for manual editing. ++version = 3 ++ + [[package]] + name = "ansi_term" + version = "0.11.0" +@@ -10,18 +12,6 @@ + ] + + [[package]] +-name = "arrayref" +-version = "0.3.6" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" +- +-[[package]] +-name = "arrayvec" +-version = "0.5.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" +- +-[[package]] + name = "atty" + version = "0.2.14" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -40,12 +30,6 @@ + + [[package]] + name = "base64" +-version = "0.12.3" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" +- +-[[package]] +-name = "base64" + version = "0.13.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +@@ -58,26 +42,15 @@ + + [[package]] + name = "bitflags" +-version = "1.2.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +- +-[[package]] +-name = "blake2b_simd" +-version = "0.5.10" ++version = "1.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a" +-dependencies = [ +- "arrayref", +- "arrayvec", +- "constant_time_eq", +-] ++checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + + [[package]] + name = "bumpalo" +-version = "3.4.0" ++version = "3.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820" ++checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631" + + [[package]] + name = "bytes" +@@ -86,10 +59,16 @@ + checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" + + [[package]] ++name = "bytes" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" ++ ++[[package]] + name = "cc" +-version = "1.0.61" ++version = "1.0.69" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ed67cbde08356238e75fc4656be4749481eeffb09e19f320a25237d5221c985d" ++checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2" + + [[package]] + name = "cfg-if" +@@ -131,16 +110,10 @@ + checksum = "0bca1619ff57dd7a56b58a8e25ef4199f123e78e503fe1653410350a1b98ae65" + + [[package]] +-name = "constant_time_eq" +-version = "0.1.5" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +- +-[[package]] + name = "core-foundation" +-version = "0.7.0" ++version = "0.9.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" ++checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62" + dependencies = [ + "core-foundation-sys", + "libc", +@@ -148,35 +121,24 @@ + + [[package]] + name = "core-foundation-sys" +-version = "0.7.0" ++version = "0.8.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" +- +-[[package]] +-name = "crossbeam-utils" +-version = "0.7.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" +-dependencies = [ +- "autocfg", +- "cfg-if 0.1.10", +- "lazy_static", +-] ++checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" + + [[package]] + name = "dirs" +-version = "3.0.1" ++version = "3.0.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "142995ed02755914747cc6ca76fc7e4583cd18578746716d0508ea6ed558b9ff" ++checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" + dependencies = [ + "dirs-sys", + ] + + [[package]] + name = "dirs-sys" +-version = "0.3.5" ++version = "0.3.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a" ++checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780" + dependencies = [ + "libc", + "redox_users", +@@ -185,11 +147,11 @@ + + [[package]] + name = "encoding_rs" +-version = "0.8.24" ++version = "0.8.28" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a51b8cf747471cb9499b6d59e59b0444f4c90eba8968c4e44874e92b5b64ace2" ++checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065" + dependencies = [ +- "cfg-if 0.1.10", ++ "cfg-if 1.0.0", + ] + + [[package]] +@@ -215,9 +177,9 @@ + + [[package]] + name = "form_urlencoded" +-version = "1.0.0" ++version = "1.0.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ece68d15c92e84fa4f19d3780f1294e5ca82a78a6d515f1efaabcc144688be00" ++checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" + dependencies = [ + "matches", + "percent-encoding", +@@ -241,73 +203,71 @@ + + [[package]] + name = "futures-channel" +-version = "0.3.6" ++version = "0.3.16" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a7a4d35f7401e948629c9c3d6638fb9bf94e0b2121e96c3b428cc4e631f3eb74" ++checksum = "74ed2411805f6e4e3d9bc904c95d5d423b89b3b25dc0250aa74729de20629ff9" + dependencies = [ + "futures-core", + ] + + [[package]] + name = "futures-core" +-version = "0.3.6" ++version = "0.3.16" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d674eaa0056896d5ada519900dbf97ead2e46a7b6621e8160d79e2f2e1e2784b" ++checksum = "af51b1b4a7fdff033703db39de8802c673eb91855f2e0d47dcf3bf2c0ef01f99" + + [[package]] + name = "futures-io" +-version = "0.3.6" ++version = "0.3.16" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5fc94b64bb39543b4e432f1790b6bf18e3ee3b74653c5449f63310e9a74b123c" ++checksum = "0b0e06c393068f3a6ef246c75cdca793d6a46347e75286933e5e75fd2fd11582" + + [[package]] + name = "futures-sink" +-version = "0.3.6" ++version = "0.3.16" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0d8764258ed64ebc5d9ed185cf86a95db5cac810269c5d20ececb32e0088abbd" ++checksum = "c0f30aaa67363d119812743aa5f33c201a7a66329f97d1a887022971feea4b53" + + [[package]] + name = "futures-task" +-version = "0.3.6" ++version = "0.3.16" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4dd26820a9f3637f1302da8bceba3ff33adbe53464b54ca24d4e2d4f1db30f94" +-dependencies = [ +- "once_cell", +-] ++checksum = "bbe54a98670017f3be909561f6ad13e810d9a51f3f061b902062ca3da80799f2" + + [[package]] + name = "futures-util" +-version = "0.3.6" ++version = "0.3.16" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8a894a0acddba51a2d49a6f4263b1e64b8c579ece8af50fa86503d52cd1eea34" ++checksum = "67eb846bfd58e44a8481a00049e82c43e0ccb5d61f8dc071057cb19249dd4d78" + dependencies = [ ++ "autocfg", + "futures-core", + "futures-io", + "futures-task", + "memchr", +- "pin-project", ++ "pin-project-lite 0.2.7", + "pin-utils", + "slab", + ] + + [[package]] + name = "getrandom" +-version = "0.1.15" ++version = "0.2.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6" ++checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" + dependencies = [ +- "cfg-if 0.1.10", ++ "cfg-if 1.0.0", + "libc", + "wasi", + ] + + [[package]] + name = "h2" +-version = "0.2.6" ++version = "0.2.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "993f9e0baeed60001cf565546b0d3dbe6a6ad23f2bd31644a133c641eccf6d53" ++checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535" + dependencies = [ +- "bytes", ++ "bytes 0.5.6", + "fnv", + "futures-core", + "futures-sink", +@@ -318,39 +278,40 @@ + "tokio", + "tokio-util", + "tracing", ++ "tracing-futures", + ] + + [[package]] + name = "hashbrown" +-version = "0.9.1" ++version = "0.11.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" ++checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" + + [[package]] + name = "heck" +-version = "0.3.1" ++version = "0.3.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" ++checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" + dependencies = [ + "unicode-segmentation", + ] + + [[package]] + name = "hermit-abi" +-version = "0.1.17" ++version = "0.1.19" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8" ++checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" + dependencies = [ + "libc", + ] + + [[package]] + name = "http" +-version = "0.2.1" ++version = "0.2.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9" ++checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11" + dependencies = [ +- "bytes", ++ "bytes 1.0.1", + "fnv", + "itoa", + ] +@@ -361,15 +322,15 @@ + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" + dependencies = [ +- "bytes", ++ "bytes 0.5.6", + "http", + ] + + [[package]] + name = "httparse" +-version = "1.3.4" ++version = "1.5.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" ++checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503" + + [[package]] + name = "httpdate" +@@ -379,11 +340,11 @@ + + [[package]] + name = "hyper" +-version = "0.13.8" ++version = "0.13.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2f3afcfae8af5ad0576a31e768415edb627824129e8e5a29b8bfccb2f234e835" ++checksum = "8a6f157065790a3ed2f88679250419b5cdd96e714a0d65f7797fd337186e96bb" + dependencies = [ +- "bytes", ++ "bytes 0.5.6", + "futures-channel", + "futures-core", + "futures-util", +@@ -407,7 +368,7 @@ + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed" + dependencies = [ +- "bytes", ++ "bytes 0.5.6", + "hyper", + "native-tls", + "tokio", +@@ -416,9 +377,9 @@ + + [[package]] + name = "idna" +-version = "0.2.0" ++version = "0.2.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" ++checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" + dependencies = [ + "matches", + "unicode-bidi", +@@ -427,9 +388,9 @@ + + [[package]] + name = "indexmap" +-version = "1.6.0" ++version = "1.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "55e2e4c765aa53a0424761bf9f41aa7a6ac1efa87238f59560640e27fca028f2" ++checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" + dependencies = [ + "autocfg", + "hashbrown", +@@ -452,21 +413,21 @@ + + [[package]] + name = "ipnet" +-version = "2.3.0" ++version = "2.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "47be2f14c678be2fdcab04ab1171db51b2762ce6f0a8ee87c8dd4a04ed216135" ++checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9" + + [[package]] + name = "itoa" +-version = "0.4.6" ++version = "0.4.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" ++checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" + + [[package]] + name = "js-sys" +-version = "0.3.45" ++version = "0.3.53" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ca059e81d9486668f12d455a4ea6daa600bd408134cd17e3d3fb5a32d1f016f8" ++checksum = "e4bf49d50e2961077d9c99f4b7997d770a1114f087c3c2e0069b36c13fc2979d" + dependencies = [ + "wasm-bindgen", + ] +@@ -489,30 +450,30 @@ + + [[package]] + name = "libc" +-version = "0.2.79" ++version = "0.2.99" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2448f6066e80e3bfc792e9c98bf705b4b0fc6e8ef5b43e5889aff0eaa9c58743" ++checksum = "a7f823d141fe0a24df1e23b4af4e3c7ba9e5966ec514ea068c93024aa7deb765" + + [[package]] + name = "log" +-version = "0.4.11" ++version = "0.4.14" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" ++checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" + dependencies = [ +- "cfg-if 0.1.10", ++ "cfg-if 1.0.0", + ] + + [[package]] + name = "matches" +-version = "0.1.8" ++version = "0.1.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" ++checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" + + [[package]] + name = "memchr" +-version = "2.3.3" ++version = "2.4.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" ++checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" + + [[package]] + name = "mime" +@@ -532,9 +493,9 @@ + + [[package]] + name = "mio" +-version = "0.6.22" ++version = "0.6.23" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430" ++checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" + dependencies = [ + "cfg-if 0.1.10", + "fuchsia-zircon", +@@ -563,9 +524,9 @@ + + [[package]] + name = "native-tls" +-version = "0.2.4" ++version = "0.2.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2b0d88c06fe90d5ee94048ba40409ef1d9315d86f6f38c2efdaad4fb50c58b2d" ++checksum = "48ba9f7719b5a0f42f338907614285fb5fd70e53858141f69898a1fb7203b24d" + dependencies = [ + "lazy_static", + "libc", +@@ -602,35 +563,35 @@ + + [[package]] + name = "once_cell" +-version = "1.4.1" ++version = "1.8.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "260e51e7efe62b592207e9e13a68e43692a7a279171d6ba57abd208bf23645ad" ++checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" + + [[package]] + name = "openssl" +-version = "0.10.30" ++version = "0.10.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4" ++checksum = "8d9facdb76fec0b73c406f125d44d86fdad818d66fef0531eec9233ca425ff4a" + dependencies = [ + "bitflags", +- "cfg-if 0.1.10", ++ "cfg-if 1.0.0", + "foreign-types", +- "lazy_static", + "libc", ++ "once_cell", + "openssl-sys", + ] + + [[package]] + name = "openssl-probe" +-version = "0.1.2" ++version = "0.1.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" ++checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" + + [[package]] + name = "openssl-sys" +-version = "0.9.58" ++version = "0.9.66" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de" ++checksum = "1996d2d305e561b70d1ee0c53f1542833f4e1ac6ce9a6708b6ff2738ca67dc82" + dependencies = [ + "autocfg", + "cc", +@@ -647,18 +608,18 @@ + + [[package]] + name = "pin-project" +-version = "0.4.27" ++version = "1.0.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2ffbc8e94b38ea3d2d8ba92aea2983b503cd75d0888d75b86bb37970b5698e15" ++checksum = "576bc800220cc65dac09e99e97b08b358cfab6e17078de8dc5fee223bd2d0c08" + dependencies = [ + "pin-project-internal", + ] + + [[package]] + name = "pin-project-internal" +-version = "0.4.27" ++version = "1.0.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895" ++checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389" + dependencies = [ + "proc-macro2", + "quote", +@@ -673,9 +634,9 @@ + + [[package]] + name = "pin-project-lite" +-version = "0.2.6" ++version = "0.2.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905" ++checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" + + [[package]] + name = "pin-utils" +@@ -691,9 +652,9 @@ + + [[package]] + name = "ppv-lite86" +-version = "0.2.9" ++version = "0.2.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c36fa947111f5c62a733b652544dd0016a43ce89619538a8ef92724a6f501a20" ++checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" + + [[package]] + name = "proc-macro-error" +@@ -721,29 +682,28 @@ + + [[package]] + name = "proc-macro2" +-version = "1.0.24" ++version = "1.0.28" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" ++checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612" + dependencies = [ + "unicode-xid", + ] + + [[package]] + name = "quote" +-version = "1.0.7" ++version = "1.0.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" ++checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" + dependencies = [ + "proc-macro2", + ] + + [[package]] + name = "rand" +-version = "0.7.3" ++version = "0.8.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" ++checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" + dependencies = [ +- "getrandom", + "libc", + "rand_chacha", + "rand_core", +@@ -752,9 +712,9 @@ + + [[package]] + name = "rand_chacha" +-version = "0.2.2" ++version = "0.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" ++checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" + dependencies = [ + "ppv-lite86", + "rand_core", +@@ -762,37 +722,39 @@ + + [[package]] + name = "rand_core" +-version = "0.5.1" ++version = "0.6.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" ++checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" + dependencies = [ + "getrandom", + ] + + [[package]] + name = "rand_hc" +-version = "0.2.0" ++version = "0.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" ++checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" + dependencies = [ + "rand_core", + ] + + [[package]] + name = "redox_syscall" +-version = "0.1.57" ++version = "0.2.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" ++checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" ++dependencies = [ ++ "bitflags", ++] + + [[package]] + name = "redox_users" +-version = "0.3.5" ++version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" ++checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" + dependencies = [ + "getrandom", + "redox_syscall", +- "rust-argon2", + ] + + [[package]] +@@ -810,8 +772,8 @@ + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "0718f81a8e14c4dbb3b34cf23dc6aaf9ab8a0dfec160c534b3dbca1aaa21f47c" + dependencies = [ +- "base64 0.13.0", +- "bytes", ++ "base64", ++ "bytes 0.5.6", + "encoding_rs", + "futures-core", + "futures-util", +@@ -827,7 +789,7 @@ + "mime_guess", + "native-tls", + "percent-encoding", +- "pin-project-lite 0.2.6", ++ "pin-project-lite 0.2.7", + "serde", + "serde_urlencoded", + "tokio", +@@ -840,18 +802,6 @@ + ] + + [[package]] +-name = "rust-argon2" +-version = "0.8.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9dab61250775933275e84053ac235621dfb739556d5c54a2f2e9313b7cf43a19" +-dependencies = [ +- "base64 0.12.3", +- "blake2b_simd", +- "constant_time_eq", +- "crossbeam-utils", +-] +- +-[[package]] + name = "ryu" + version = "1.0.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -869,9 +819,9 @@ + + [[package]] + name = "security-framework" +-version = "0.4.4" ++version = "2.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "64808902d7d99f78eaddd2b4e2509713babc3dc3c85ad6f4c447680f3c01e535" ++checksum = "23a2ac85147a3a11d77ecf1bc7166ec0b92febfa4461c37944e180f319ece467" + dependencies = [ + "bitflags", + "core-foundation", +@@ -882,9 +832,9 @@ + + [[package]] + name = "security-framework-sys" +-version = "0.4.3" ++version = "2.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "17bf11d99252f512695eb468de5516e5cf75455521e69dfe343f3b74e4748405" ++checksum = "7e4effb91b4b8b6fb7732e670b6cee160278ff8e6bf485c7805d9e319d76e284" + dependencies = [ + "core-foundation-sys", + "libc", +@@ -892,9 +842,9 @@ + + [[package]] + name = "serde" +-version = "1.0.117" ++version = "1.0.127" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b88fa983de7720629c9387e9f517353ed404164b1e482c970a90c1a4aaf7dc1a" ++checksum = "f03b9878abf6d14e6779d3f24f07b2cfa90352cfec4acc5aab8f1ac7f146fae8" + dependencies = [ + "serde_derive", + ] +@@ -910,9 +860,9 @@ + + [[package]] + name = "serde_derive" +-version = "1.0.117" ++version = "1.0.127" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cbd1ae72adb44aab48f325a02444a5fc079349a8d804c1fc922aed3f7454c74e" ++checksum = "a024926d3432516606328597e0f224a51355a493b49fdd67e9209187cbe55ecc" + dependencies = [ + "proc-macro2", + "quote", +@@ -921,9 +871,9 @@ + + [[package]] + name = "serde_json" +-version = "1.0.59" ++version = "1.0.66" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dcac07dbffa1c65e7f816ab9eba78eb142c6d44410f4eeba1e26e4f5dfa56b95" ++checksum = "336b10da19a12ad094b59d870ebde26a45402e5b470add4b5fd03c5048a32127" + dependencies = [ + "itoa", + "ryu", +@@ -971,9 +921,9 @@ + + [[package]] + name = "slab" +-version = "0.4.2" ++version = "0.4.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" ++checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590" + + [[package]] + name = "socket2" +@@ -994,9 +944,9 @@ + + [[package]] + name = "structopt" +-version = "0.3.21" ++version = "0.3.22" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5277acd7ee46e63e5168a80734c9f6ee81b1367a7d8772a2d765df2a3705d28c" ++checksum = "69b041cdcb67226aca307e6e7be44c8806423d83e018bd662360a93dabce4d71" + dependencies = [ + "clap", + "lazy_static", +@@ -1005,9 +955,9 @@ + + [[package]] + name = "structopt-derive" +-version = "0.4.14" ++version = "0.4.15" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5ba9cdfda491b814720b6b06e0cac513d922fc407582032e8706e9f137976f90" ++checksum = "7813934aecf5f51a54775e00068c237de98489463968231a51746bbbc03f9c10" + dependencies = [ + "heck", + "proc-macro-error", +@@ -1018,9 +968,9 @@ + + [[package]] + name = "syn" +-version = "1.0.45" ++version = "1.0.74" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ea9c5432ff16d6152371f808fb5a871cd67368171b09bb21b43df8e4a47a3556" ++checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c" + dependencies = [ + "proc-macro2", + "quote", +@@ -1029,11 +979,11 @@ + + [[package]] + name = "tempfile" +-version = "3.1.0" ++version = "3.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" ++checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" + dependencies = [ +- "cfg-if 0.1.10", ++ "cfg-if 1.0.0", + "libc", + "rand", + "redox_syscall", +@@ -1052,17 +1002,26 @@ + + [[package]] + name = "tinyvec" +-version = "0.3.4" ++version = "1.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "238ce071d267c5710f9d31451efec16c5ee22de34df17cc05e56cbc92e967117" ++checksum = "848a1e1181b9f6753b5e96a092749e29b11d19ede67dfbbd6c7dc7e0f49b5338" ++dependencies = [ ++ "tinyvec_macros", ++] ++ ++[[package]] ++name = "tinyvec_macros" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" + + [[package]] + name = "tokio" +-version = "0.2.22" ++version = "0.2.25" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5d34ca54d84bf2b5b4d7d31e901a8464f7b60ac145a284fba25ceb801f2ddccd" ++checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092" + dependencies = [ +- "bytes", ++ "bytes 0.5.6", + "fnv", + "futures-core", + "iovec", +@@ -1090,7 +1049,7 @@ + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" + dependencies = [ +- "bytes", ++ "bytes 0.5.6", + "futures-core", + "futures-sink", + "log", +@@ -1100,32 +1059,42 @@ + + [[package]] + name = "tower-service" +-version = "0.3.0" ++version = "0.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860" ++checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" + + [[package]] + name = "tracing" +-version = "0.1.21" ++version = "0.1.26" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b0987850db3733619253fe60e17cb59b82d37c7e6c0236bb81e4d6b87c879f27" ++checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d" + dependencies = [ +- "cfg-if 0.1.10", ++ "cfg-if 1.0.0", + "log", +- "pin-project-lite 0.1.12", ++ "pin-project-lite 0.2.7", + "tracing-core", + ] + + [[package]] + name = "tracing-core" +-version = "0.1.17" ++version = "0.1.19" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f" ++checksum = "2ca517f43f0fb96e0c3072ed5c275fe5eece87e8cb52f4a77b69226d3b1c9df8" + dependencies = [ + "lazy_static", + ] + + [[package]] ++name = "tracing-futures" ++version = "0.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" ++dependencies = [ ++ "pin-project", ++ "tracing", ++] ++ ++[[package]] + name = "try-lock" + version = "0.2.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -1142,27 +1111,24 @@ + + [[package]] + name = "unicode-bidi" +-version = "0.3.4" ++version = "0.3.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" +-dependencies = [ +- "matches", +-] ++checksum = "246f4c42e67e7a4e3c6106ff716a5d067d4132a642840b242e357e468a2a0085" + + [[package]] + name = "unicode-normalization" +-version = "0.1.13" ++version = "0.1.19" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977" ++checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" + dependencies = [ + "tinyvec", + ] + + [[package]] + name = "unicode-segmentation" +-version = "1.6.0" ++version = "1.8.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" ++checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" + + [[package]] + name = "unicode-width" +@@ -1172,15 +1138,15 @@ + + [[package]] + name = "unicode-xid" +-version = "0.2.1" ++version = "0.2.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" ++checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" + + [[package]] + name = "url" +-version = "2.2.0" ++version = "2.2.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5909f2b0817350449ed73e8bcd81c8c3c8d9a7a5d8acba4b27db277f1868976e" ++checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" + dependencies = [ + "form_urlencoded", + "idna", +@@ -1190,9 +1156,9 @@ + + [[package]] + name = "vcpkg" +-version = "0.2.10" ++version = "0.2.15" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c" ++checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + + [[package]] + name = "vec_map" +@@ -1202,9 +1168,9 @@ + + [[package]] + name = "version_check" +-version = "0.9.2" ++version = "0.9.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" ++checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" + + [[package]] + name = "want" +@@ -1218,17 +1184,17 @@ + + [[package]] + name = "wasi" +-version = "0.9.0+wasi-snapshot-preview1" ++version = "0.10.2+wasi-snapshot-preview1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" ++checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" + + [[package]] + name = "wasm-bindgen" +-version = "0.2.68" ++version = "0.2.76" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1ac64ead5ea5f05873d7c12b545865ca2b8d28adfc50a49b84770a3a97265d42" ++checksum = "8ce9b1b516211d33767048e5d47fa2a381ed8b76fc48d2ce4aa39877f9f183e0" + dependencies = [ +- "cfg-if 0.1.10", ++ "cfg-if 1.0.0", + "serde", + "serde_json", + "wasm-bindgen-macro", +@@ -1236,9 +1202,9 @@ + + [[package]] + name = "wasm-bindgen-backend" +-version = "0.2.68" ++version = "0.2.76" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f22b422e2a757c35a73774860af8e112bff612ce6cb604224e8e47641a9e4f68" ++checksum = "cfe8dc78e2326ba5f845f4b5bf548401604fa20b1dd1d365fb73b6c1d6364041" + dependencies = [ + "bumpalo", + "lazy_static", +@@ -1251,11 +1217,11 @@ + + [[package]] + name = "wasm-bindgen-futures" +-version = "0.4.18" ++version = "0.4.26" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b7866cab0aa01de1edf8b5d7936938a7e397ee50ce24119aef3e1eaa3b6171da" ++checksum = "95fded345a6559c2cfee778d562300c581f7d4ff3edb9b0d230d69800d213972" + dependencies = [ +- "cfg-if 0.1.10", ++ "cfg-if 1.0.0", + "js-sys", + "wasm-bindgen", + "web-sys", +@@ -1263,9 +1229,9 @@ + + [[package]] + name = "wasm-bindgen-macro" +-version = "0.2.68" ++version = "0.2.76" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6b13312a745c08c469f0b292dd2fcd6411dba5f7160f593da6ef69b64e407038" ++checksum = "44468aa53335841d9d6b6c023eaab07c0cd4bddbcfdee3e2bb1e8d2cb8069fef" + dependencies = [ + "quote", + "wasm-bindgen-macro-support", +@@ -1273,9 +1239,9 @@ + + [[package]] + name = "wasm-bindgen-macro-support" +-version = "0.2.68" ++version = "0.2.76" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f249f06ef7ee334cc3b8ff031bfc11ec99d00f34d86da7498396dc1e3b1498fe" ++checksum = "0195807922713af1e67dc66132c7328206ed9766af3858164fb583eedc25fbad" + dependencies = [ + "proc-macro2", + "quote", +@@ -1286,15 +1252,15 @@ + + [[package]] + name = "wasm-bindgen-shared" +-version = "0.2.68" ++version = "0.2.76" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1d649a3145108d7d3fbcde896a468d1bd636791823c9921135218ad89be08307" ++checksum = "acdb075a845574a1fa5f09fd77e43f7747599301ea3417a9fbffdeedfc1f4a29" + + [[package]] + name = "web-sys" +-version = "0.3.45" ++version = "0.3.53" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4bf6ef87ad7ae8008e15a355ce696bed26012b7caa21605188cfd8214ab51e2d" ++checksum = "224b2f6b67919060055ef1a67807367c2066ed520c3862cc013d26cf893a783c" + dependencies = [ + "js-sys", + "wasm-bindgen", diff --git a/sevctl.spec b/sevctl.spec index ccaaeb0..afdf162 100644 --- a/sevctl.spec +++ b/sevctl.spec @@ -1,6 +1,6 @@ Name: sevctl Version: 0.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Administrative utility for AMD SEV License: ASL 2.0 @@ -8,6 +8,8 @@ URL: https://github.com/enarx/sevctl Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz Source1: %{name}-%{version}-vendor.tar.gz +Patch0: 0001-patch-revendor-for-openssl.patch + ExclusiveArch: %{rust_arches} BuildRequires: rust-toolset BuildRequires: openssl-devel @@ -18,6 +20,7 @@ BuildRequires: openssl-devel %prep %setup -q -n %{name}-%{version} +%patch0 -p1 %cargo_prep -V 1 @@ -37,5 +40,8 @@ BuildRequires: openssl-devel %changelog +* Thu Aug 19 2021 Connor Kuehl - 0.1.0-2 +- Re-vendor for OpenSSL 3 compatible rust-openssl package + * Wed Apr 14 2021 Connor Kuehl - Initial package diff --git a/sources b/sources index 9e04cd2..5d3381e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (sevctl-0.1.0-vendor.tar.gz) = 9f6e34b3b6130891d05f275a46207ccd9408de35c19e1b207ff8da43dda7ed81adc4c638d1ff43b73807c1c68e8ce617ef6cb5ed165050d82d71d859798f19e3 +SHA512 (sevctl-0.1.0-vendor.tar.gz) = cbd6c317521f53ff4035c282e0d07e5ff3837a86656470099b9ac6af429a7d0e0bb824dd9ce6a51f7846f8c968d55303c1c2c32239eee1aadddc7bac08a09311 SHA512 (sevctl-0.1.0.tar.gz) = 0fe406ae7f7831218b3ed96007af8928a70ce58d8e38dcb44eafe1ba024357f48f2403e9cc4ef62073e7e03154a61fa00e8fa5cf9bccff743da887241ca5849c