diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4f155f96acab..9d64ba405913 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -498,28 +498,6 @@ jobs: env: GH_TOKEN: ${{ github.token }} - # Build and test the wasi-crypto module. - test_wasi_crypto: - needs: determine - if: needs.determine.outputs.run-full - name: Test wasi-crypto module - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - with: - submodules: true - - run: rustup update stable && rustup default stable - - run: rustup target add wasm32-wasi - - run: ./ci/run-wasi-crypto-example.sh - env: - RUST_BACKTRACE: 1 - - # common logic to cancel the entire run if this job fails - - run: gh run cancel ${{ github.run_id }} - if: failure() && github.event_name != 'pull_request' - env: - GH_TOKEN: ${{ github.token }} - build-preview1-component-adapter: name: Build wasi-preview1-component-adapter needs: determine @@ -768,7 +746,6 @@ jobs: - checks_winarm64 - fuzz_targets - test_wasi_nn - - test_wasi_crypto - bench - meta_deterministic_check - verify-publish diff --git a/.gitmodules b/.gitmodules index 70ad96ad7fa3..80d7961bfecb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,9 +10,6 @@ [submodule "crates/wasi-nn/spec"] path = crates/wasi-nn/spec url = https://github.com/WebAssembly/wasi-nn -[submodule "crates/wasi-crypto/spec"] - path = crates/wasi-crypto/spec - url = https://github.com/WebAssembly/wasi-crypto.git [submodule "tests/wasi_testsuite/wasi-threads"] path = tests/wasi_testsuite/wasi-threads url = https://github.com/WebAssembly/wasi-threads diff --git a/Cargo.lock b/Cargo.lock index eaf5bcf26a61..a211324257ef 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -17,41 +17,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -[[package]] -name = "aead" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" -dependencies = [ - "generic-array", -] - -[[package]] -name = "aes" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" -dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", - "opaque-debug", -] - -[[package]] -name = "aes-gcm" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df5f85a83a7d8b0442b6aa7b504b8212c1733da07b98aae43d4bc21b2cb3cdf6" -dependencies = [ - "aead", - "aes", - "cipher", - "ctr", - "ghash", - "subtle", -] - [[package]] name = "ahash" version = "0.8.2" @@ -170,15 +135,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "autocfg" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" -dependencies = [ - "autocfg 1.1.0", -] - [[package]] name = "autocfg" version = "1.1.0" @@ -206,12 +162,6 @@ version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" -[[package]] -name = "base64ct" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6b4d9b1225d28d360ec6a231d65af1fd99a2a095154c8040689617290569c5c" - [[package]] name = "bincode" version = "1.3.3" @@ -248,15 +198,6 @@ version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array", -] - [[package]] name = "block-buffer" version = "0.10.2" @@ -344,7 +285,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "577de6cff7c2a47d6b13efe5dd28bf116bd7f8f7db164ea95b7cc2640711f522" dependencies = [ "ambient-authority", - "rand 0.8.5", + "rand", ] [[package]] @@ -366,7 +307,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b9e3348a3510c4619b4c7a7bcdef09a71221da18f266bda3ed6b9aea2c509e2" dependencies = [ "cap-std", - "rand 0.8.5", + "rand", "rustix 0.38.4", "uuid", ] @@ -447,31 +388,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "chacha20" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01b72a433d0cf2aef113ba70f62634c56fddb0f244e6377185c56a7cadbd8f91" -dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", - "zeroize", -] - -[[package]] -name = "chacha20poly1305" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b84ed6d1d5f7aa9bdde921a5090e0ca4d934d250ea3b402a5fab3a994e28a2a" -dependencies = [ - "aead", - "chacha20", - "cipher", - "poly1305", - "zeroize", -] - [[package]] name = "ciborium" version = "0.2.0" @@ -499,15 +415,6 @@ dependencies = [ "half", ] -[[package]] -name = "cipher" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" -dependencies = [ - "generic-array", -] - [[package]] name = "clap" version = "4.3.12" @@ -570,7 +477,7 @@ name = "command-tests" version = "0.0.0" dependencies = [ "anyhow", - "getrandom 0.2.9", + "getrandom", "wit-bindgen", ] @@ -627,12 +534,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "const-oid" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6f2aa4d0537bcc1c74df8755072bd31c1ef1a3a1b85a68e8404a8c353b7b8b" - [[package]] name = "cpp_demangle" version = "0.3.5" @@ -686,7 +587,7 @@ dependencies = [ "log", "regalloc2", "serde", - "sha2 0.10.2", + "sha2", "similar", "smallvec", "souper-ir", @@ -997,7 +898,7 @@ version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ - "autocfg 1.1.0", + "autocfg", "cfg-if", "crossbeam-utils", "memoffset", @@ -1014,18 +915,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "crypto-bigint" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f83bd3bb4314701c568e340cd8cf78c975aa0ca79e03d3f6d1677d5b0c9c0c03" -dependencies = [ - "generic-array", - "rand_core 0.6.3", - "subtle", - "zeroize", -] - [[package]] name = "crypto-common" version = "0.1.6" @@ -1036,44 +925,12 @@ dependencies = [ "typenum", ] -[[package]] -name = "crypto-mac" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" -dependencies = [ - "generic-array", - "subtle", -] - -[[package]] -name = "ctr" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" -dependencies = [ - "cipher", -] - [[package]] name = "cty" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" -[[package]] -name = "curve25519-dalek" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" -dependencies = [ - "byteorder", - "digest 0.9.0", - "rand_core 0.5.1", - "subtle", - "zeroize", -] - [[package]] name = "debugid" version = "0.8.0" @@ -1083,27 +940,6 @@ dependencies = [ "uuid", ] -[[package]] -name = "der" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79b71cca7d95d7681a4b3b9cdf63c8dbc3730d0584c2c74e31416d64a90493f4" -dependencies = [ - "const-oid", - "crypto-bigint", -] - -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.92", -] - [[package]] name = "derive_arbitrary" version = "1.3.1" @@ -1115,22 +951,13 @@ dependencies = [ "syn 2.0.25", ] -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array", -] - [[package]] name = "digest" version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" dependencies = [ - "block-buffer 0.10.2", + "block-buffer", "crypto-common", ] @@ -1171,47 +998,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" -[[package]] -name = "dunce" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453440c271cf5577fd2a40e4942540cb7d0d2f85e27c8d07dd0023c925a67541" - -[[package]] -name = "ecdsa" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43ee23aa5b4f68c7a092b5c3beb25f50c406adc75e2363634f242f28ab255372" -dependencies = [ - "der", - "elliptic-curve", - "hmac", - "signature", -] - -[[package]] -name = "ed25519" -version = "1.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" -dependencies = [ - "signature", -] - -[[package]] -name = "ed25519-dalek" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" -dependencies = [ - "curve25519-dalek", - "ed25519", - "rand 0.7.3", - "serde", - "sha2 0.9.9", - "zeroize", -] - [[package]] name = "egg" version = "0.6.0" @@ -1232,22 +1018,6 @@ version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" -[[package]] -name = "elliptic-curve" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beca177dcb8eb540133e7680baff45e7cc4d93bf22002676cec549f82343721b" -dependencies = [ - "crypto-bigint", - "ff", - "generic-array", - "group", - "pkcs8", - "rand_core 0.6.3", - "subtle", - "zeroize", -] - [[package]] name = "encode_unicode" version = "0.3.6" @@ -1354,16 +1124,6 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "ff" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f40b2dcd8bc322217a5f6559ae5f9e9d1de202a2ecee2e9eafcbece7562a4f" -dependencies = [ - "rand_core 0.6.3", - "subtle", -] - [[package]] name = "file-per-thread-logger" version = "0.2.0" @@ -1531,17 +1291,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - [[package]] name = "getrandom" version = "0.2.9" @@ -1550,17 +1299,7 @@ checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" dependencies = [ "cfg-if", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", -] - -[[package]] -name = "ghash" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99" -dependencies = [ - "opaque-debug", - "polyval", + "wasi", ] [[package]] @@ -1580,17 +1319,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" -[[package]] -name = "group" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c363a5301b8f153d80747126a04b3c82073b9fe3130571a9d170cacdeaf7912" -dependencies = [ - "ff", - "rand_core 0.6.3", - "subtle", -] - [[package]] name = "h2" version = "0.3.19" @@ -1670,26 +1398,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "856b5cb0902c2b6d65d5fd97dfa30f9b70c7538e770b98eab5ed52d8db923e01" -[[package]] -name = "hkdf" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01706d578d5c281058480e673ae4086a9f4710d8df1ad80a5b03e39ece5f886b" -dependencies = [ - "digest 0.9.0", - "hmac", -] - -[[package]] -name = "hmac" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" -dependencies = [ - "crypto-mac", - "digest 0.9.0", -] - [[package]] name = "http" version = "0.2.9" @@ -1795,7 +1503,7 @@ version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" dependencies = [ - "autocfg 1.1.0", + "autocfg", "hashbrown 0.12.3", ] @@ -1954,26 +1662,11 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "k256" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "903ae2481bcdfdb7b68e0a9baa4b7c9aff600b9ae2e8e5bb5833b8c91ab851ea" -dependencies = [ - "cfg-if", - "ecdsa", - "elliptic-curve", - "sha2 0.9.9", -] - [[package]] name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -dependencies = [ - "spin 0.5.2", -] [[package]] name = "leb128" @@ -2037,16 +1730,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "lock_api" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" -dependencies = [ - "autocfg 1.1.0", - "scopeguard", -] - [[package]] name = "log" version = "0.4.17" @@ -2110,7 +1793,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ - "autocfg 1.1.0", + "autocfg", ] [[package]] @@ -2129,58 +1812,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "windows-sys", ] -[[package]] -name = "num-bigint-dig" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4547ee5541c18742396ae2c895d0717d0f886d8823b8399cdaf7b07d63ad0480" -dependencies = [ - "autocfg 0.1.8", - "byteorder", - "lazy_static", - "libm", - "num-integer", - "num-iter", - "num-traits", - "rand 0.8.5", - "serde", - "smallvec", - "zeroize", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg 1.1.0", - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" -dependencies = [ - "autocfg 1.1.0", - "num-integer", - "num-traits", -] - [[package]] name = "num-traits" version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ - "autocfg 1.1.0", - "libm", + "autocfg", ] [[package]] @@ -2252,12 +1894,6 @@ version = "11.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - [[package]] name = "openvino" version = "0.5.0" @@ -2291,57 +1927,12 @@ dependencies = [ "pretty_env_logger 0.4.0", ] -[[package]] -name = "p256" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d053368e1bae4c8a672953397bd1bd7183dde1c72b0b7612a15719173148d186" -dependencies = [ - "ecdsa", - "elliptic-curve", - "sha2 0.9.9", -] - -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall 0.2.13", - "smallvec", - "winapi", -] - [[package]] name = "paste" version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc" -[[package]] -name = "pem-rfc7468" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84e93a3b1cc0510b03020f33f21e62acdde3dcaef432edc95bea377fbd4c2cd4" -dependencies = [ - "base64ct", -] - [[package]] name = "percent-encoding" version = "2.2.0" @@ -2360,30 +1951,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "pkcs1" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "116bee8279d783c0cf370efa1a94632f2108e5ef0bb32df31f051647810a4e2c" -dependencies = [ - "der", - "pem-rfc7468", - "zeroize", -] - -[[package]] -name = "pkcs8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee3ef9b64d26bad0536099c816c6734379e45bbd5f14798def6809e5cc350447" -dependencies = [ - "der", - "pem-rfc7468", - "pkcs1", - "spki", - "zeroize", -] - [[package]] name = "plotters" version = "0.3.1" @@ -2412,76 +1979,12 @@ dependencies = [ "plotters-backend", ] -[[package]] -name = "poly1305" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede" -dependencies = [ - "cpufeatures", - "opaque-debug", - "universal-hash", -] - -[[package]] -name = "polyval" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1" -dependencies = [ - "cfg-if", - "cpufeatures", - "opaque-debug", - "universal-hash", -] - [[package]] name = "ppv-lite86" version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" -[[package]] -name = "pqcrypto" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9da39bd0587bff4189521766c34f3203263926f7527906578a96d22a81a700d5" -dependencies = [ - "pqcrypto-kyber", - "pqcrypto-traits", -] - -[[package]] -name = "pqcrypto-internals" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0127cbc0239f585139a56effd7867921eae3425a000a72dde2b0a156062346b2" -dependencies = [ - "cc", - "dunce", - "getrandom 0.2.9", - "libc", -] - -[[package]] -name = "pqcrypto-kyber" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a17989a978f7d7c1496e38806ad9ff11f36eb8e419c562eafddbbf176af4a8a" -dependencies = [ - "cc", - "glob", - "libc", - "pqcrypto-internals", - "pqcrypto-traits", -] - -[[package]] -name = "pqcrypto-traits" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97e91cb6af081c6daad5fa705f8adb0634c027662052cb3174bdf2957bf07e25" - [[package]] name = "pretty_env_logger" version = "0.4.0" @@ -2523,8 +2026,8 @@ dependencies = [ "lazy_static", "num-traits", "quick-error 2.0.1", - "rand 0.8.5", - "rand_chacha 0.3.1", + "rand", + "rand_chacha", "rand_xorshift", "regex-syntax 0.6.25", "rusty-fork", @@ -2572,19 +2075,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - [[package]] name = "rand" version = "0.8.5" @@ -2592,18 +2082,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.3", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", + "rand_chacha", + "rand_core", ] [[package]] @@ -2613,16 +2093,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.3", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", + "rand_core", ] [[package]] @@ -2631,16 +2102,7 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" dependencies = [ - "getrandom 0.2.9", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", + "getrandom", ] [[package]] @@ -2649,22 +2111,16 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" dependencies = [ - "rand_core 0.6.3", + "rand_core", ] -[[package]] -name = "rawbytes" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04d0088f16afb86d12c7f239d8de4637fa68ecc99a3db227e1ab58a294713e60" - [[package]] name = "rayon" version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" dependencies = [ - "autocfg 1.1.0", + "autocfg", "crossbeam-deque", "either", "rayon-core", @@ -2713,7 +2169,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.9", + "getrandom", "redox_syscall 0.2.13", "thiserror", ] @@ -2803,27 +2259,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "rsa" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05c2603e2823634ab331437001b411b9ed11660fbc4066f3908c84a9439260d" -dependencies = [ - "byteorder", - "digest 0.9.0", - "lazy_static", - "num-bigint-dig", - "num-integer", - "num-iter", - "num-traits", - "pkcs1", - "pkcs8", - "rand 0.8.5", - "serde", - "subtle", - "zeroize", -] - [[package]] name = "rustc-demangle" version = "0.1.21" @@ -2970,19 +2405,6 @@ dependencies = [ "serde", ] -[[package]] -name = "sha2" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", -] - [[package]] name = "sha2" version = "0.10.2" @@ -2991,7 +2413,7 @@ checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.3", + "digest", ] [[package]] @@ -3020,20 +2442,10 @@ checksum = "4ee9977fa98489d9006f4ab26fc5cbe2a139985baed09d2ec08dee6e506fc496" dependencies = [ "cfg-if", "libc", - "rand 0.8.5", + "rand", "winapi", ] -[[package]] -name = "signature" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2807892cfa58e081aa1f1111391c7a0649d4fa127a4ffbe34bcbfb35a1171a4" -dependencies = [ - "digest 0.9.0", - "rand_core 0.6.3", -] - [[package]] name = "similar" version = "2.2.0" @@ -3046,7 +2458,7 @@ version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" dependencies = [ - "autocfg 1.1.0", + "autocfg", ] [[package]] @@ -3104,15 +2516,6 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09" -[[package]] -name = "spki" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c01a0c15da1b0b0e1494112e7af814a678fec9bd157881b49beac661e9b6f32" -dependencies = [ - "der", -] - [[package]] name = "sptr" version = "0.3.2" @@ -3137,12 +2540,6 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" -[[package]] -name = "subtle" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" - [[package]] name = "symbolic_expressions" version = "5.0.3" @@ -3171,18 +2568,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.92", - "unicode-xid", -] - [[package]] name = "system-interface" version = "0.26.0" @@ -3211,7 +2596,7 @@ version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" dependencies = [ - "autocfg 1.1.0", + "autocfg", "cfg-if", "fastrand", "redox_syscall 0.3.5", @@ -3337,7 +2722,7 @@ version = "1.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" dependencies = [ - "autocfg 1.1.0", + "autocfg", "backtrace", "bytes", "libc", @@ -3501,16 +2886,6 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04" -[[package]] -name = "universal-hash" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" -dependencies = [ - "generic-array", - "subtle", -] - [[package]] name = "untrusted" version = "0.7.1" @@ -3540,7 +2915,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8cfcd319456c4d6ea10087ed423473267e1a071f3bc0aa89f80d60997843c6f0" dependencies = [ - "getrandom 0.2.9", + "getrandom", ] [[package]] @@ -3599,12 +2974,6 @@ dependencies = [ "try-lock", ] -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -3652,35 +3021,6 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "wasi-crypto" -version = "0.1.5" -dependencies = [ - "aes-gcm", - "anyhow", - "bincode", - "byteorder", - "chacha20poly1305", - "curve25519-dalek", - "derivative", - "ed25519-dalek", - "hkdf", - "hmac", - "k256", - "p256", - "parking_lot", - "pqcrypto", - "rand_core 0.5.1", - "rand_core 0.6.3", - "rsa", - "serde", - "sha2 0.9.9", - "subtle", - "thiserror", - "xoodyak", - "zeroize", -] - [[package]] name = "wasi-http-tests" version = "0.0.0" @@ -3695,7 +3035,7 @@ version = "13.0.0" dependencies = [ "byte-array-literals", "object", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "wasm-encoder 0.31.1", "wit-bindgen", ] @@ -3706,7 +3046,7 @@ version = "0.0.0" dependencies = [ "libc", "once_cell", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] [[package]] @@ -3836,7 +3176,7 @@ checksum = "3f69711841ee713705276a1af884720038a5f2cbb457f7904f43d9a8636b6bff" dependencies = [ "egg", "log", - "rand 0.8.5", + "rand", "thiserror", "wasm-encoder 0.31.1", "wasmparser 0.110.0", @@ -4002,7 +3342,6 @@ dependencies = [ "wasmtime", "wasmtime-cli-flags", "wasmtime-wasi", - "wasmtime-wasi-crypto", "wasmtime-wasi-nn", "wat", ] @@ -4046,7 +3385,7 @@ dependencies = [ "pretty_env_logger 0.5.0", "rustix 0.38.4", "serde", - "sha2 0.10.2", + "sha2", "tempfile", "toml", "windows-sys", @@ -4093,7 +3432,6 @@ dependencies = [ "wasmtime-explorer", "wasmtime-runtime", "wasmtime-wasi", - "wasmtime-wasi-crypto", "wasmtime-wasi-http", "wasmtime-wasi-nn", "wasmtime-wasi-threads", @@ -4255,7 +3593,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "rand 0.8.5", + "rand", "smallvec", "target-lexicon", "wasmparser 0.110.0", @@ -4273,7 +3611,7 @@ dependencies = [ "component-test-util", "env_logger 0.10.0", "log", - "rand 0.8.5", + "rand", "rayon", "target-lexicon", "tempfile", @@ -4349,7 +3687,7 @@ dependencies = [ "memoffset", "once_cell", "paste", - "rand 0.8.5", + "rand", "rustix 0.38.4", "sptr", "wasm-encoder 0.31.1", @@ -4410,16 +3748,6 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "wasmtime-wasi-crypto" -version = "13.0.0" -dependencies = [ - "anyhow", - "wasi-crypto", - "wasmtime", - "wiggle", -] - [[package]] name = "wasmtime-wasi-http" version = "13.0.0" @@ -4455,7 +3783,7 @@ version = "13.0.0" dependencies = [ "anyhow", "log", - "rand 0.8.5", + "rand", "wasi-common", "wasmtime", "wasmtime-wasi", @@ -4897,37 +4225,6 @@ dependencies = [ "wast 35.0.2", ] -[[package]] -name = "xoodyak" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b52dbbb9ca4862dcd5e33383af1610db2f28d081e0803e3a3b2bbdfab5eeed" -dependencies = [ - "rawbytes", - "zeroize", -] - -[[package]] -name = "zeroize" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d68d9dcec5f9b43a30d38c49f91dfedfaac384cb8f085faca366c26207dd1619" -dependencies = [ - "zeroize_derive", -] - -[[package]] -name = "zeroize_derive" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.92", - "synstructure", -] - [[package]] name = "zstd" version = "0.11.1+zstd.1.5.2" diff --git a/Cargo.toml b/Cargo.toml index 9f757bd20495..df13e4ad28f1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,7 +30,6 @@ wasmtime-environ = { workspace = true } wasmtime-explorer = { workspace = true } wasmtime-wast = { workspace = true } wasmtime-wasi = { workspace = true, features = ["exit"] } -wasmtime-wasi-crypto = { workspace = true, optional = true } wasmtime-wasi-nn = { workspace = true, optional = true } wasmtime-wasi-threads = { workspace = true, optional = true } wasmtime-wasi-http = { workspace = true, optional = true } @@ -138,7 +137,6 @@ wasmtime-jit-debug = { path = "crates/jit-debug", version = "=13.0.0" } wasmtime-runtime = { path = "crates/runtime", version = "=13.0.0" } wasmtime-wast = { path = "crates/wast", version = "=13.0.0" } wasmtime-wasi = { path = "crates/wasi", version = "13.0.0" } -wasmtime-wasi-crypto = { path = "crates/wasi-crypto", version = "13.0.0" } wasmtime-wasi-http = { path = "crates/wasi-http", version = "=13.0.0" } wasmtime-wasi-nn = { path = "crates/wasi-nn", version = "13.0.0" } wasmtime-wasi-threads = { path = "crates/wasi-threads", version = "13.0.0" } @@ -262,7 +260,6 @@ default = [ ] jitdump = ["wasmtime/jitdump"] vtune = ["wasmtime/vtune"] -wasi-crypto = ["dep:wasmtime-wasi-crypto"] wasi-nn = ["dep:wasmtime-wasi-nn"] wasi-threads = ["dep:wasmtime-wasi-threads"] wasi-http = ["dep:wasmtime-wasi-http"] diff --git a/ci/run-tests.sh b/ci/run-tests.sh index 6d7df3866cb2..4fac7b1cfb09 100755 --- a/ci/run-tests.sh +++ b/ci/run-tests.sh @@ -6,7 +6,6 @@ cargo test \ --features wasi-http \ --workspace \ --exclude 'wasmtime-wasi-*' \ - --exclude wasi-crypto \ --exclude wasi-tests \ --exclude command-tests \ --exclude reactor-tests \ diff --git a/ci/run-wasi-crypto-example.sh b/ci/run-wasi-crypto-example.sh deleted file mode 100755 index 30bbada3c76a..000000000000 --- a/ci/run-wasi-crypto-example.sh +++ /dev/null @@ -1,10 +0,0 @@ -#! /bin/bash - -set -e - -RUST_BINDINGS="crates/wasi-crypto/spec/implementations/bindings/rust" -pushd "$RUST_BINDINGS" -cargo build --release --target=wasm32-wasi -popd - -cargo run --features wasi-crypto -- run --wasi-modules=experimental-wasi-crypto "$RUST_BINDINGS/target/wasm32-wasi/release/wasi-crypto-guest.wasm" diff --git a/crates/bench-api/Cargo.toml b/crates/bench-api/Cargo.toml index 150886297134..3a617b821313 100644 --- a/crates/bench-api/Cargo.toml +++ b/crates/bench-api/Cargo.toml @@ -22,7 +22,6 @@ target-lexicon = { workspace = true } wasmtime = { workspace = true } wasmtime-cli-flags = { workspace = true, default-features = true } wasmtime-wasi = { workspace = true } -wasmtime-wasi-crypto = { workspace = true, optional = true } wasmtime-wasi-nn = { workspace = true, optional = true } wasi-cap-std-sync = { workspace = true } cap-std = { workspace = true } @@ -33,5 +32,4 @@ wat = { workspace = true } [features] default = ["shuffling-allocator", "wasi-nn"] -wasi-crypto = ["wasmtime-wasi-crypto"] wasi-nn = ["wasmtime-wasi-nn"] diff --git a/crates/bench-api/src/lib.rs b/crates/bench-api/src/lib.rs index a998bc22f64c..d293d81664b1 100644 --- a/crates/bench-api/src/lib.rs +++ b/crates/bench-api/src/lib.rs @@ -419,8 +419,6 @@ struct HostState { wasi: WasiCtx, #[cfg(feature = "wasi-nn")] wasi_nn: wasmtime_wasi_nn::WasiNnCtx, - #[cfg(feature = "wasi-crypto")] - wasi_crypto: wasmtime_wasi_crypto::WasiCryptoCtx, } impl BenchState { @@ -472,11 +470,6 @@ impl BenchState { wasmtime_wasi_nn::add_to_linker(&mut linker, |cx| &mut cx.wasi_nn)?; } - #[cfg(feature = "wasi-crypto")] - if wasi_modules.wasi_crypto { - wasmtime_wasi_crypto::add_to_linker(&mut linker, |cx| &mut cx.wasi_crypto)?; - } - Ok(Self { linker, compilation_timer, @@ -517,8 +510,6 @@ impl BenchState { wasi: (self.make_wasi_cx)().context("failed to create a WASI context")?, #[cfg(feature = "wasi-nn")] wasi_nn: wasmtime_wasi_nn::WasiNnCtx::new()?, - #[cfg(feature = "wasi-crypto")] - wasi_crypto: wasmtime_wasi_crypto::WasiCryptoCtx::new(), }; // NB: Start measuring instantiation time *after* we've created the WASI diff --git a/crates/cli-flags/src/lib.rs b/crates/cli-flags/src/lib.rs index 9febfcd17893..c67349ce6c08 100644 --- a/crates/cli-flags/src/lib.rs +++ b/crates/cli-flags/src/lib.rs @@ -59,10 +59,6 @@ pub const SUPPORTED_WASI_MODULES: &[(&str, &str)] = &[ "wasi-common", "enables support for the WASI common APIs, see https://github.com/WebAssembly/WASI", ), - ( - "experimental-wasi-crypto", - "enables support for the WASI cryptography APIs (experimental), see https://github.com/WebAssembly/wasi-crypto", - ), ( "experimental-wasi-nn", "enables support for the WASI neural network API (experimental), see https://github.com/WebAssembly/wasi-nn", @@ -521,7 +517,6 @@ fn parse_wasi_modules(modules: &str) -> Result { let mut set = |module: &str, enable: bool| match module { "" => Ok(()), "wasi-common" => Ok(wasi_modules.wasi_common = enable), - "experimental-wasi-crypto" => Ok(wasi_modules.wasi_crypto = enable), "experimental-wasi-nn" => Ok(wasi_modules.wasi_nn = enable), "experimental-wasi-threads" => Ok(wasi_modules.wasi_threads = enable), "experimental-wasi-http" => Ok(wasi_modules.wasi_http = enable), @@ -551,9 +546,6 @@ pub struct WasiModules { /// parts once the implementation allows for it (e.g. wasi-fs, wasi-clocks, etc.). pub wasi_common: bool, - /// Enable the experimental wasi-crypto implementation. - pub wasi_crypto: bool, - /// Enable the experimental wasi-nn implementation. pub wasi_nn: bool, @@ -568,7 +560,6 @@ impl Default for WasiModules { fn default() -> Self { Self { wasi_common: true, - wasi_crypto: false, wasi_nn: false, wasi_threads: false, wasi_http: false, @@ -582,7 +573,6 @@ impl WasiModules { Self { wasi_common: false, wasi_nn: false, - wasi_crypto: false, wasi_threads: false, wasi_http: false, } @@ -750,7 +740,6 @@ mod test { options.wasi_modules.unwrap(), WasiModules { wasi_common: true, - wasi_crypto: false, wasi_nn: false, wasi_threads: false, wasi_http: false, @@ -765,7 +754,6 @@ mod test { options.wasi_modules.unwrap(), WasiModules { wasi_common: true, - wasi_crypto: false, wasi_nn: false, wasi_threads: false, wasi_http: false @@ -784,7 +772,6 @@ mod test { options.wasi_modules.unwrap(), WasiModules { wasi_common: false, - wasi_crypto: false, wasi_nn: true, wasi_threads: false, wasi_http: false, @@ -800,7 +787,6 @@ mod test { options.wasi_modules.unwrap(), WasiModules { wasi_common: false, - wasi_crypto: false, wasi_nn: false, wasi_threads: false, wasi_http: false, diff --git a/crates/wasi-crypto/Cargo.toml b/crates/wasi-crypto/Cargo.toml deleted file mode 100644 index 85d1af69f428..000000000000 --- a/crates/wasi-crypto/Cargo.toml +++ /dev/null @@ -1,18 +0,0 @@ -[package] -name = "wasmtime-wasi-crypto" -version.workspace = true -authors.workspace = true -description = "Wasmtime implementation of the wasi-crypto API" -documentation = "https://docs.rs/wasmtime-wasi-crypto" -license = "Apache-2.0 WITH LLVM-exception" -categories = ["wasm", "cryptography"] -keywords = ["webassembly", "wasm", "crypto"] -repository = "https://github.com/bytecodealliance/wasmtime" -readme = "README.md" -edition.workspace = true - -[dependencies] -anyhow = { workspace = true } -wasi-crypto = { path = "spec/implementations/hostcalls/rust", version = "0.1.5" } -wasmtime = { workspace = true } -wiggle = { workspace = true } diff --git a/crates/wasi-crypto/LICENSE b/crates/wasi-crypto/LICENSE deleted file mode 100644 index f9d81955f4bc..000000000000 --- a/crates/wasi-crypto/LICENSE +++ /dev/null @@ -1,220 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - ---- LLVM Exceptions to the Apache 2.0 License ---- - -As an exception, if, as a result of your compiling your source code, portions -of this Software are embedded into an Object form of such source code, you -may redistribute such embedded portions in such Object form without complying -with the conditions of Sections 4(a), 4(b) and 4(d) of the License. - -In addition, if you combine or link compiled forms of this Software with -software that is licensed under the GPLv2 ("Combined Software") and if a -court of competent jurisdiction determines that the patent provision (Section -3), the indemnity provision (Section 9) or other Section of the License -conflicts with the conditions of the GPLv2, you may retroactively and -prospectively choose to deem waived or otherwise exclude such Section(s) of -the License, but only in their entirety and only with respect to the Combined -Software. - diff --git a/crates/wasi-crypto/README.md b/crates/wasi-crypto/README.md deleted file mode 100644 index 8536437db3cb..000000000000 --- a/crates/wasi-crypto/README.md +++ /dev/null @@ -1,56 +0,0 @@ -# wasmtime-wasi-crypto - -This crate enables support for the [wasi-crypto] APIs in Wasmtime. - -The sole purpose of the implementation is to allow bindings and -application developers to test the proposed APIs. This implementation -is not meant to be used in production. Like the specification, it is -currently experimental and its functionality can quickly change. - -Since the [wasi-crypto] API is expected to be an optional feature of -WASI, this crate is currently separate from the [wasi-common] crate. - -* [documentation] -* [interfaces reference] -* [interfaces reference (compact)] - -[wasi-crypto]: https://github.com/WebAssembly/wasi-crypto -[wasi-common]: ../../wasi-common -[documentation]: ../spec/docs/wasi-crypto.md -[interfaces reference]: ../spec/witx/codegen/wasi_ephemeral_crypto.md -[interfaces reference (compact)]: ../spec/witx/codegen/wasi_ephemeral_crypto.txt - -## Wasmtime integration - -Use the Wasmtime APIs to instantiate a Wasm module and link the -`wasi-crypto` modules as follows: - -```rust -use wasmtime_wasi_crypto::{ - WasiCryptoAsymmetricCommon, WasiCryptoCommon, WasiCryptoCtx, WasiCryptoSignatures, - WasiCryptoSymmetric, -}; - -let cx_crypto = WasiCryptoCtx::new(); -WasiCryptoCommon::new(linker.store(), cx_crypto.clone()).add_to_linker(linker)?; -WasiCryptoAsymmetricCommon::new(linker.store(), cx_crypto.clone()).add_to_linker(linker)?; -WasiCryptoSignatures::new(linker.store(), cx_crypto.clone()).add_to_linker(linker)?; -WasiCryptoSymmetric::new(linker.store(), cx_crypto.clone()).add_to_linker(linker)?; - -let wasi = wasmtime_wasi::old::snapshot_0::Wasi::new(linker.store(), mk_cx()?); -wasi.add_to_linker(linker)?; -``` - -## Building Wasmtime - -Wasmtime must be compiled with the `wasi-crypto` feature flag -(disabled by default) in order to include the crypto APIs. - -## Examples - -Example [rust bindings] and [assemblyscript bindings] are provided to -demonstrate how these APIs can be used and exposed to applications in -an idiomatic way. - -[rust bindings]: ../spec/implementations/bindings/rust -[assemblyscript bindings]: ../spec/implementations/bindings/assemblyscript diff --git a/crates/wasi-crypto/spec b/crates/wasi-crypto/spec deleted file mode 160000 index 67d9821f2763..000000000000 --- a/crates/wasi-crypto/spec +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 67d9821f2763f4626a97c70c411ccb92a2047712 diff --git a/crates/wasi-crypto/src/lib.rs b/crates/wasi-crypto/src/lib.rs deleted file mode 100644 index 9cd4b716bac0..000000000000 --- a/crates/wasi-crypto/src/lib.rs +++ /dev/null @@ -1,15 +0,0 @@ -mod wiggle_interfaces; - -pub use wiggle_interfaces::WasiCryptoCtx; - -pub fn add_to_linker( - linker: &mut wasmtime::Linker, - get_cx: impl Fn(&mut T) -> &mut WasiCryptoCtx + Send + Sync + Copy + 'static, -) -> anyhow::Result<()> { - use wiggle_interfaces::wasi_modules as w; - w::wasi_ephemeral_crypto_common::add_to_linker(linker, get_cx)?; - w::wasi_ephemeral_crypto_asymmetric_common::add_to_linker(linker, get_cx)?; - w::wasi_ephemeral_crypto_signatures::add_to_linker(linker, get_cx)?; - w::wasi_ephemeral_crypto_symmetric::add_to_linker(linker, get_cx)?; - Ok(()) -} diff --git a/crates/wasi-crypto/src/wiggle_interfaces/asymmetric_common.rs b/crates/wasi-crypto/src/wiggle_interfaces/asymmetric_common.rs deleted file mode 100644 index 00e7955ceab2..000000000000 --- a/crates/wasi-crypto/src/wiggle_interfaces/asymmetric_common.rs +++ /dev/null @@ -1,301 +0,0 @@ -use super::{guest_types, WasiCryptoCtx}; - -use std::convert::TryInto; -use wasi_crypto::{ - ensure, CryptoError, KeyPairEncoding, PublicKeyEncoding, SecretKeyEncoding, Version, -}; - -impl super::wasi_ephemeral_crypto_asymmetric_common::WasiEphemeralCryptoAsymmetricCommon - for WasiCryptoCtx -{ - // --- keypair_manager - - fn keypair_generate_managed( - &mut self, - secrets_manager_handle: guest_types::SecretsManager, - alg_type: guest_types::AlgorithmType, - alg_str: &wiggle::GuestPtr<'_, str>, - options_handle: &guest_types::OptOptions, - ) -> Result { - let alg_str = &*alg_str.as_cow()?; - let options_handle = match *options_handle { - guest_types::OptOptions::Some(options_handle) => Some(options_handle), - guest_types::OptOptions::None => None, - }; - Ok((&*self) - .keypair_generate_managed( - secrets_manager_handle.into(), - alg_type.into(), - alg_str, - options_handle.map(Into::into), - )? - .into()) - } - - fn keypair_store_managed( - &mut self, - secrets_manager_handle: guest_types::SecretsManager, - kp_handle: guest_types::Keypair, - kp_id_ptr: &wiggle::GuestPtr<'_, u8>, - kp_id_max_len: guest_types::Size, - ) -> Result<(), guest_types::CryptoErrno> { - let key_id_buf = &mut *kp_id_ptr - .as_array(kp_id_max_len) - .as_slice_mut()? - .expect("cannot use with shared memories; see https://github.com/bytecodealliance/wasmtime/issues/5235 (TODO)"); - Ok((&*self).keypair_store_managed( - secrets_manager_handle.into(), - kp_handle.into(), - key_id_buf, - )?) - } - - fn keypair_replace_managed( - &mut self, - secrets_manager_handle: guest_types::SecretsManager, - kp_old_handle: guest_types::Keypair, - kp_new_handle: guest_types::Keypair, - ) -> Result { - Ok((&*self) - .keypair_replace_managed( - secrets_manager_handle.into(), - kp_old_handle.into(), - kp_new_handle.into(), - )? - .0) - } - - fn keypair_from_id( - &mut self, - secrets_manager_handle: guest_types::SecretsManager, - kp_id_ptr: &wiggle::GuestPtr<'_, u8>, - kp_id_len: guest_types::Size, - kp_version: guest_types::Version, - ) -> Result { - let kp_id = &*kp_id_ptr - .as_array(kp_id_len) - .as_slice()? - .expect("cannot use with shared memories; see https://github.com/bytecodealliance/wasmtime/issues/5235 (TODO)"); - Ok((&*self) - .keypair_from_id(secrets_manager_handle.into(), kp_id, Version(kp_version))? - .into()) - } - - // --- keypair - - fn keypair_generate( - &mut self, - alg_type: guest_types::AlgorithmType, - alg_str: &wiggle::GuestPtr<'_, str>, - options_handle: &guest_types::OptOptions, - ) -> Result { - let alg_str = &*alg_str.as_cow()?; - let options_handle = match *options_handle { - guest_types::OptOptions::Some(options_handle) => Some(options_handle), - guest_types::OptOptions::None => None, - }; - Ok((&*self) - .keypair_generate(alg_type.into(), alg_str, options_handle.map(Into::into))? - .into()) - } - - fn keypair_import( - &mut self, - alg_type: guest_types::AlgorithmType, - alg_str: &wiggle::GuestPtr<'_, str>, - encoded_ptr: &wiggle::GuestPtr<'_, u8>, - encoded_len: guest_types::Size, - encoding: guest_types::KeypairEncoding, - ) -> Result { - let alg_str = &*alg_str.as_cow()?; - let encoded = &*encoded_ptr - .as_array(encoded_len) - .as_slice()? - .expect("cannot use with shared memories; see https://github.com/bytecodealliance/wasmtime/issues/5235 (TODO)"); - Ok((&*self) - .keypair_import(alg_type.into(), alg_str, encoded, encoding.into())? - .into()) - } - - fn keypair_id( - &mut self, - kp_handle: guest_types::Keypair, - kp_id_ptr: &wiggle::GuestPtr<'_, u8>, - kp_id_max_len: guest_types::Size, - ) -> Result<(guest_types::Size, guest_types::Version), guest_types::CryptoErrno> { - let kp_id_buf = &mut *kp_id_ptr - .as_array(kp_id_max_len as _) - .as_slice_mut()? - .expect("cannot use with shared memories; see https://github.com/bytecodealliance/wasmtime/issues/5235 (TODO)"); - let (kp_id, version) = (&*self).keypair_id(kp_handle.into())?; - ensure!(kp_id.len() <= kp_id_buf.len(), CryptoError::Overflow.into()); - kp_id_buf.copy_from_slice(&kp_id); - Ok((kp_id.len().try_into()?, version.0)) - } - - fn keypair_export( - &mut self, - kp_handle: guest_types::Keypair, - encoding: guest_types::KeypairEncoding, - ) -> Result { - Ok((&*self) - .keypair_export(kp_handle.into(), encoding.into())? - .into()) - } - - fn keypair_publickey( - &mut self, - kp_handle: guest_types::Keypair, - ) -> Result { - Ok((&*self).keypair_publickey(kp_handle.into())?.into()) - } - - fn keypair_close( - &mut self, - kp_handle: guest_types::Keypair, - ) -> Result<(), guest_types::CryptoErrno> { - Ok((&*self).keypair_close(kp_handle.into())?) - } - - // --- publickey - - fn publickey_import( - &mut self, - alg_type: guest_types::AlgorithmType, - alg_str: &wiggle::GuestPtr<'_, str>, - encoded_ptr: &wiggle::GuestPtr<'_, u8>, - encoded_len: guest_types::Size, - encoding: guest_types::PublickeyEncoding, - ) -> Result { - let alg_str = &*alg_str.as_cow()?; - let encoded = &*encoded_ptr - .as_array(encoded_len) - .as_slice()? - .expect("cannot use with shared memories; see https://github.com/bytecodealliance/wasmtime/issues/5235 (TODO)"); - Ok((&*self) - .publickey_import(alg_type.into(), alg_str, encoded, encoding.into())? - .into()) - } - - fn publickey_export( - &mut self, - pk_handle: guest_types::Publickey, - encoding: guest_types::PublickeyEncoding, - ) -> Result { - Ok((&*self) - .publickey_export(pk_handle.into(), encoding.into())? - .into()) - } - - fn publickey_from_secretkey( - &mut self, - sk_handle: guest_types::Secretkey, - ) -> Result { - Ok((&*self).keypair_publickey(sk_handle.into())?.into()) - } - - fn publickey_verify( - &mut self, - pk_handle: guest_types::Publickey, - ) -> Result<(), guest_types::CryptoErrno> { - Ok((&*self).publickey_verify(pk_handle.into())?) - } - - fn publickey_close( - &mut self, - pk_handle: guest_types::Publickey, - ) -> Result<(), guest_types::CryptoErrno> { - Ok((&*self).publickey_close(pk_handle.into())?) - } - - // --- secretkey - - fn secretkey_import( - &mut self, - alg_type: guest_types::AlgorithmType, - alg_str: &wiggle::GuestPtr<'_, str>, - encoded_ptr: &wiggle::GuestPtr<'_, u8>, - encoded_len: guest_types::Size, - encoding: guest_types::SecretkeyEncoding, - ) -> Result { - let alg_str = &*alg_str.as_cow()?; - let encoded = &*encoded_ptr - .as_array(encoded_len) - .as_slice()? - .expect("cannot use with shared memories; see https://github.com/bytecodealliance/wasmtime/issues/5235 (TODO)"); - Ok((&*self) - .secretkey_import(alg_type.into(), alg_str, encoded, encoding.into())? - .into()) - } - - fn secretkey_export( - &mut self, - sk_handle: guest_types::Secretkey, - encoding: guest_types::SecretkeyEncoding, - ) -> Result { - Ok((&*self) - .secretkey_export(sk_handle.into(), encoding.into())? - .into()) - } - - fn secretkey_close( - &mut self, - sk_handle: guest_types::Secretkey, - ) -> Result<(), guest_types::CryptoErrno> { - Ok((&*self).secretkey_close(sk_handle.into())?) - } - - fn keypair_from_pk_and_sk( - &mut self, - pk_handle: guest_types::Publickey, - sk_handle: guest_types::Secretkey, - ) -> Result { - Ok((&*self) - .keypair_from_pk_and_sk(pk_handle.into(), sk_handle.into())? - .into()) - } - - fn keypair_secretkey( - &mut self, - kp_handle: guest_types::Keypair, - ) -> Result { - Ok((&*self).keypair_secretkey(kp_handle.into())?.into()) - } -} - -impl From for KeyPairEncoding { - fn from(encoding: guest_types::KeypairEncoding) -> Self { - match encoding { - guest_types::KeypairEncoding::Raw => KeyPairEncoding::Raw, - guest_types::KeypairEncoding::Pkcs8 => KeyPairEncoding::Pkcs8, - guest_types::KeypairEncoding::Pem => KeyPairEncoding::Pem, - guest_types::KeypairEncoding::Local => KeyPairEncoding::Local, - } - } -} - -impl From for PublicKeyEncoding { - fn from(encoding: guest_types::PublickeyEncoding) -> Self { - match encoding { - guest_types::PublickeyEncoding::Raw => PublicKeyEncoding::Raw, - guest_types::PublickeyEncoding::Pkcs8 => PublicKeyEncoding::Pkcs8, - guest_types::PublickeyEncoding::Pem => PublicKeyEncoding::Pem, - guest_types::PublickeyEncoding::Sec => PublicKeyEncoding::Sec, - guest_types::PublickeyEncoding::CompressedSec => PublicKeyEncoding::CompressedSec, - guest_types::PublickeyEncoding::Local => PublicKeyEncoding::Local, - } - } -} - -impl From for SecretKeyEncoding { - fn from(encoding: guest_types::SecretkeyEncoding) -> Self { - match encoding { - guest_types::SecretkeyEncoding::Raw => SecretKeyEncoding::Raw, - guest_types::SecretkeyEncoding::Pkcs8 => SecretKeyEncoding::Pkcs8, - guest_types::SecretkeyEncoding::Pem => SecretKeyEncoding::Pem, - guest_types::SecretkeyEncoding::Sec => SecretKeyEncoding::Sec, - guest_types::SecretkeyEncoding::CompressedSec => SecretKeyEncoding::CompressedSec, - guest_types::SecretkeyEncoding::Local => SecretKeyEncoding::Local, - } - } -} diff --git a/crates/wasi-crypto/src/wiggle_interfaces/common.rs b/crates/wasi-crypto/src/wiggle_interfaces/common.rs deleted file mode 100644 index 15d1754a1c05..000000000000 --- a/crates/wasi-crypto/src/wiggle_interfaces/common.rs +++ /dev/null @@ -1,148 +0,0 @@ -use super::{guest_types, WasiCryptoCtx}; - -use std::convert::TryInto; -use wasi_crypto::{AlgorithmType, Version}; - -impl super::wasi_ephemeral_crypto_common::WasiEphemeralCryptoCommon for WasiCryptoCtx { - // --- options - - fn options_open( - &mut self, - options_type: guest_types::AlgorithmType, - ) -> Result { - Ok((&*self).options_open(options_type.into())?.into()) - } - - fn options_close( - &mut self, - options_handle: guest_types::Options, - ) -> Result<(), guest_types::CryptoErrno> { - Ok((&*self).options_close(options_handle.into())?) - } - - fn options_set( - &mut self, - options_handle: guest_types::Options, - name_str: &wiggle::GuestPtr<'_, str>, - value_ptr: &wiggle::GuestPtr<'_, u8>, - value_len: guest_types::Size, - ) -> Result<(), guest_types::CryptoErrno> { - let name_str: &str = &*name_str.as_cow()?; - let value: &[u8] = { - &*value_ptr - .as_array(value_len) - .as_slice()? - .expect("cannot use with shared memories; see https://github.com/bytecodealliance/wasmtime/issues/5235 (TODO)") - }; - Ok((&*self).options_set(options_handle.into(), name_str, value)?) - } - - fn options_set_guest_buffer( - &mut self, - options_handle: guest_types::Options, - name_str: &wiggle::GuestPtr<'_, str>, - buffer_ptr: &wiggle::GuestPtr<'_, u8>, - buffer_len: guest_types::Size, - ) -> Result<(), guest_types::CryptoErrno> { - let name_str: &str = &*name_str.as_cow()?; - let buffer: &'static mut [u8] = unsafe { - std::mem::transmute( - &mut *buffer_ptr - .as_array(buffer_len) - .as_slice_mut()? - .expect("cannot use with shared memories; see https://github.com/bytecodealliance/wasmtime/issues/5235 (TODO)"), - ) - }; - Ok((&*self).options_set_guest_buffer(options_handle.into(), name_str, buffer)?) - } - - fn options_set_u64( - &mut self, - options_handle: guest_types::Options, - name_str: &wiggle::GuestPtr<'_, str>, - value: u64, - ) -> Result<(), guest_types::CryptoErrno> { - let name_str: &str = &*name_str.as_cow()?; - Ok((&*self).options_set_u64(options_handle.into(), name_str, value)?) - } - - // --- array - - fn array_output_len( - &mut self, - array_output_handle: guest_types::ArrayOutput, - ) -> Result { - Ok((&*self) - .array_output_len(array_output_handle.into())? - .try_into()?) - } - - fn array_output_pull( - &mut self, - array_output_handle: guest_types::ArrayOutput, - buf_ptr: &wiggle::GuestPtr<'_, u8>, - buf_len: guest_types::Size, - ) -> Result { - let buf: &mut [u8] = { - &mut *buf_ptr - .as_array(buf_len) - .as_slice_mut()? - .expect("cannot use with shared memories; see https://github.com/bytecodealliance/wasmtime/issues/5235 (TODO)") - }; - Ok((&*self) - .array_output_pull(array_output_handle.into(), buf)? - .try_into()?) - } - - // --- secrets_manager - - fn secrets_manager_open( - &mut self, - options_handle: &guest_types::OptOptions, - ) -> Result { - let options_handle = match *options_handle { - guest_types::OptOptions::Some(options_handle) => Some(options_handle), - guest_types::OptOptions::None => None, - }; - Ok((&*self) - .secrets_manager_open(options_handle.map(Into::into))? - .into()) - } - - fn secrets_manager_close( - &mut self, - secrets_manager_handle: guest_types::SecretsManager, - ) -> Result<(), guest_types::CryptoErrno> { - Ok((&*self).secrets_manager_close(secrets_manager_handle.into())?) - } - - fn secrets_manager_invalidate( - &mut self, - secrets_manager_handle: guest_types::SecretsManager, - key_id_ptr: &wiggle::GuestPtr<'_, u8>, - key_id_len: guest_types::Size, - key_version: guest_types::Version, - ) -> Result<(), guest_types::CryptoErrno> { - let key_id: &[u8] = { - &*key_id_ptr - .as_array(key_id_len) - .as_slice()? - .expect("cannot use with shared memories; see https://github.com/bytecodealliance/wasmtime/issues/5235 (TODO)") - }; - Ok((&*self).secrets_manager_invalidate( - secrets_manager_handle.into(), - key_id, - Version(key_version), - )?) - } -} - -impl From for AlgorithmType { - fn from(options_type: guest_types::AlgorithmType) -> Self { - match options_type { - guest_types::AlgorithmType::Signatures => AlgorithmType::Signatures, - guest_types::AlgorithmType::Symmetric => AlgorithmType::Symmetric, - guest_types::AlgorithmType::KeyExchange => AlgorithmType::KeyExchange, - } - } -} diff --git a/crates/wasi-crypto/src/wiggle_interfaces/error.rs b/crates/wasi-crypto/src/wiggle_interfaces/error.rs deleted file mode 100644 index e54a104b030b..000000000000 --- a/crates/wasi-crypto/src/wiggle_interfaces/error.rs +++ /dev/null @@ -1,60 +0,0 @@ -use super::guest_types; - -use std::num::TryFromIntError; -use wasi_crypto::CryptoError; - -impl From for guest_types::CryptoErrno { - fn from(e: CryptoError) -> Self { - match e { - CryptoError::Success => guest_types::CryptoErrno::Success, - CryptoError::GuestError(_wiggle_error) => guest_types::CryptoErrno::GuestError, - CryptoError::NotImplemented => guest_types::CryptoErrno::NotImplemented, - CryptoError::UnsupportedFeature => guest_types::CryptoErrno::UnsupportedFeature, - CryptoError::ProhibitedOperation => guest_types::CryptoErrno::ProhibitedOperation, - CryptoError::UnsupportedEncoding => guest_types::CryptoErrno::UnsupportedEncoding, - CryptoError::UnsupportedAlgorithm => guest_types::CryptoErrno::UnsupportedAlgorithm, - CryptoError::UnsupportedOption => guest_types::CryptoErrno::UnsupportedOption, - CryptoError::InvalidKey => guest_types::CryptoErrno::InvalidKey, - CryptoError::InvalidLength => guest_types::CryptoErrno::InvalidLength, - CryptoError::VerificationFailed => guest_types::CryptoErrno::VerificationFailed, - CryptoError::RNGError => guest_types::CryptoErrno::RngError, - CryptoError::AlgorithmFailure => guest_types::CryptoErrno::AlgorithmFailure, - CryptoError::InvalidSignature => guest_types::CryptoErrno::InvalidSignature, - CryptoError::Closed => guest_types::CryptoErrno::Closed, - CryptoError::InvalidHandle => guest_types::CryptoErrno::InvalidHandle, - CryptoError::Overflow => guest_types::CryptoErrno::Overflow, - CryptoError::InternalError => guest_types::CryptoErrno::InternalError, - CryptoError::TooManyHandles => guest_types::CryptoErrno::TooManyHandles, - CryptoError::KeyNotSupported => guest_types::CryptoErrno::KeyNotSupported, - CryptoError::KeyRequired => guest_types::CryptoErrno::KeyRequired, - CryptoError::InvalidTag => guest_types::CryptoErrno::InvalidTag, - CryptoError::InvalidOperation => guest_types::CryptoErrno::InvalidOperation, - CryptoError::NonceRequired => guest_types::CryptoErrno::NonceRequired, - CryptoError::InvalidNonce => guest_types::CryptoErrno::InvalidNonce, - CryptoError::OptionNotSet => guest_types::CryptoErrno::OptionNotSet, - CryptoError::NotFound => guest_types::CryptoErrno::NotFound, - CryptoError::ParametersMissing => guest_types::CryptoErrno::ParametersMissing, - CryptoError::IncompatibleKeys => guest_types::CryptoErrno::IncompatibleKeys, - CryptoError::Expired => guest_types::CryptoErrno::Expired, - } - } -} - -impl From for guest_types::CryptoErrno { - fn from(_: TryFromIntError) -> Self { - CryptoError::Overflow.into() - } -} - -impl<'a> wiggle::GuestErrorType for guest_types::CryptoErrno { - fn success() -> Self { - guest_types::CryptoErrno::Success - } -} - -impl From for guest_types::CryptoErrno { - fn from(e: wiggle::GuestError) -> Self { - eprintln!("GuestError (impl) {:?}", e); - guest_types::CryptoErrno::GuestError - } -} diff --git a/crates/wasi-crypto/src/wiggle_interfaces/key_exchange.rs b/crates/wasi-crypto/src/wiggle_interfaces/key_exchange.rs deleted file mode 100644 index e7fb1a927ce1..000000000000 --- a/crates/wasi-crypto/src/wiggle_interfaces/key_exchange.rs +++ /dev/null @@ -1,40 +0,0 @@ -use super::{guest_types, WasiCryptoCtx}; - -impl super::wasi_ephemeral_crypto_kx::WasiEphemeralCryptoKx for WasiCryptoCtx { - // --- key exchange - - fn kx_dh( - &mut self, - pk_handle: guest_types::Publickey, - sk_handle: guest_types::Secretkey, - ) -> Result { - Ok((&*self).kx_dh(pk_handle.into(), sk_handle.into())?.into()) - } - - // --- Key encapsulation - - fn kx_encapsulate( - &mut self, - pk_handle: guest_types::Publickey, - ) -> Result<(guest_types::ArrayOutput, guest_types::ArrayOutput), guest_types::CryptoErrno> - { - let (secret_handle, encapsulated_secret_handle) = - (&*self).kx_encapsulate(pk_handle.into())?; - Ok((secret_handle.into(), encapsulated_secret_handle.into())) - } - - fn kx_decapsulate( - &mut self, - sk_handle: guest_types::Secretkey, - encapsulated_secret_ptr: &wiggle::GuestPtr<'_, u8>, - encapsulated_secret_len: guest_types::Size, - ) -> Result { - let encapsulated_secret = &*encapsulated_secret_ptr - .as_array(encapsulated_secret_len) - .as_slice()? - .expect("cannot use with shared memories; see https://github.com/bytecodealliance/wasmtime/issues/5235 (TODO)"); - Ok((&*self) - .kx_decapsulate(sk_handle.into(), encapsulated_secret)? - .into()) - } -} diff --git a/crates/wasi-crypto/src/wiggle_interfaces/mod.rs b/crates/wasi-crypto/src/wiggle_interfaces/mod.rs deleted file mode 100644 index 41119300c0dc..000000000000 --- a/crates/wasi-crypto/src/wiggle_interfaces/mod.rs +++ /dev/null @@ -1,22 +0,0 @@ -pub use wasi_crypto::CryptoCtx as WasiCryptoCtx; - -wiggle::from_witx!({ - witx: ["$CARGO_MANIFEST_DIR/spec/witx/wasi_ephemeral_crypto.witx"], -}); - -pub mod wasi_modules { - pub use super::{ - wasi_ephemeral_crypto_asymmetric_common, wasi_ephemeral_crypto_common, - wasi_ephemeral_crypto_kx, wasi_ephemeral_crypto_signatures, - wasi_ephemeral_crypto_symmetric, - }; -} - -pub use types as guest_types; - -mod asymmetric_common; -mod common; -mod error; -mod key_exchange; -mod signatures; -mod symmetric; diff --git a/crates/wasi-crypto/src/wiggle_interfaces/signatures.rs b/crates/wasi-crypto/src/wiggle_interfaces/signatures.rs deleted file mode 100644 index 3cbe649d6b43..000000000000 --- a/crates/wasi-crypto/src/wiggle_interfaces/signatures.rs +++ /dev/null @@ -1,129 +0,0 @@ -use super::{guest_types, WasiCryptoCtx}; - -use wasi_crypto::SignatureEncoding; - -impl super::wasi_ephemeral_crypto_signatures::WasiEphemeralCryptoSignatures for WasiCryptoCtx { - // --- signature - - fn signature_export( - &mut self, - signature_handle: guest_types::Signature, - encoding: guest_types::SignatureEncoding, - ) -> Result { - Ok((&*self) - .signature_export(signature_handle.into(), encoding.into())? - .into()) - } - - fn signature_import( - &mut self, - alg_str: &wiggle::GuestPtr<'_, str>, - encoded_ptr: &wiggle::GuestPtr<'_, u8>, - encoded_len: guest_types::Size, - encoding: guest_types::SignatureEncoding, - ) -> Result { - let alg_str = &*alg_str.as_cow()?; - let encoded = &*encoded_ptr - .as_array(encoded_len) - .as_slice()? - .expect("cannot use with shared memories; see https://github.com/bytecodealliance/wasmtime/issues/5235 (TODO)"); - Ok((&*self) - .signature_import(alg_str, encoded, encoding.into())? - .into()) - } - - fn signature_state_open( - &mut self, - kp_handle: guest_types::Keypair, - ) -> Result { - Ok((&*self).signature_state_open(kp_handle.into())?.into()) - } - - fn signature_state_update( - &mut self, - state_handle: guest_types::SignatureState, - input_ptr: &wiggle::GuestPtr<'_, u8>, - input_len: guest_types::Size, - ) -> Result<(), guest_types::CryptoErrno> { - let input = &*input_ptr - .as_array(input_len) - .as_slice()? - .expect("cannot use with shared memories; see https://github.com/bytecodealliance/wasmtime/issues/5235 (TODO)"); - Ok((&*self).signature_state_update(state_handle.into(), input)?) - } - - fn signature_state_sign( - &mut self, - signature_state_handle: guest_types::SignatureState, - ) -> Result { - Ok((&*self) - .signature_state_sign(signature_state_handle.into())? - .into()) - } - - fn signature_state_close( - &mut self, - signature_state_handle: guest_types::SignatureState, - ) -> Result<(), guest_types::CryptoErrno> { - Ok((&*self).signature_state_close(signature_state_handle.into())?) - } - - fn signature_verification_state_open( - &mut self, - pk_handle: guest_types::Publickey, - ) -> Result { - Ok((&*self) - .signature_verification_state_open(pk_handle.into())? - .into()) - } - - fn signature_verification_state_update( - &mut self, - verification_state_handle: guest_types::SignatureVerificationState, - input_ptr: &wiggle::GuestPtr<'_, u8>, - input_len: guest_types::Size, - ) -> Result<(), guest_types::CryptoErrno> { - let input: &[u8] = &*input_ptr - .as_array(input_len) - .as_slice()? - .expect("cannot use with shared memories; see https://github.com/bytecodealliance/wasmtime/issues/5235 (TODO)"); - Ok( - (&*self) - .signature_verification_state_update(verification_state_handle.into(), input)?, - ) - } - - fn signature_verification_state_verify( - &mut self, - verification_state_handle: guest_types::SignatureVerificationState, - signature_handle: guest_types::Signature, - ) -> Result<(), guest_types::CryptoErrno> { - Ok((&*self).signature_verification_state_verify( - verification_state_handle.into(), - signature_handle.into(), - )?) - } - - fn signature_verification_state_close( - &mut self, - verification_state_handle: guest_types::SignatureVerificationState, - ) -> Result<(), guest_types::CryptoErrno> { - Ok((&*self).signature_verification_state_close(verification_state_handle.into())?) - } - - fn signature_close( - &mut self, - signature_handle: guest_types::Signature, - ) -> Result<(), guest_types::CryptoErrno> { - Ok((&*self).signature_close(signature_handle.into())?) - } -} - -impl From for SignatureEncoding { - fn from(encoding: guest_types::SignatureEncoding) -> Self { - match encoding { - guest_types::SignatureEncoding::Raw => SignatureEncoding::Raw, - guest_types::SignatureEncoding::Der => SignatureEncoding::Der, - } - } -} diff --git a/crates/wasi-crypto/src/wiggle_interfaces/symmetric.rs b/crates/wasi-crypto/src/wiggle_interfaces/symmetric.rs deleted file mode 100644 index be9258c98b42..000000000000 --- a/crates/wasi-crypto/src/wiggle_interfaces/symmetric.rs +++ /dev/null @@ -1,404 +0,0 @@ -use super::{guest_types, WasiCryptoCtx}; - -use std::convert::TryInto; -use wasi_crypto::{ensure, CryptoError, Version}; - -impl super::wasi_ephemeral_crypto_symmetric::WasiEphemeralCryptoSymmetric for WasiCryptoCtx { - // --- secrets_manager - - fn symmetric_key_generate_managed( - &mut self, - secrets_manager_handle: guest_types::SecretsManager, - alg_str: &wiggle::GuestPtr<'_, str>, - options_handle: &guest_types::OptOptions, - ) -> Result { - let alg_str = &*alg_str.as_cow()?; - let options_handle = match *options_handle { - guest_types::OptOptions::Some(options_handle) => Some(options_handle), - guest_types::OptOptions::None => None, - }; - Ok((&*self) - .symmetric_key_generate_managed( - secrets_manager_handle.into(), - alg_str, - options_handle.map(Into::into), - )? - .into()) - } - - fn symmetric_key_store_managed( - &mut self, - secrets_manager_handle: guest_types::SecretsManager, - symmetric_key_handle: guest_types::SymmetricKey, - symmetric_key_id_ptr: &wiggle::GuestPtr<'_, u8>, - symmetric_key_id_max_len: guest_types::Size, - ) -> Result<(), guest_types::CryptoErrno> { - let key_id_buf = &mut *symmetric_key_id_ptr - .as_array(symmetric_key_id_max_len) - .as_slice_mut()? - .expect("cannot use with shared memories; see https://github.com/bytecodealliance/wasmtime/issues/5235 (TODO)"); - Ok((&*self).symmetric_key_store_managed( - secrets_manager_handle.into(), - symmetric_key_handle.into(), - key_id_buf, - )?) - } - - fn symmetric_key_replace_managed( - &mut self, - secrets_manager_handle: guest_types::SecretsManager, - symmetric_key_old_handle: guest_types::SymmetricKey, - symmetric_key_new_handle: guest_types::SymmetricKey, - ) -> Result { - Ok((&*self) - .symmetric_key_replace_managed( - secrets_manager_handle.into(), - symmetric_key_old_handle.into(), - symmetric_key_new_handle.into(), - )? - .0) - } - - fn symmetric_key_from_id( - &mut self, - secrets_manager_handle: guest_types::SecretsManager, - symmetric_key_id_ptr: &wiggle::GuestPtr<'_, u8>, - symmetric_key_id_len: guest_types::Size, - symmetric_key_version: guest_types::Version, - ) -> Result { - let symmetric_key_id = &*symmetric_key_id_ptr - .as_array(symmetric_key_id_len) - .as_slice()? - .expect("cannot use with shared memories; see https://github.com/bytecodealliance/wasmtime/issues/5235 (TODO)"); - Ok((&*self) - .symmetric_key_from_id( - secrets_manager_handle.into(), - symmetric_key_id, - Version(symmetric_key_version), - )? - .into()) - } - - // --- key - - fn symmetric_key_generate( - &mut self, - alg_str: &wiggle::GuestPtr<'_, str>, - options_handle: &guest_types::OptOptions, - ) -> Result { - let alg_str = &*alg_str.as_cow()?; - let options_handle = match *options_handle { - guest_types::OptOptions::Some(options_handle) => Some(options_handle), - guest_types::OptOptions::None => None, - }; - Ok((&*self) - .symmetric_key_generate(alg_str, options_handle.map(Into::into))? - .into()) - } - - fn symmetric_key_import( - &mut self, - alg_str: &wiggle::GuestPtr<'_, str>, - raw_ptr: &wiggle::GuestPtr<'_, u8>, - raw_len: guest_types::Size, - ) -> Result { - let alg_str = &*alg_str.as_cow()?; - let raw = &*raw_ptr - .as_array(raw_len) - .as_slice()? - .expect("cannot use with shared memories; see https://github.com/bytecodealliance/wasmtime/issues/5235 (TODO)"); - Ok((&*self).symmetric_key_import(alg_str, raw)?.into()) - } - - fn symmetric_key_export( - &mut self, - symmetric_key_handle: guest_types::SymmetricKey, - ) -> Result { - Ok((&*self) - .symmetric_key_export(symmetric_key_handle.into())? - .into()) - } - - fn symmetric_key_id( - &mut self, - symmetric_key_handle: guest_types::SymmetricKey, - symmetric_key_id_ptr: &wiggle::GuestPtr<'_, u8>, - symmetric_key_id_max_len: guest_types::Size, - ) -> Result<(guest_types::Size, guest_types::Version), guest_types::CryptoErrno> { - let key_id_buf = &mut *symmetric_key_id_ptr - .as_array(symmetric_key_id_max_len) - .as_slice_mut()? - .expect("cannot use with shared memories; see https://github.com/bytecodealliance/wasmtime/issues/5235 (TODO)"); - let (key_id, version) = (&*self).symmetric_key_id(symmetric_key_handle.into())?; - ensure!( - key_id.len() <= key_id_buf.len(), - CryptoError::Overflow.into() - ); - key_id_buf.copy_from_slice(&key_id); - Ok((key_id.len().try_into()?, version.0)) - } - - fn symmetric_key_close( - &mut self, - key_handle: guest_types::SymmetricKey, - ) -> Result<(), guest_types::CryptoErrno> { - Ok((&*self).symmetric_key_close(key_handle.into())?) - } - - // --- state - - fn symmetric_state_open( - &mut self, - alg_str: &wiggle::GuestPtr<'_, str>, - key_handle: &guest_types::OptSymmetricKey, - options_handle: &guest_types::OptOptions, - ) -> Result { - let alg_str = &*alg_str.as_cow()?; - let key_handle = match *key_handle { - guest_types::OptSymmetricKey::Some(key_handle) => Some(key_handle), - guest_types::OptSymmetricKey::None => None, - }; - let options_handle = match *options_handle { - guest_types::OptOptions::Some(options_handle) => Some(options_handle), - guest_types::OptOptions::None => None, - }; - Ok((&*self) - .symmetric_state_open( - alg_str, - key_handle.map(Into::into), - options_handle.map(Into::into), - )? - .into()) - } - - fn symmetric_state_options_get( - &mut self, - symmetric_state_handle: guest_types::SymmetricState, - name_str: &wiggle::GuestPtr<'_, str>, - value_ptr: &wiggle::GuestPtr<'_, u8>, - value_max_len: guest_types::Size, - ) -> Result { - let name_str: &str = &*name_str.as_cow()?; - let value = &mut *value_ptr - .as_array(value_max_len) - .as_slice_mut()? - .expect("cannot use with shared memories; see https://github.com/bytecodealliance/wasmtime/issues/5235 (TODO)"); - Ok((&*self) - .options_get(symmetric_state_handle.into(), name_str, value)? - .try_into()?) - } - - fn symmetric_state_options_get_u64( - &mut self, - symmetric_state_handle: guest_types::SymmetricState, - name_str: &wiggle::GuestPtr<'_, str>, - ) -> Result { - let name_str: &str = &*name_str.as_cow()?; - Ok((&*self).options_get_u64(symmetric_state_handle.into(), name_str)?) - } - - fn symmetric_state_close( - &mut self, - symmetric_state_handle: guest_types::SymmetricState, - ) -> Result<(), guest_types::CryptoErrno> { - Ok((&*self).symmetric_state_close(symmetric_state_handle.into())?) - } - - fn symmetric_state_absorb( - &mut self, - symmetric_state_handle: guest_types::SymmetricState, - data_ptr: &wiggle::GuestPtr<'_, u8>, - data_len: guest_types::Size, - ) -> Result<(), guest_types::CryptoErrno> { - let data = &*data_ptr - .as_array(data_len) - .as_slice()? - .expect("cannot use with shared memories; see https://github.com/bytecodealliance/wasmtime/issues/5235 (TODO)"); - Ok((&*self).symmetric_state_absorb(symmetric_state_handle.into(), data)?) - } - - fn symmetric_state_squeeze( - &mut self, - symmetric_state_handle: guest_types::SymmetricState, - out_ptr: &wiggle::GuestPtr<'_, u8>, - out_len: guest_types::Size, - ) -> Result<(), guest_types::CryptoErrno> { - let out = &mut *out_ptr - .as_array(out_len) - .as_slice_mut()? - .expect("cannot use with shared memories; see https://github.com/bytecodealliance/wasmtime/issues/5235 (TODO)"); - Ok((&*self).symmetric_state_squeeze(symmetric_state_handle.into(), out)?) - } - - fn symmetric_state_squeeze_tag( - &mut self, - symmetric_state_handle: guest_types::SymmetricState, - ) -> Result { - Ok((&*self) - .symmetric_state_squeeze_tag(symmetric_state_handle.into())? - .into()) - } - - fn symmetric_state_squeeze_key( - &mut self, - symmetric_state_handle: guest_types::SymmetricState, - alg_str: &wiggle::GuestPtr<'_, str>, - ) -> Result { - let alg_str = &*alg_str.as_cow()?; - Ok((&*self) - .symmetric_state_squeeze_key(symmetric_state_handle.into(), alg_str)? - .into()) - } - - fn symmetric_state_max_tag_len( - &mut self, - symmetric_state_handle: guest_types::SymmetricState, - ) -> Result { - Ok((&*self) - .symmetric_state_max_tag_len(symmetric_state_handle.into())? - .try_into()?) - } - - fn symmetric_state_encrypt( - &mut self, - symmetric_state_handle: guest_types::SymmetricState, - out_ptr: &wiggle::GuestPtr<'_, u8>, - out_len: guest_types::Size, - data_ptr: &wiggle::GuestPtr<'_, u8>, - data_len: guest_types::Size, - ) -> Result { - let out = &mut *out_ptr - .as_array(out_len) - .as_slice_mut()? - .expect("cannot use with shared memories; see https://github.com/bytecodealliance/wasmtime/issues/5235 (TODO)"); - let data = &*data_ptr - .as_array(data_len) - .as_slice()? - .expect("cannot use with shared memories; see https://github.com/bytecodealliance/wasmtime/issues/5235 (TODO)"); - Ok((&*self) - .symmetric_state_encrypt(symmetric_state_handle.into(), out, data)? - .try_into()?) - } - - fn symmetric_state_encrypt_detached( - &mut self, - symmetric_state_handle: guest_types::SymmetricState, - out_ptr: &wiggle::GuestPtr<'_, u8>, - out_len: guest_types::Size, - data_ptr: &wiggle::GuestPtr<'_, u8>, - data_len: guest_types::Size, - ) -> Result { - let out = &mut *out_ptr - .as_array(out_len) - .as_slice_mut()? - .expect("cannot use with shared memories; see https://github.com/bytecodealliance/wasmtime/issues/5235 (TODO)"); - let data = &*data_ptr - .as_array(data_len) - .as_slice()? - .expect("cannot use with shared memories; see https://github.com/bytecodealliance/wasmtime/issues/5235 (TODO)"); - Ok((&*self) - .symmetric_state_encrypt_detached(symmetric_state_handle.into(), out, data)? - .into()) - } - - fn symmetric_state_decrypt( - &mut self, - symmetric_state_handle: guest_types::SymmetricState, - out_ptr: &wiggle::GuestPtr<'_, u8>, - out_len: guest_types::Size, - data_ptr: &wiggle::GuestPtr<'_, u8>, - data_len: guest_types::Size, - ) -> Result { - let out = &mut *out_ptr - .as_array(out_len) - .as_slice_mut()? - .expect("cannot use with shared memories; see https://github.com/bytecodealliance/wasmtime/issues/5235 (TODO)"); - let data = &*data_ptr - .as_array(data_len) - .as_slice()? - .expect("cannot use with shared memories; see https://github.com/bytecodealliance/wasmtime/issues/5235 (TODO)"); - Ok((&*self) - .symmetric_state_decrypt(symmetric_state_handle.into(), out, data)? - .try_into()?) - } - - fn symmetric_state_decrypt_detached( - &mut self, - symmetric_state_handle: guest_types::SymmetricState, - out_ptr: &wiggle::GuestPtr<'_, u8>, - out_len: guest_types::Size, - data_ptr: &wiggle::GuestPtr<'_, u8>, - data_len: guest_types::Size, - raw_tag_ptr: &wiggle::GuestPtr<'_, u8>, - raw_tag_len: guest_types::Size, - ) -> Result { - let out = &mut *out_ptr - .as_array(out_len) - .as_slice_mut()? - .expect("cannot use with shared memories; see https://github.com/bytecodealliance/wasmtime/issues/5235 (TODO)"); - let data = &*data_ptr - .as_array(data_len) - .as_slice()? - .expect("cannot use with shared memories; see https://github.com/bytecodealliance/wasmtime/issues/5235 (TODO)"); - let raw_tag: &[u8] = &*raw_tag_ptr - .as_array(raw_tag_len) - .as_slice()? - .expect("cannot use with shared memories; see https://github.com/bytecodealliance/wasmtime/issues/5235 (TODO)"); - Ok((&*self) - .symmetric_state_decrypt_detached(symmetric_state_handle.into(), out, data, raw_tag)? - .try_into()?) - } - - fn symmetric_state_ratchet( - &mut self, - symmetric_state_handle: guest_types::SymmetricState, - ) -> Result<(), guest_types::CryptoErrno> { - Ok((&*self).symmetric_state_ratchet(symmetric_state_handle.into())?) - } - - // --- tag - - fn symmetric_tag_len( - &mut self, - symmetric_tag_handle: guest_types::SymmetricTag, - ) -> Result { - Ok((&*self) - .symmetric_tag_len(symmetric_tag_handle.into())? - .try_into()?) - } - - fn symmetric_tag_pull( - &mut self, - symmetric_tag_handle: guest_types::SymmetricTag, - buf_ptr: &wiggle::GuestPtr<'_, u8>, - buf_len: guest_types::Size, - ) -> Result { - let buf = &mut *buf_ptr - .as_array(buf_len) - .as_slice_mut()? - .expect("cannot use with shared memories; see https://github.com/bytecodealliance/wasmtime/issues/5235 (TODO)"); - Ok((&*self) - .symmetric_tag_pull(symmetric_tag_handle.into(), buf)? - .try_into()?) - } - - fn symmetric_tag_verify( - &mut self, - symmetric_tag_handle: guest_types::SymmetricTag, - expected_raw_ptr: &wiggle::GuestPtr<'_, u8>, - expected_raw_len: guest_types::Size, - ) -> Result<(), guest_types::CryptoErrno> { - let expected_raw = &*expected_raw_ptr - .as_array(expected_raw_len) - .as_slice()? - .expect("cannot use with shared memories; see https://github.com/bytecodealliance/wasmtime/issues/5235 (TODO)"); - Ok((&*self).symmetric_tag_verify(symmetric_tag_handle.into(), expected_raw)?) - } - - fn symmetric_tag_close( - &mut self, - symmetric_tag_handle: guest_types::SymmetricTag, - ) -> Result<(), guest_types::CryptoErrno> { - Ok((&*self).symmetric_tag_close(symmetric_tag_handle.into())?) - } -} diff --git a/docs/stability-tiers.md b/docs/stability-tiers.md index b12a6a4724f7..d67c946cd277 100644 --- a/docs/stability-tiers.md +++ b/docs/stability-tiers.md @@ -49,7 +49,6 @@ For explanations of what each tier means see below. | Target | `aarch64-pc-windows-msvc` | CI testing, unwinding, full-time maintainer | | Target | `riscv64gc-unknown-linux-gnu` | full-time maintainer | | WASI Proposal | `wasi-nn` | More expansive CI testing | -| WASI Proposal | `wasi-crypto` | CI testing, clear owner | | WebAssembly Proposal | `threads` | Complete implementation | | WebAssembly Proposal | `component-model` | Complete implementation | | *misc* | Non-Wasmtime Cranelift usage [^1] | CI testing, full-time maintainer | diff --git a/docs/stability-wasi-proposals-support.md b/docs/stability-wasi-proposals-support.md index ce8121e2452b..a3964bf5ebc5 100644 --- a/docs/stability-wasi-proposals-support.md +++ b/docs/stability-wasi-proposals-support.md @@ -14,7 +14,7 @@ proposal is not listed, then it is not supported by Wasmtime. | [Poll][wasi-poll] | **Yes** | **Yes** | `wasi-common` | | [Machine Learning (wasi-nn)][wasi-nn] | **Yes** | No | `experimental-wasi-nn` | | [Blob Store][wasi-blob-store] | No | No | N/A | -| [Crypto][wasi-crypto] | **Yes** [^crypto] | No | `experimental-wasi-crypto` | +| [Crypto][wasi-crypto] | No | No | N/A | | [Distributed Lock Service][wasi-distributed-lock-service] | No | No | N/A | | [gRPC][wasi-grpc] | No | No | N/A | | [HTTP][wasi-http] | No | No | N/A | diff --git a/scripts/publish.rs b/scripts/publish.rs index 29ccf1372ecf..1f3ebdafe617 100644 --- a/scripts/publish.rs +++ b/scripts/publish.rs @@ -67,7 +67,6 @@ const CRATES_TO_PUBLISH: &[&str] = &[ "wasi-tokio", // other misc wasmtime crates "wasmtime-wasi", - "wasmtime-wasi-crypto", "wasmtime-wasi-http", "wasmtime-wasi-nn", "wasmtime-wasi-threads", @@ -84,13 +83,11 @@ const CRATES_TO_PUBLISH: &[&str] = &[ const PUBLIC_CRATES: &[&str] = &[ // just here to appease the script because these are submodules of this // repository. - "wasi-crypto", "witx", // these are actually public crates which we cannot break the API of in // patch releases. "wasmtime", "wasmtime-wasi", - "wasmtime-wasi-crypto", "wasmtime-wasi-nn", "wasmtime-wasi-threads", "wasmtime-cli", @@ -255,7 +252,7 @@ fn read_crate(ws: Option<&Workspace>, manifest: &Path) -> Crate { } let name = name.unwrap(); let version = version.unwrap(); - if ["witx", "witx-cli", "wasi-crypto"].contains(&&name[..]) { + if ["witx", "witx-cli"].contains(&&name[..]) { publish = false; } Crate { @@ -501,10 +498,6 @@ fn verify(crates: &[Crate]) { .unwrap(); verify_and_vendor(&witx); - // Vendor wasi-crypto which is also a path dependency - let wasi_crypto = crates.iter().find(|c| c.name == "wasi-crypto").unwrap(); - verify_and_vendor(&wasi_crypto); - for krate in crates { if !krate.publish { continue; diff --git a/src/commands/run.rs b/src/commands/run.rs index 83d65f497cfd..8a124291a0d0 100644 --- a/src/commands/run.rs +++ b/src/commands/run.rs @@ -6,6 +6,7 @@ use once_cell::sync::Lazy; use std::fs::File; use std::io::Write; use std::path::{Path, PathBuf}; +use std::sync::Arc; use std::thread; use std::time::Duration; use wasmtime::{ @@ -16,20 +17,9 @@ use wasmtime_cli_flags::{CommonOptions, WasiModules}; use wasmtime_wasi::maybe_exit_on_error; use wasmtime_wasi::sync::{ambient_authority, Dir, TcpListener, WasiCtxBuilder}; -#[cfg(any( - feature = "wasi-crypto", - feature = "wasi-nn", - feature = "wasi-threads", - feature = "wasi-http" -))] -use std::sync::Arc; - #[cfg(feature = "wasi-nn")] use wasmtime_wasi_nn::WasiNnCtx; -#[cfg(feature = "wasi-crypto")] -use wasmtime_wasi_crypto::WasiCryptoCtx; - #[cfg(feature = "wasi-threads")] use wasmtime_wasi_threads::WasiThreadsCtx; @@ -670,8 +660,6 @@ impl RunCommand { #[derive(Default, Clone)] struct Host { wasi: Option, - #[cfg(feature = "wasi-crypto")] - wasi_crypto: Option>, #[cfg(feature = "wasi-nn")] wasi_nn: Option>, #[cfg(feature = "wasi-threads")] @@ -727,14 +715,14 @@ fn populate_with_wasi( store.data_mut().wasi = Some(builder.build()); } - if wasi_modules.wasi_crypto { - #[cfg(not(feature = "wasi-crypto"))] + if wasi_modules.wasi_nn { + #[cfg(not(feature = "wasi-nn"))] { - bail!("Cannot enable wasi-crypto when the binary is not compiled with this feature."); + bail!("Cannot enable wasi-nn when the binary is not compiled with this feature."); } - #[cfg(feature = "wasi-crypto")] + #[cfg(feature = "wasi-nn")] { - wasmtime_wasi_crypto::add_to_linker(linker, |host| { + wasmtime_wasi_nn::add_to_linker(linker, |host| { // This WASI proposal is currently not protected against // concurrent access--i.e., when wasi-threads is actively // spawning new threads, we cannot (yet) safely allow access and @@ -742,22 +730,6 @@ fn populate_with_wasi( // context. Once this proposal is updated (as wasi-common has // been) to allow concurrent access, this `Arc::get_mut` // limitation can be removed. - Arc::get_mut(host.wasi_crypto.as_mut().unwrap()) - .expect("wasi-crypto is not implemented with multi-threading support") - })?; - store.data_mut().wasi_crypto = Some(Arc::new(WasiCryptoCtx::new())); - } - } - - if wasi_modules.wasi_nn { - #[cfg(not(feature = "wasi-nn"))] - { - bail!("Cannot enable wasi-nn when the binary is not compiled with this feature."); - } - #[cfg(feature = "wasi-nn")] - { - wasmtime_wasi_nn::add_to_linker(linker, |host| { - // See documentation for wasi-crypto for why this is needed. Arc::get_mut(host.wasi_nn.as_mut().unwrap()) .expect("wasi-nn is not implemented with multi-threading support") })?; diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml index e1cdc7d4cf6b..3532b776b806 100644 --- a/supply-chain/audits.toml +++ b/supply-chain/audits.toml @@ -171,7 +171,7 @@ notes = "We (Bytecode Alliance) are the primary authors of regalloc2 and co-deve [[wildcard-audits.regalloc2]] who = "Trevor Elliott " criteria = "safe-to-deploy" -user-id = 187138 # Trevor Elliott (elliottt) +user-id = 187138 start = "2022-11-29" end = "2024-05-02" notes = """ diff --git a/supply-chain/config.toml b/supply-chain/config.toml index edfcac4c389b..683f4da23a82 100644 --- a/supply-chain/config.toml +++ b/supply-chain/config.toml @@ -82,9 +82,6 @@ audit-as-crates-io = true [policy.wasi-common] audit-as-crates-io = true -[policy.wasi-crypto] -audit-as-crates-io = false - [policy.wasi-tokio] audit-as-crates-io = true @@ -154,9 +151,6 @@ audit-as-crates-io = false [policy.wasmtime-wasi] audit-as-crates-io = true -[policy.wasmtime-wasi-crypto] -audit-as-crates-io = true - [policy.wasmtime-wasi-http] audit-as-crates-io = true @@ -197,30 +191,10 @@ audit-as-crates-io = false version = "0.17.0" criteria = "safe-to-deploy" -[[exemptions.aead]] -version = "0.4.3" -criteria = "safe-to-deploy" - -[[exemptions.aes]] -version = "0.7.5" -criteria = "safe-to-deploy" - -[[exemptions.aes-gcm]] -version = "0.9.4" -criteria = "safe-to-deploy" - [[exemptions.ahash]] version = "0.7.6" criteria = "safe-to-deploy" -[[exemptions.autocfg]] -version = "0.1.8" -criteria = "safe-to-deploy" - -[[exemptions.base64ct]] -version = "1.1.1" -criteria = "safe-to-deploy" - [[exemptions.bincode]] version = "1.3.3" criteria = "safe-to-deploy" @@ -245,26 +219,10 @@ criteria = "safe-to-deploy" version = "0.2.7" criteria = "safe-to-run" -[[exemptions.chacha20]] -version = "0.8.1" -criteria = "safe-to-deploy" - -[[exemptions.chacha20poly1305]] -version = "0.9.0" -criteria = "safe-to-deploy" - -[[exemptions.cipher]] -version = "0.3.0" -criteria = "safe-to-deploy" - [[exemptions.console]] version = "0.15.0" criteria = "safe-to-deploy" -[[exemptions.const-oid]] -version = "0.6.2" -criteria = "safe-to-deploy" - [[exemptions.cpp_demangle]] version = "0.3.5" criteria = "safe-to-deploy" @@ -301,30 +259,6 @@ criteria = "safe-to-deploy" version = "0.8.10" criteria = "safe-to-deploy" -[[exemptions.crypto-bigint]] -version = "0.2.11" -criteria = "safe-to-deploy" - -[[exemptions.crypto-mac]] -version = "0.11.1" -criteria = "safe-to-deploy" - -[[exemptions.ctr]] -version = "0.8.0" -criteria = "safe-to-deploy" - -[[exemptions.curve25519-dalek]] -version = "3.2.0" -criteria = "safe-to-deploy" - -[[exemptions.der]] -version = "0.4.5" -criteria = "safe-to-deploy" - -[[exemptions.derivative]] -version = "2.2.0" -criteria = "safe-to-deploy" - [[exemptions.digest]] version = "0.9.0" criteria = "safe-to-deploy" @@ -345,30 +279,10 @@ criteria = "safe-to-deploy" version = "1.2.0" criteria = "safe-to-run" -[[exemptions.dunce]] -version = "1.0.2" -criteria = "safe-to-deploy" - -[[exemptions.ecdsa]] -version = "0.12.4" -criteria = "safe-to-deploy" - -[[exemptions.ed25519]] -version = "1.4.1" -criteria = "safe-to-deploy" - -[[exemptions.ed25519-dalek]] -version = "1.0.1" -criteria = "safe-to-deploy" - [[exemptions.egg]] version = "0.6.0" criteria = "safe-to-run" -[[exemptions.elliptic-curve]] -version = "0.10.6" -criteria = "safe-to-deploy" - [[exemptions.encode_unicode]] version = "0.3.6" criteria = "safe-to-deploy" @@ -385,10 +299,6 @@ criteria = "safe-to-deploy" version = "0.2.0" criteria = "safe-to-deploy" -[[exemptions.ff]] -version = "0.10.1" -criteria = "safe-to-deploy" - [[exemptions.filetime]] version = "0.2.16" criteria = "safe-to-run" @@ -411,26 +321,14 @@ notes = "this is 25k lines and contains over 149 uses of the substring unsafe. i version = "0.14.5" criteria = "safe-to-deploy" -[[exemptions.getrandom]] -version = "0.1.16" -criteria = "safe-to-deploy" - [[exemptions.getrandom]] version = "0.2.6" criteria = "safe-to-deploy" -[[exemptions.ghash]] -version = "0.4.4" -criteria = "safe-to-deploy" - [[exemptions.gimli]] version = "0.26.1" criteria = "safe-to-deploy" -[[exemptions.group]] -version = "0.10.0" -criteria = "safe-to-deploy" - [[exemptions.h2]] version = "0.3.19" criteria = "safe-to-deploy" @@ -444,14 +342,6 @@ criteria = "safe-to-deploy" version = "0.2.0" criteria = "safe-to-deploy" -[[exemptions.hkdf]] -version = "0.11.0" -criteria = "safe-to-deploy" - -[[exemptions.hmac]] -version = "0.11.0" -criteria = "safe-to-deploy" - [[exemptions.http]] version = "0.2.9" criteria = "safe-to-deploy" @@ -500,10 +390,6 @@ version = "0.3.57" criteria = "safe-to-deploy" notes = "dependency of ring for wasm32 browser platform, which our project does not target" -[[exemptions.k256]] -version = "0.9.6" -criteria = "safe-to-deploy" - [[exemptions.libloading]] version = "0.7.3" criteria = "safe-to-deploy" @@ -533,10 +419,6 @@ version = "0.8.6" criteria = "safe-to-deploy" notes = "we are exempting tokio, hyper, and their tightly coupled dependencies by the same authors, expecting that the authors at aws will publish attestions we can import at some point soon" -[[exemptions.num-bigint-dig]] -version = "0.7.0" -criteria = "safe-to-deploy" - [[exemptions.num_cpus]] version = "1.13.1" criteria = "safe-to-deploy" @@ -573,30 +455,6 @@ criteria = "safe-to-deploy" version = "0.4.1" criteria = "safe-to-deploy" -[[exemptions.os_str_bytes]] -version = "6.0.0" -criteria = "safe-to-deploy" - -[[exemptions.p256]] -version = "0.9.0" -criteria = "safe-to-deploy" - -[[exemptions.pem-rfc7468]] -version = "0.2.4" -criteria = "safe-to-deploy" - -[[exemptions.pin-project-lite]] -version = "0.2.9" -criteria = "safe-to-deploy" - -[[exemptions.pkcs1]] -version = "0.2.4" -criteria = "safe-to-deploy" - -[[exemptions.pkcs8]] -version = "0.7.6" -criteria = "safe-to-deploy" - [[exemptions.plotters]] version = "0.3.1" criteria = "safe-to-run" @@ -609,42 +467,14 @@ criteria = "safe-to-run" version = "0.3.1" criteria = "safe-to-run" -[[exemptions.poly1305]] -version = "0.7.2" -criteria = "safe-to-deploy" - -[[exemptions.polyval]] -version = "0.5.3" -criteria = "safe-to-deploy" - [[exemptions.ppv-lite86]] version = "0.2.16" criteria = "safe-to-deploy" -[[exemptions.pqcrypto]] -version = "0.14.2" -criteria = "safe-to-deploy" - -[[exemptions.pqcrypto-internals]] -version = "0.2.4" -criteria = "safe-to-deploy" - -[[exemptions.pqcrypto-kyber]] -version = "0.7.5" -criteria = "safe-to-deploy" - -[[exemptions.pqcrypto-traits]] -version = "0.3.4" -criteria = "safe-to-deploy" - [[exemptions.pretty_env_logger]] version = "0.4.0" criteria = "safe-to-deploy" -[[exemptions.proc-macro-error]] -version = "1.0.4" -criteria = "safe-to-deploy" - [[exemptions.proptest]] version = "1.0.0" criteria = "safe-to-deploy" @@ -661,42 +491,18 @@ criteria = "safe-to-deploy" version = "2.0.1" criteria = "safe-to-deploy" -[[exemptions.rand]] -version = "0.7.3" -criteria = "safe-to-deploy" - [[exemptions.rand]] version = "0.8.5" criteria = "safe-to-deploy" -[[exemptions.rand_chacha]] -version = "0.2.2" -criteria = "safe-to-deploy" - [[exemptions.rand_chacha]] version = "0.3.1" criteria = "safe-to-deploy" -[[exemptions.rand_core]] -version = "0.5.1" -criteria = "safe-to-deploy" - -[[exemptions.rand_core]] -version = "0.6.3" -criteria = "safe-to-deploy" - -[[exemptions.rand_hc]] -version = "0.2.0" -criteria = "safe-to-deploy" - [[exemptions.rand_xorshift]] version = "0.3.0" criteria = "safe-to-deploy" -[[exemptions.rawbytes]] -version = "0.1.2" -criteria = "safe-to-deploy" - [[exemptions.redox_syscall]] version = "0.2.13" criteria = "safe-to-deploy" @@ -718,18 +524,10 @@ version = "0.16.20" criteria = "safe-to-deploy" notes = "contains assembly language and object file implementations of crypto primitives for a very large number of platforms" -[[exemptions.rsa]] -version = "0.5.0" -criteria = "safe-to-deploy" - [[exemptions.rusty-fork]] version = "0.3.0" criteria = "safe-to-deploy" -[[exemptions.sha2]] -version = "0.9.9" -criteria = "safe-to-deploy" - [[exemptions.sharded-slab]] version = "0.1.4" criteria = "safe-to-run" @@ -742,10 +540,6 @@ criteria = "safe-to-deploy" version = "1.1.2" criteria = "safe-to-deploy" -[[exemptions.signature]] -version = "1.3.2" -criteria = "safe-to-deploy" - [[exemptions.slice-group-by]] version = "0.3.0" criteria = "safe-to-deploy" @@ -766,10 +560,6 @@ criteria = "safe-to-deploy" version = "0.5.2" criteria = "safe-to-deploy" -[[exemptions.spki]] -version = "0.4.1" -criteria = "safe-to-deploy" - [[exemptions.stable_deref_trait]] version = "1.2.0" criteria = "safe-to-deploy" @@ -778,10 +568,6 @@ criteria = "safe-to-deploy" version = "0.10.0" criteria = "safe-to-deploy" -[[exemptions.subtle]] -version = "2.4.1" -criteria = "safe-to-deploy" - [[exemptions.symbolic_expressions]] version = "5.0.3" criteria = "safe-to-run" @@ -794,10 +580,6 @@ criteria = "safe-to-deploy" version = "0.1.17" criteria = "safe-to-deploy" -[[exemptions.textwrap]] -version = "0.15.0" -criteria = "safe-to-deploy" - [[exemptions.thread_local]] version = "1.1.4" criteria = "safe-to-run" @@ -847,10 +629,6 @@ criteria = "safe-to-run" version = "0.2.0" criteria = "safe-to-deploy" -[[exemptions.wasi]] -version = "0.9.0+wasi-snapshot-preview1" -criteria = "safe-to-deploy" - [[exemptions.wasi]] version = "0.11.0+wasi-snapshot-preview1" criteria = "safe-to-deploy" @@ -876,18 +654,6 @@ criteria = "safe-to-deploy" version = "0.4.0" criteria = "safe-to-deploy" -[[exemptions.xoodyak]] -version = "0.7.3" -criteria = "safe-to-deploy" - -[[exemptions.zeroize]] -version = "1.4.3" -criteria = "safe-to-deploy" - -[[exemptions.zeroize_derive]] -version = "1.3.2" -criteria = "safe-to-deploy" - [[exemptions.zstd]] version = "0.11.1+zstd.1.5.2" criteria = "safe-to-deploy" diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock index 4441e07a9156..ca06104a07c9 100644 --- a/supply-chain/imports.lock +++ b/supply-chain/imports.lock @@ -1,578 +1,190 @@ # cargo-vet imports lock -[[unpublished.cranelift]] -version = "0.98.0" -audited_as = "0.97.1" - -[[unpublished.cranelift]] -version = "0.99.0" -audited_as = "0.97.1" - [[unpublished.cranelift]] version = "0.100.0" audited_as = "0.98.1" -[[unpublished.cranelift-bforest]] -version = "0.98.0" -audited_as = "0.97.1" - -[[unpublished.cranelift-bforest]] -version = "0.99.0" -audited_as = "0.97.1" - [[unpublished.cranelift-bforest]] version = "0.100.0" audited_as = "0.98.1" -[[unpublished.cranelift-codegen]] -version = "0.98.0" -audited_as = "0.97.1" - -[[unpublished.cranelift-codegen]] -version = "0.99.0" -audited_as = "0.97.1" - [[unpublished.cranelift-codegen]] version = "0.100.0" audited_as = "0.98.1" -[[unpublished.cranelift-codegen-meta]] -version = "0.98.0" -audited_as = "0.97.1" - -[[unpublished.cranelift-codegen-meta]] -version = "0.99.0" -audited_as = "0.97.1" - [[unpublished.cranelift-codegen-meta]] version = "0.100.0" audited_as = "0.98.1" -[[unpublished.cranelift-codegen-shared]] -version = "0.98.0" -audited_as = "0.97.1" - -[[unpublished.cranelift-codegen-shared]] -version = "0.99.0" -audited_as = "0.97.1" - [[unpublished.cranelift-codegen-shared]] version = "0.100.0" audited_as = "0.98.1" -[[unpublished.cranelift-control]] -version = "0.98.0" -audited_as = "0.97.1" - -[[unpublished.cranelift-control]] -version = "0.99.0" -audited_as = "0.97.1" - [[unpublished.cranelift-control]] version = "0.100.0" audited_as = "0.98.1" -[[unpublished.cranelift-entity]] -version = "0.98.0" -audited_as = "0.97.1" - -[[unpublished.cranelift-entity]] -version = "0.99.0" -audited_as = "0.97.1" - [[unpublished.cranelift-entity]] version = "0.100.0" audited_as = "0.98.1" -[[unpublished.cranelift-frontend]] -version = "0.98.0" -audited_as = "0.97.1" - -[[unpublished.cranelift-frontend]] -version = "0.99.0" -audited_as = "0.97.1" - [[unpublished.cranelift-frontend]] version = "0.100.0" audited_as = "0.98.1" -[[unpublished.cranelift-interpreter]] -version = "0.98.0" -audited_as = "0.97.1" - -[[unpublished.cranelift-interpreter]] -version = "0.99.0" -audited_as = "0.97.1" - [[unpublished.cranelift-interpreter]] version = "0.100.0" audited_as = "0.98.1" -[[unpublished.cranelift-isle]] -version = "0.98.0" -audited_as = "0.97.1" - -[[unpublished.cranelift-isle]] -version = "0.99.0" -audited_as = "0.97.1" - [[unpublished.cranelift-isle]] version = "0.100.0" audited_as = "0.98.1" -[[unpublished.cranelift-jit]] -version = "0.98.0" -audited_as = "0.97.1" - -[[unpublished.cranelift-jit]] -version = "0.99.0" -audited_as = "0.97.1" - [[unpublished.cranelift-jit]] version = "0.100.0" audited_as = "0.98.1" -[[unpublished.cranelift-module]] -version = "0.98.0" -audited_as = "0.97.1" - -[[unpublished.cranelift-module]] -version = "0.99.0" -audited_as = "0.97.1" - [[unpublished.cranelift-module]] version = "0.100.0" audited_as = "0.98.1" -[[unpublished.cranelift-native]] -version = "0.98.0" -audited_as = "0.97.1" - -[[unpublished.cranelift-native]] -version = "0.99.0" -audited_as = "0.97.1" - [[unpublished.cranelift-native]] version = "0.100.0" audited_as = "0.98.1" -[[unpublished.cranelift-object]] -version = "0.98.0" -audited_as = "0.97.1" - -[[unpublished.cranelift-object]] -version = "0.99.0" -audited_as = "0.97.1" - [[unpublished.cranelift-object]] version = "0.100.0" audited_as = "0.98.1" -[[unpublished.cranelift-reader]] -version = "0.98.0" -audited_as = "0.97.1" - -[[unpublished.cranelift-reader]] -version = "0.99.0" -audited_as = "0.97.1" - [[unpublished.cranelift-reader]] version = "0.100.0" audited_as = "0.98.1" -[[unpublished.cranelift-serde]] -version = "0.98.0" -audited_as = "0.97.1" - -[[unpublished.cranelift-serde]] -version = "0.99.0" -audited_as = "0.97.1" - [[unpublished.cranelift-serde]] version = "0.100.0" audited_as = "0.98.1" -[[unpublished.cranelift-wasm]] -version = "0.98.0" -audited_as = "0.97.1" - -[[unpublished.cranelift-wasm]] -version = "0.99.0" -audited_as = "0.97.1" - [[unpublished.cranelift-wasm]] version = "0.100.0" audited_as = "0.98.1" -[[unpublished.wasi-cap-std-sync]] -version = "11.0.0" -audited_as = "10.0.1" - -[[unpublished.wasi-cap-std-sync]] -version = "12.0.0" -audited_as = "10.0.1" - [[unpublished.wasi-cap-std-sync]] version = "13.0.0" audited_as = "11.0.1" -[[unpublished.wasi-common]] -version = "11.0.0" -audited_as = "10.0.1" - -[[unpublished.wasi-common]] -version = "12.0.0" -audited_as = "10.0.1" - [[unpublished.wasi-common]] version = "13.0.0" audited_as = "11.0.1" -[[unpublished.wasi-tokio]] -version = "11.0.0" -audited_as = "10.0.1" - -[[unpublished.wasi-tokio]] -version = "12.0.0" -audited_as = "10.0.1" - [[unpublished.wasi-tokio]] version = "13.0.0" audited_as = "11.0.1" -[[unpublished.wasmtime]] -version = "11.0.0" -audited_as = "10.0.1" - -[[unpublished.wasmtime]] -version = "12.0.0" -audited_as = "10.0.1" - [[unpublished.wasmtime]] version = "13.0.0" audited_as = "11.0.1" -[[unpublished.wasmtime-asm-macros]] -version = "11.0.0" -audited_as = "10.0.1" - -[[unpublished.wasmtime-asm-macros]] -version = "12.0.0" -audited_as = "10.0.1" - [[unpublished.wasmtime-asm-macros]] version = "13.0.0" audited_as = "11.0.1" -[[unpublished.wasmtime-cache]] -version = "11.0.0" -audited_as = "10.0.1" - -[[unpublished.wasmtime-cache]] -version = "12.0.0" -audited_as = "10.0.1" - [[unpublished.wasmtime-cache]] version = "13.0.0" audited_as = "11.0.1" -[[unpublished.wasmtime-cli]] -version = "11.0.0" -audited_as = "10.0.1" - -[[unpublished.wasmtime-cli]] -version = "12.0.0" -audited_as = "10.0.1" - [[unpublished.wasmtime-cli]] version = "13.0.0" audited_as = "11.0.1" -[[unpublished.wasmtime-cli-flags]] -version = "11.0.0" -audited_as = "10.0.1" - -[[unpublished.wasmtime-cli-flags]] -version = "12.0.0" -audited_as = "10.0.1" - [[unpublished.wasmtime-cli-flags]] version = "13.0.0" audited_as = "11.0.1" -[[unpublished.wasmtime-component-macro]] -version = "11.0.0" -audited_as = "10.0.1" - -[[unpublished.wasmtime-component-macro]] -version = "12.0.0" -audited_as = "10.0.1" - [[unpublished.wasmtime-component-macro]] version = "13.0.0" audited_as = "11.0.1" -[[unpublished.wasmtime-component-util]] -version = "11.0.0" -audited_as = "10.0.1" - -[[unpublished.wasmtime-component-util]] -version = "12.0.0" -audited_as = "10.0.1" - [[unpublished.wasmtime-component-util]] version = "13.0.0" audited_as = "11.0.1" -[[unpublished.wasmtime-cranelift]] -version = "11.0.0" -audited_as = "10.0.1" - -[[unpublished.wasmtime-cranelift]] -version = "12.0.0" -audited_as = "10.0.1" - [[unpublished.wasmtime-cranelift]] version = "13.0.0" audited_as = "11.0.1" -[[unpublished.wasmtime-cranelift-shared]] -version = "11.0.0" -audited_as = "10.0.1" - -[[unpublished.wasmtime-cranelift-shared]] -version = "12.0.0" -audited_as = "10.0.1" - [[unpublished.wasmtime-cranelift-shared]] version = "13.0.0" audited_as = "11.0.1" -[[unpublished.wasmtime-environ]] -version = "11.0.0" -audited_as = "10.0.1" - -[[unpublished.wasmtime-environ]] -version = "12.0.0" -audited_as = "10.0.1" - [[unpublished.wasmtime-environ]] version = "13.0.0" audited_as = "11.0.1" -[[unpublished.wasmtime-explorer]] -version = "11.0.0" -audited_as = "10.0.1" - -[[unpublished.wasmtime-explorer]] -version = "12.0.0" -audited_as = "10.0.1" - [[unpublished.wasmtime-explorer]] version = "13.0.0" audited_as = "11.0.1" -[[unpublished.wasmtime-fiber]] -version = "11.0.0" -audited_as = "10.0.1" - -[[unpublished.wasmtime-fiber]] -version = "12.0.0" -audited_as = "10.0.1" - [[unpublished.wasmtime-fiber]] version = "13.0.0" audited_as = "11.0.1" -[[unpublished.wasmtime-jit]] -version = "11.0.0" -audited_as = "10.0.1" - -[[unpublished.wasmtime-jit]] -version = "12.0.0" -audited_as = "10.0.1" - [[unpublished.wasmtime-jit]] version = "13.0.0" audited_as = "11.0.1" -[[unpublished.wasmtime-jit-debug]] -version = "11.0.0" -audited_as = "10.0.1" - -[[unpublished.wasmtime-jit-debug]] -version = "12.0.0" -audited_as = "10.0.1" - [[unpublished.wasmtime-jit-debug]] version = "13.0.0" audited_as = "11.0.1" -[[unpublished.wasmtime-jit-icache-coherence]] -version = "11.0.0" -audited_as = "10.0.1" - -[[unpublished.wasmtime-jit-icache-coherence]] -version = "12.0.0" -audited_as = "10.0.1" - [[unpublished.wasmtime-jit-icache-coherence]] version = "13.0.0" audited_as = "11.0.1" -[[unpublished.wasmtime-runtime]] -version = "11.0.0" -audited_as = "10.0.1" - -[[unpublished.wasmtime-runtime]] -version = "12.0.0" -audited_as = "10.0.1" - [[unpublished.wasmtime-runtime]] version = "13.0.0" audited_as = "11.0.1" -[[unpublished.wasmtime-types]] -version = "11.0.0" -audited_as = "10.0.1" - -[[unpublished.wasmtime-types]] -version = "12.0.0" -audited_as = "10.0.1" - [[unpublished.wasmtime-types]] version = "13.0.0" audited_as = "11.0.1" [[unpublished.wasmtime-wasi]] -version = "11.0.0" -audited_as = "10.0.1" - -[[unpublished.wasmtime-wasi]] -version = "12.0.0" -audited_as = "10.0.1" - -[[unpublished.wasmtime-wasi]] -version = "13.0.0" -audited_as = "11.0.1" - -[[unpublished.wasmtime-wasi-crypto]] -version = "11.0.0" -audited_as = "10.0.1" - -[[unpublished.wasmtime-wasi-crypto]] -version = "12.0.0" -audited_as = "10.0.1" - -[[unpublished.wasmtime-wasi-crypto]] version = "13.0.0" audited_as = "11.0.1" -[[unpublished.wasmtime-wasi-http]] -version = "11.0.0" -audited_as = "10.0.1" - -[[unpublished.wasmtime-wasi-http]] -version = "12.0.0" -audited_as = "10.0.1" - [[unpublished.wasmtime-wasi-http]] version = "13.0.0" audited_as = "11.0.1" -[[unpublished.wasmtime-wasi-nn]] -version = "11.0.0" -audited_as = "10.0.1" - -[[unpublished.wasmtime-wasi-nn]] -version = "12.0.0" -audited_as = "10.0.1" - [[unpublished.wasmtime-wasi-nn]] version = "13.0.0" audited_as = "11.0.1" -[[unpublished.wasmtime-wasi-threads]] -version = "11.0.0" -audited_as = "10.0.1" - -[[unpublished.wasmtime-wasi-threads]] -version = "12.0.0" -audited_as = "10.0.1" - [[unpublished.wasmtime-wasi-threads]] version = "13.0.0" audited_as = "11.0.1" -[[unpublished.wasmtime-wast]] -version = "11.0.0" -audited_as = "10.0.1" - -[[unpublished.wasmtime-wast]] -version = "12.0.0" -audited_as = "10.0.1" - [[unpublished.wasmtime-wast]] version = "13.0.0" audited_as = "11.0.1" -[[unpublished.wasmtime-winch]] -version = "11.0.0" -audited_as = "10.0.1" - -[[unpublished.wasmtime-winch]] -version = "12.0.0" -audited_as = "10.0.1" - [[unpublished.wasmtime-winch]] version = "13.0.0" audited_as = "11.0.1" -[[unpublished.wasmtime-wit-bindgen]] -version = "11.0.0" -audited_as = "10.0.1" - -[[unpublished.wasmtime-wit-bindgen]] -version = "12.0.0" -audited_as = "10.0.1" - [[unpublished.wasmtime-wit-bindgen]] version = "13.0.0" audited_as = "11.0.1" -[[unpublished.wiggle]] -version = "11.0.0" -audited_as = "10.0.1" - -[[unpublished.wiggle]] -version = "12.0.0" -audited_as = "10.0.1" - [[unpublished.wiggle]] version = "13.0.0" audited_as = "11.0.1" -[[unpublished.wiggle-generate]] -version = "11.0.0" -audited_as = "10.0.1" - -[[unpublished.wiggle-generate]] -version = "12.0.0" -audited_as = "10.0.1" - [[unpublished.wiggle-generate]] version = "13.0.0" audited_as = "11.0.1" -[[unpublished.wiggle-macro]] -version = "11.0.0" -audited_as = "10.0.1" - -[[unpublished.wiggle-macro]] -version = "12.0.0" -audited_as = "10.0.1" - [[unpublished.wiggle-macro]] version = "13.0.0" audited_as = "11.0.1" @@ -581,14 +193,6 @@ audited_as = "11.0.1" version = "0.0.0" audited_as = "0.1.0" -[[unpublished.winch-codegen]] -version = "0.9.0" -audited_as = "0.8.1" - -[[unpublished.winch-codegen]] -version = "0.10.0" -audited_as = "0.8.1" - [[unpublished.winch-codegen]] version = "0.11.0" audited_as = "0.9.1" @@ -642,13 +246,6 @@ user-id = 696 user-login = "fitzgen" user-name = "Nick Fitzgerald" -[[publisher.async-trait]] -version = "0.1.53" -when = "2022-03-25" -user-id = 3618 -user-login = "dtolnay" -user-name = "David Tolnay" - [[publisher.async-trait]] version = "0.1.71" when = "2023-07-05" @@ -726,13 +323,6 @@ user-id = 6825 user-login = "sunfishcode" user-name = "Dan Gohman" -[[publisher.clap]] -version = "3.2.8" -when = "2022-06-30" -user-id = 6743 -user-login = "epage" -user-name = "Ed Page" - [[publisher.clap]] version = "4.3.12" when = "2023-07-14" @@ -747,13 +337,6 @@ user-id = 6743 user-login = "epage" user-name = "Ed Page" -[[publisher.clap_derive]] -version = "3.2.7" -when = "2022-06-28" -user-id = 6743 -user-login = "epage" -user-name = "Ed Page" - [[publisher.clap_derive]] version = "4.3.12" when = "2023-07-14" @@ -761,13 +344,6 @@ user-id = 6743 user-login = "epage" user-name = "Ed Page" -[[publisher.clap_lex]] -version = "0.2.4" -when = "2022-06-28" -user-id = 6743 -user-login = "epage" -user-name = "Ed Page" - [[publisher.clap_lex]] version = "0.5.0" when = "2023-05-19" @@ -775,153 +351,75 @@ user-id = 6743 user-login = "epage" user-name = "Ed Page" -[[publisher.cranelift]] -version = "0.97.1" -when = "2023-06-21" -user-id = 73222 -user-login = "wasmtime-publish" - [[publisher.cranelift]] version = "0.98.1" when = "2023-07-24" user-id = 73222 user-login = "wasmtime-publish" -[[publisher.cranelift-bforest]] -version = "0.97.1" -when = "2023-06-21" -user-id = 73222 -user-login = "wasmtime-publish" - [[publisher.cranelift-bforest]] version = "0.98.1" when = "2023-07-24" user-id = 73222 user-login = "wasmtime-publish" -[[publisher.cranelift-codegen]] -version = "0.97.1" -when = "2023-06-21" -user-id = 73222 -user-login = "wasmtime-publish" - [[publisher.cranelift-codegen]] version = "0.98.1" when = "2023-07-24" user-id = 73222 user-login = "wasmtime-publish" -[[publisher.cranelift-codegen-meta]] -version = "0.97.1" -when = "2023-06-21" -user-id = 73222 -user-login = "wasmtime-publish" - [[publisher.cranelift-codegen-meta]] version = "0.98.1" when = "2023-07-24" user-id = 73222 user-login = "wasmtime-publish" -[[publisher.cranelift-codegen-shared]] -version = "0.97.1" -when = "2023-06-21" -user-id = 73222 -user-login = "wasmtime-publish" - [[publisher.cranelift-codegen-shared]] version = "0.98.1" when = "2023-07-24" user-id = 73222 user-login = "wasmtime-publish" -[[publisher.cranelift-control]] -version = "0.97.1" -when = "2023-06-21" -user-id = 73222 -user-login = "wasmtime-publish" - [[publisher.cranelift-control]] version = "0.98.1" when = "2023-07-24" user-id = 73222 user-login = "wasmtime-publish" -[[publisher.cranelift-entity]] -version = "0.97.1" -when = "2023-06-21" -user-id = 73222 -user-login = "wasmtime-publish" - [[publisher.cranelift-entity]] version = "0.98.1" when = "2023-07-24" user-id = 73222 user-login = "wasmtime-publish" -[[publisher.cranelift-frontend]] -version = "0.97.1" -when = "2023-06-21" -user-id = 73222 -user-login = "wasmtime-publish" - [[publisher.cranelift-frontend]] version = "0.98.1" when = "2023-07-24" user-id = 73222 user-login = "wasmtime-publish" -[[publisher.cranelift-interpreter]] -version = "0.97.1" -when = "2023-06-21" -user-id = 73222 -user-login = "wasmtime-publish" - [[publisher.cranelift-interpreter]] version = "0.98.1" when = "2023-07-24" user-id = 73222 user-login = "wasmtime-publish" -[[publisher.cranelift-isle]] -version = "0.97.1" -when = "2023-06-21" -user-id = 73222 -user-login = "wasmtime-publish" - [[publisher.cranelift-isle]] version = "0.98.1" when = "2023-07-24" user-id = 73222 user-login = "wasmtime-publish" -[[publisher.cranelift-jit]] -version = "0.97.1" -when = "2023-06-21" -user-id = 73222 -user-login = "wasmtime-publish" - [[publisher.cranelift-jit]] version = "0.98.1" when = "2023-07-24" user-id = 73222 user-login = "wasmtime-publish" -[[publisher.cranelift-module]] -version = "0.97.1" -when = "2023-06-21" -user-id = 73222 -user-login = "wasmtime-publish" - [[publisher.cranelift-module]] version = "0.98.1" -when = "2023-07-24" -user-id = 73222 -user-login = "wasmtime-publish" - -[[publisher.cranelift-native]] -version = "0.97.1" -when = "2023-06-21" +when = "2023-07-24" user-id = 73222 user-login = "wasmtime-publish" @@ -931,48 +429,24 @@ when = "2023-07-24" user-id = 73222 user-login = "wasmtime-publish" -[[publisher.cranelift-object]] -version = "0.97.1" -when = "2023-06-21" -user-id = 73222 -user-login = "wasmtime-publish" - [[publisher.cranelift-object]] version = "0.98.1" when = "2023-07-24" user-id = 73222 user-login = "wasmtime-publish" -[[publisher.cranelift-reader]] -version = "0.97.1" -when = "2023-06-21" -user-id = 73222 -user-login = "wasmtime-publish" - [[publisher.cranelift-reader]] version = "0.98.1" when = "2023-07-24" user-id = 73222 user-login = "wasmtime-publish" -[[publisher.cranelift-serde]] -version = "0.97.1" -when = "2023-06-21" -user-id = 73222 -user-login = "wasmtime-publish" - [[publisher.cranelift-serde]] version = "0.98.1" when = "2023-07-24" user-id = 73222 user-login = "wasmtime-publish" -[[publisher.cranelift-wasm]] -version = "0.97.1" -when = "2023-06-21" -user-id = 73222 -user-login = "wasmtime-publish" - [[publisher.cranelift-wasm]] version = "0.98.1" when = "2023-07-24" @@ -1049,13 +523,6 @@ user-id = 6825 user-login = "sunfishcode" user-name = "Dan Gohman" -[[publisher.is-terminal]] -version = "0.4.9" -when = "2023-07-06" -user-id = 6825 -user-login = "sunfishcode" -user-name = "Dan Gohman" - [[publisher.itoa]] version = "1.0.1" when = "2021-12-12" @@ -1063,13 +530,6 @@ user-id = 3618 user-login = "dtolnay" user-name = "David Tolnay" -[[publisher.libc]] -version = "0.2.132" -when = "2022-08-16" -user-id = 2915 -user-login = "Amanieu" -user-name = "Amanieu d'Antras" - [[publisher.libc]] version = "0.2.146" when = "2023-06-06" @@ -1091,13 +551,6 @@ user-id = 6825 user-login = "sunfishcode" user-name = "Dan Gohman" -[[publisher.lock_api]] -version = "0.4.7" -when = "2022-03-30" -user-id = 2915 -user-login = "Amanieu" -user-name = "Amanieu d'Antras" - [[publisher.memchr]] version = "2.5.0" when = "2022-04-30" @@ -1105,20 +558,6 @@ user-id = 189 user-login = "BurntSushi" user-name = "Andrew Gallant" -[[publisher.parking_lot]] -version = "0.11.2" -when = "2021-08-27" -user-id = 2915 -user-login = "Amanieu" -user-name = "Amanieu d'Antras" - -[[publisher.parking_lot_core]] -version = "0.8.5" -when = "2021-08-28" -user-id = 2915 -user-login = "Amanieu" -user-name = "Amanieu d'Antras" - [[publisher.paste]] version = "1.0.7" when = "2022-03-27" @@ -1133,13 +572,6 @@ user-id = 3618 user-login = "dtolnay" user-name = "David Tolnay" -[[publisher.regalloc2]] -version = "0.9.1" -when = "2023-05-31" -user-id = 187138 -user-login = "elliottt" -user-name = "Trevor Elliott" - [[publisher.regalloc2]] version = "0.9.2" when = "2023-07-14" @@ -1210,13 +642,6 @@ user-id = 2915 user-login = "Amanieu" user-name = "Amanieu d'Antras" -[[publisher.serde]] -version = "1.0.137" -when = "2022-05-01" -user-id = 3618 -user-login = "dtolnay" -user-name = "David Tolnay" - [[publisher.serde]] version = "1.0.171" when = "2023-07-10" @@ -1224,13 +649,6 @@ user-id = 3618 user-login = "dtolnay" user-name = "David Tolnay" -[[publisher.serde_derive]] -version = "1.0.137" -when = "2022-05-01" -user-id = 3618 -user-login = "dtolnay" -user-name = "David Tolnay" - [[publisher.serde_derive]] version = "1.0.171" when = "2023-07-10" @@ -1258,13 +676,6 @@ user-id = 3618 user-login = "dtolnay" user-name = "David Tolnay" -[[publisher.syn]] -version = "2.0.16" -when = "2023-05-14" -user-id = 3618 -user-login = "dtolnay" -user-name = "David Tolnay" - [[publisher.syn]] version = "2.0.25" when = "2023-07-09" @@ -1293,13 +704,6 @@ user-id = 189 user-login = "BurntSushi" user-name = "Andrew Gallant" -[[publisher.thiserror]] -version = "1.0.31" -when = "2022-04-30" -user-id = 3618 -user-login = "dtolnay" -user-name = "David Tolnay" - [[publisher.thiserror]] version = "1.0.43" when = "2023-07-07" @@ -1307,13 +711,6 @@ user-id = 3618 user-login = "dtolnay" user-name = "David Tolnay" -[[publisher.thiserror-impl]] -version = "1.0.31" -when = "2022-04-30" -user-id = 3618 -user-login = "dtolnay" -user-name = "David Tolnay" - [[publisher.thiserror-impl]] version = "1.0.43" when = "2023-07-07" @@ -1356,36 +753,18 @@ user-id = 189 user-login = "BurntSushi" user-name = "Andrew Gallant" -[[publisher.wasi-cap-std-sync]] -version = "10.0.1" -when = "2023-06-21" -user-id = 73222 -user-login = "wasmtime-publish" - [[publisher.wasi-cap-std-sync]] version = "11.0.1" when = "2023-07-24" user-id = 73222 user-login = "wasmtime-publish" -[[publisher.wasi-common]] -version = "10.0.1" -when = "2023-06-21" -user-id = 73222 -user-login = "wasmtime-publish" - [[publisher.wasi-common]] version = "11.0.1" when = "2023-07-24" user-id = 73222 user-login = "wasmtime-publish" -[[publisher.wasi-tokio]] -version = "10.0.1" -when = "2023-06-21" -user-id = 73222 -user-login = "wasmtime-publish" - [[publisher.wasi-tokio]] version = "11.0.1" when = "2023-07-24" @@ -1427,13 +806,6 @@ user-id = 1 user-login = "alexcrichton" user-name = "Alex Crichton" -[[publisher.wasm-encoder]] -version = "0.29.0" -when = "2023-05-26" -user-id = 1 -user-login = "alexcrichton" -user-name = "Alex Crichton" - [[publisher.wasm-encoder]] version = "0.30.0" when = "2023-07-11" @@ -1441,13 +813,6 @@ user-id = 1 user-login = "alexcrichton" user-name = "Alex Crichton" -[[publisher.wasm-encoder]] -version = "0.31.0" -when = "2023-07-17" -user-id = 1 -user-login = "alexcrichton" -user-name = "Alex Crichton" - [[publisher.wasm-encoder]] version = "0.31.1" when = "2023-07-26" @@ -1455,13 +820,6 @@ user-id = 1 user-login = "alexcrichton" user-name = "Alex Crichton" -[[publisher.wasm-metadata]] -version = "0.8.0" -when = "2023-05-26" -user-id = 1 -user-login = "alexcrichton" -user-name = "Alex Crichton" - [[publisher.wasm-metadata]] version = "0.9.0" when = "2023-07-11" @@ -1469,13 +827,6 @@ user-id = 1 user-login = "alexcrichton" user-name = "Alex Crichton" -[[publisher.wasm-metadata]] -version = "0.10.0" -when = "2023-07-17" -user-id = 1 -user-login = "alexcrichton" -user-name = "Alex Crichton" - [[publisher.wasm-metadata]] version = "0.10.1" when = "2023-07-26" @@ -1483,27 +834,6 @@ user-id = 1 user-login = "alexcrichton" user-name = "Alex Crichton" -[[publisher.wasm-mutate]] -version = "0.2.27" -when = "2023-05-26" -user-id = 1 -user-login = "alexcrichton" -user-name = "Alex Crichton" - -[[publisher.wasm-mutate]] -version = "0.2.28" -when = "2023-07-11" -user-id = 1 -user-login = "alexcrichton" -user-name = "Alex Crichton" - -[[publisher.wasm-mutate]] -version = "0.2.29" -when = "2023-07-17" -user-id = 1 -user-login = "alexcrichton" -user-name = "Alex Crichton" - [[publisher.wasm-mutate]] version = "0.2.30" when = "2023-07-26" @@ -1511,27 +841,6 @@ user-id = 1 user-login = "alexcrichton" user-name = "Alex Crichton" -[[publisher.wasm-smith]] -version = "0.12.10" -when = "2023-05-26" -user-id = 1 -user-login = "alexcrichton" -user-name = "Alex Crichton" - -[[publisher.wasm-smith]] -version = "0.12.11" -when = "2023-07-11" -user-id = 1 -user-login = "alexcrichton" -user-name = "Alex Crichton" - -[[publisher.wasm-smith]] -version = "0.12.12" -when = "2023-07-17" -user-id = 1 -user-login = "alexcrichton" -user-name = "Alex Crichton" - [[publisher.wasm-smith]] version = "0.12.13" when = "2023-07-26" @@ -1539,13 +848,6 @@ user-id = 1 user-login = "alexcrichton" user-name = "Alex Crichton" -[[publisher.wasmparser]] -version = "0.107.0" -when = "2023-05-26" -user-id = 1 -user-login = "alexcrichton" -user-name = "Alex Crichton" - [[publisher.wasmparser]] version = "0.108.0" when = "2023-07-11" @@ -1553,13 +855,6 @@ user-id = 1 user-login = "alexcrichton" user-name = "Alex Crichton" -[[publisher.wasmparser]] -version = "0.109.0" -when = "2023-07-17" -user-id = 1 -user-login = "alexcrichton" -user-name = "Alex Crichton" - [[publisher.wasmparser]] version = "0.110.0" when = "2023-07-26" @@ -1567,27 +862,6 @@ user-id = 1 user-login = "alexcrichton" user-name = "Alex Crichton" -[[publisher.wasmprinter]] -version = "0.2.59" -when = "2023-05-26" -user-id = 1 -user-login = "alexcrichton" -user-name = "Alex Crichton" - -[[publisher.wasmprinter]] -version = "0.2.60" -when = "2023-07-11" -user-id = 1 -user-login = "alexcrichton" -user-name = "Alex Crichton" - -[[publisher.wasmprinter]] -version = "0.2.61" -when = "2023-07-17" -user-id = 1 -user-login = "alexcrichton" -user-name = "Alex Crichton" - [[publisher.wasmprinter]] version = "0.2.62" when = "2023-07-26" @@ -1595,84 +869,42 @@ user-id = 1 user-login = "alexcrichton" user-name = "Alex Crichton" -[[publisher.wasmtime]] -version = "10.0.1" -when = "2023-06-21" -user-id = 73222 -user-login = "wasmtime-publish" - [[publisher.wasmtime]] version = "11.0.1" when = "2023-07-24" user-id = 73222 user-login = "wasmtime-publish" -[[publisher.wasmtime-asm-macros]] -version = "10.0.1" -when = "2023-06-21" -user-id = 73222 -user-login = "wasmtime-publish" - [[publisher.wasmtime-asm-macros]] version = "11.0.1" when = "2023-07-24" user-id = 73222 user-login = "wasmtime-publish" -[[publisher.wasmtime-cache]] -version = "10.0.1" -when = "2023-06-21" -user-id = 73222 -user-login = "wasmtime-publish" - [[publisher.wasmtime-cache]] version = "11.0.1" when = "2023-07-24" user-id = 73222 user-login = "wasmtime-publish" -[[publisher.wasmtime-cli]] -version = "10.0.1" -when = "2023-06-21" -user-id = 73222 -user-login = "wasmtime-publish" - [[publisher.wasmtime-cli]] version = "11.0.1" when = "2023-07-24" user-id = 73222 user-login = "wasmtime-publish" -[[publisher.wasmtime-cli-flags]] -version = "10.0.1" -when = "2023-06-21" -user-id = 73222 -user-login = "wasmtime-publish" - [[publisher.wasmtime-cli-flags]] version = "11.0.1" when = "2023-07-24" user-id = 73222 user-login = "wasmtime-publish" -[[publisher.wasmtime-component-macro]] -version = "10.0.1" -when = "2023-06-21" -user-id = 73222 -user-login = "wasmtime-publish" - [[publisher.wasmtime-component-macro]] version = "11.0.1" when = "2023-07-24" user-id = 73222 user-login = "wasmtime-publish" -[[publisher.wasmtime-component-util]] -version = "10.0.1" -when = "2023-06-21" -user-id = 73222 -user-login = "wasmtime-publish" - [[publisher.wasmtime-component-util]] version = "11.0.1" when = "2023-07-24" @@ -1680,152 +912,68 @@ user-id = 73222 user-login = "wasmtime-publish" [[publisher.wasmtime-cranelift]] -version = "10.0.1" -when = "2023-06-21" -user-id = 73222 -user-login = "wasmtime-publish" - -[[publisher.wasmtime-cranelift]] -version = "11.0.1" -when = "2023-07-24" -user-id = 73222 -user-login = "wasmtime-publish" - -[[publisher.wasmtime-cranelift-shared]] -version = "10.0.1" -when = "2023-06-21" -user-id = 73222 -user-login = "wasmtime-publish" - -[[publisher.wasmtime-cranelift-shared]] -version = "11.0.1" -when = "2023-07-24" -user-id = 73222 -user-login = "wasmtime-publish" - -[[publisher.wasmtime-environ]] -version = "10.0.1" -when = "2023-06-21" -user-id = 73222 -user-login = "wasmtime-publish" - -[[publisher.wasmtime-environ]] -version = "11.0.1" -when = "2023-07-24" -user-id = 73222 -user-login = "wasmtime-publish" - -[[publisher.wasmtime-explorer]] -version = "10.0.1" -when = "2023-06-21" -user-id = 73222 -user-login = "wasmtime-publish" - -[[publisher.wasmtime-explorer]] -version = "11.0.1" -when = "2023-07-24" -user-id = 73222 -user-login = "wasmtime-publish" - -[[publisher.wasmtime-fiber]] -version = "10.0.1" -when = "2023-06-21" -user-id = 73222 -user-login = "wasmtime-publish" - -[[publisher.wasmtime-fiber]] -version = "11.0.1" -when = "2023-07-24" -user-id = 73222 -user-login = "wasmtime-publish" - -[[publisher.wasmtime-jit]] -version = "10.0.1" -when = "2023-06-21" -user-id = 73222 -user-login = "wasmtime-publish" - -[[publisher.wasmtime-jit]] -version = "11.0.1" -when = "2023-07-24" -user-id = 73222 -user-login = "wasmtime-publish" - -[[publisher.wasmtime-jit-debug]] -version = "10.0.1" -when = "2023-06-21" -user-id = 73222 -user-login = "wasmtime-publish" - -[[publisher.wasmtime-jit-debug]] version = "11.0.1" -when = "2023-07-24" -user-id = 73222 -user-login = "wasmtime-publish" - -[[publisher.wasmtime-jit-icache-coherence]] -version = "10.0.1" -when = "2023-06-21" +when = "2023-07-24" user-id = 73222 user-login = "wasmtime-publish" -[[publisher.wasmtime-jit-icache-coherence]] +[[publisher.wasmtime-cranelift-shared]] version = "11.0.1" when = "2023-07-24" user-id = 73222 user-login = "wasmtime-publish" -[[publisher.wasmtime-runtime]] -version = "10.0.1" -when = "2023-06-21" +[[publisher.wasmtime-environ]] +version = "11.0.1" +when = "2023-07-24" user-id = 73222 user-login = "wasmtime-publish" -[[publisher.wasmtime-runtime]] +[[publisher.wasmtime-explorer]] version = "11.0.1" when = "2023-07-24" user-id = 73222 user-login = "wasmtime-publish" -[[publisher.wasmtime-types]] -version = "10.0.1" -when = "2023-06-21" +[[publisher.wasmtime-fiber]] +version = "11.0.1" +when = "2023-07-24" user-id = 73222 user-login = "wasmtime-publish" -[[publisher.wasmtime-types]] +[[publisher.wasmtime-jit]] version = "11.0.1" when = "2023-07-24" user-id = 73222 user-login = "wasmtime-publish" -[[publisher.wasmtime-wasi]] -version = "10.0.1" -when = "2023-06-21" +[[publisher.wasmtime-jit-debug]] +version = "11.0.1" +when = "2023-07-24" user-id = 73222 user-login = "wasmtime-publish" -[[publisher.wasmtime-wasi]] +[[publisher.wasmtime-jit-icache-coherence]] version = "11.0.1" when = "2023-07-24" user-id = 73222 user-login = "wasmtime-publish" -[[publisher.wasmtime-wasi-crypto]] -version = "10.0.1" -when = "2023-06-21" +[[publisher.wasmtime-runtime]] +version = "11.0.1" +when = "2023-07-24" user-id = 73222 user-login = "wasmtime-publish" -[[publisher.wasmtime-wasi-crypto]] +[[publisher.wasmtime-types]] version = "11.0.1" when = "2023-07-24" user-id = 73222 user-login = "wasmtime-publish" -[[publisher.wasmtime-wasi-http]] -version = "10.0.1" -when = "2023-06-21" +[[publisher.wasmtime-wasi]] +version = "11.0.1" +when = "2023-07-24" user-id = 73222 user-login = "wasmtime-publish" @@ -1835,87 +983,36 @@ when = "2023-07-24" user-id = 73222 user-login = "wasmtime-publish" -[[publisher.wasmtime-wasi-nn]] -version = "10.0.1" -when = "2023-06-21" -user-id = 73222 -user-login = "wasmtime-publish" - [[publisher.wasmtime-wasi-nn]] version = "11.0.1" when = "2023-07-24" user-id = 73222 user-login = "wasmtime-publish" -[[publisher.wasmtime-wasi-threads]] -version = "10.0.1" -when = "2023-06-21" -user-id = 73222 -user-login = "wasmtime-publish" - [[publisher.wasmtime-wasi-threads]] version = "11.0.1" when = "2023-07-24" user-id = 73222 user-login = "wasmtime-publish" -[[publisher.wasmtime-wast]] -version = "10.0.1" -when = "2023-06-21" -user-id = 73222 -user-login = "wasmtime-publish" - [[publisher.wasmtime-wast]] version = "11.0.1" when = "2023-07-24" user-id = 73222 user-login = "wasmtime-publish" -[[publisher.wasmtime-winch]] -version = "10.0.1" -when = "2023-06-21" -user-id = 73222 -user-login = "wasmtime-publish" - [[publisher.wasmtime-winch]] version = "11.0.1" when = "2023-07-24" user-id = 73222 user-login = "wasmtime-publish" -[[publisher.wasmtime-wit-bindgen]] -version = "10.0.1" -when = "2023-06-21" -user-id = 73222 -user-login = "wasmtime-publish" - [[publisher.wasmtime-wit-bindgen]] version = "11.0.1" when = "2023-07-24" user-id = 73222 user-login = "wasmtime-publish" -[[publisher.wast]] -version = "60.0.0" -when = "2023-05-26" -user-id = 1 -user-login = "alexcrichton" -user-name = "Alex Crichton" - -[[publisher.wast]] -version = "61.0.0" -when = "2023-07-11" -user-id = 1 -user-login = "alexcrichton" -user-name = "Alex Crichton" - -[[publisher.wast]] -version = "62.0.0" -when = "2023-07-17" -user-id = 1 -user-login = "alexcrichton" -user-name = "Alex Crichton" - [[publisher.wast]] version = "62.0.1" when = "2023-07-26" @@ -1923,27 +1020,6 @@ user-id = 1 user-login = "alexcrichton" user-name = "Alex Crichton" -[[publisher.wat]] -version = "1.0.66" -when = "2023-05-26" -user-id = 1 -user-login = "alexcrichton" -user-name = "Alex Crichton" - -[[publisher.wat]] -version = "1.0.67" -when = "2023-07-11" -user-id = 1 -user-login = "alexcrichton" -user-name = "Alex Crichton" - -[[publisher.wat]] -version = "1.0.68" -when = "2023-07-17" -user-id = 1 -user-login = "alexcrichton" -user-name = "Alex Crichton" - [[publisher.wat]] version = "1.0.69" when = "2023-07-26" @@ -1951,36 +1027,18 @@ user-id = 1 user-login = "alexcrichton" user-name = "Alex Crichton" -[[publisher.wiggle]] -version = "10.0.1" -when = "2023-06-21" -user-id = 73222 -user-login = "wasmtime-publish" - [[publisher.wiggle]] version = "11.0.1" when = "2023-07-24" user-id = 73222 user-login = "wasmtime-publish" -[[publisher.wiggle-generate]] -version = "10.0.1" -when = "2023-06-21" -user-id = 73222 -user-login = "wasmtime-publish" - [[publisher.wiggle-generate]] version = "11.0.1" when = "2023-07-24" user-id = 73222 user-login = "wasmtime-publish" -[[publisher.wiggle-macro]] -version = "10.0.1" -when = "2023-06-21" -user-id = 73222 -user-login = "wasmtime-publish" - [[publisher.wiggle-macro]] version = "11.0.1" when = "2023-07-24" @@ -2001,25 +1059,12 @@ user-id = 189 user-login = "BurntSushi" user-name = "Andrew Gallant" -[[publisher.winch-codegen]] -version = "0.8.1" -when = "2023-06-21" -user-id = 73222 -user-login = "wasmtime-publish" - [[publisher.winch-codegen]] version = "0.9.1" when = "2023-07-24" user-id = 73222 user-login = "wasmtime-publish" -[[publisher.windows-sys]] -version = "0.45.0" -when = "2023-01-21" -user-id = 64539 -user-login = "kennykerr" -user-name = "Kenny Kerr" - [[publisher.windows-sys]] version = "0.48.0" when = "2023-03-31" @@ -2027,13 +1072,6 @@ user-id = 64539 user-login = "kennykerr" user-name = "Kenny Kerr" -[[publisher.windows-targets]] -version = "0.42.1" -when = "2023-01-12" -user-id = 64539 -user-login = "kennykerr" -user-name = "Kenny Kerr" - [[publisher.windows-targets]] version = "0.48.0" when = "2023-03-31" @@ -2041,13 +1079,6 @@ user-id = 64539 user-login = "kennykerr" user-name = "Kenny Kerr" -[[publisher.windows_aarch64_gnullvm]] -version = "0.42.1" -when = "2023-01-12" -user-id = 64539 -user-login = "kennykerr" -user-name = "Kenny Kerr" - [[publisher.windows_aarch64_gnullvm]] version = "0.48.0" when = "2023-03-31" @@ -2055,13 +1086,6 @@ user-id = 64539 user-login = "kennykerr" user-name = "Kenny Kerr" -[[publisher.windows_aarch64_msvc]] -version = "0.42.1" -when = "2023-01-12" -user-id = 64539 -user-login = "kennykerr" -user-name = "Kenny Kerr" - [[publisher.windows_aarch64_msvc]] version = "0.48.0" when = "2023-03-31" @@ -2069,13 +1093,6 @@ user-id = 64539 user-login = "kennykerr" user-name = "Kenny Kerr" -[[publisher.windows_i686_gnu]] -version = "0.42.1" -when = "2023-01-12" -user-id = 64539 -user-login = "kennykerr" -user-name = "Kenny Kerr" - [[publisher.windows_i686_gnu]] version = "0.48.0" when = "2023-03-31" @@ -2083,13 +1100,6 @@ user-id = 64539 user-login = "kennykerr" user-name = "Kenny Kerr" -[[publisher.windows_i686_msvc]] -version = "0.42.1" -when = "2023-01-12" -user-id = 64539 -user-login = "kennykerr" -user-name = "Kenny Kerr" - [[publisher.windows_i686_msvc]] version = "0.48.0" when = "2023-03-31" @@ -2097,13 +1107,6 @@ user-id = 64539 user-login = "kennykerr" user-name = "Kenny Kerr" -[[publisher.windows_x86_64_gnu]] -version = "0.42.1" -when = "2023-01-12" -user-id = 64539 -user-login = "kennykerr" -user-name = "Kenny Kerr" - [[publisher.windows_x86_64_gnu]] version = "0.48.0" when = "2023-03-31" @@ -2111,13 +1114,6 @@ user-id = 64539 user-login = "kennykerr" user-name = "Kenny Kerr" -[[publisher.windows_x86_64_gnullvm]] -version = "0.42.1" -when = "2023-01-12" -user-id = 64539 -user-login = "kennykerr" -user-name = "Kenny Kerr" - [[publisher.windows_x86_64_gnullvm]] version = "0.48.0" when = "2023-03-31" @@ -2125,13 +1121,6 @@ user-id = 64539 user-login = "kennykerr" user-name = "Kenny Kerr" -[[publisher.windows_x86_64_msvc]] -version = "0.42.1" -when = "2023-01-12" -user-id = 64539 -user-login = "kennykerr" -user-name = "Kenny Kerr" - [[publisher.windows_x86_64_msvc]] version = "0.48.0" when = "2023-03-31" @@ -2146,13 +1135,6 @@ user-id = 6825 user-login = "sunfishcode" user-name = "Dan Gohman" -[[publisher.wit-bindgen]] -version = "0.7.0" -when = "2023-05-26" -user-id = 1 -user-login = "alexcrichton" -user-name = "Alex Crichton" - [[publisher.wit-bindgen]] version = "0.9.0" when = "2023-07-15" @@ -2160,13 +1142,6 @@ user-id = 1 user-login = "alexcrichton" user-name = "Alex Crichton" -[[publisher.wit-bindgen-core]] -version = "0.7.0" -when = "2023-05-26" -user-id = 1 -user-login = "alexcrichton" -user-name = "Alex Crichton" - [[publisher.wit-bindgen-core]] version = "0.9.0" when = "2023-07-15" @@ -2174,13 +1149,6 @@ user-id = 1 user-login = "alexcrichton" user-name = "Alex Crichton" -[[publisher.wit-bindgen-rust]] -version = "0.7.0" -when = "2023-05-26" -user-id = 1 -user-login = "alexcrichton" -user-name = "Alex Crichton" - [[publisher.wit-bindgen-rust]] version = "0.9.0" when = "2023-07-15" @@ -2188,13 +1156,6 @@ user-id = 1 user-login = "alexcrichton" user-name = "Alex Crichton" -[[publisher.wit-bindgen-rust-lib]] -version = "0.7.0" -when = "2023-05-26" -user-id = 1 -user-login = "alexcrichton" -user-name = "Alex Crichton" - [[publisher.wit-bindgen-rust-lib]] version = "0.9.0" when = "2023-07-15" @@ -2202,13 +1163,6 @@ user-id = 1 user-login = "alexcrichton" user-name = "Alex Crichton" -[[publisher.wit-bindgen-rust-macro]] -version = "0.7.0" -when = "2023-05-26" -user-id = 1 -user-login = "alexcrichton" -user-name = "Alex Crichton" - [[publisher.wit-bindgen-rust-macro]] version = "0.9.0" when = "2023-07-15" @@ -2216,13 +1170,6 @@ user-id = 1 user-login = "alexcrichton" user-name = "Alex Crichton" -[[publisher.wit-component]] -version = "0.11.0" -when = "2023-05-26" -user-id = 1 -user-login = "alexcrichton" -user-name = "Alex Crichton" - [[publisher.wit-component]] version = "0.12.0" when = "2023-07-11" @@ -2230,13 +1177,6 @@ user-id = 1 user-login = "alexcrichton" user-name = "Alex Crichton" -[[publisher.wit-component]] -version = "0.13.0" -when = "2023-07-17" -user-id = 1 -user-login = "alexcrichton" -user-name = "Alex Crichton" - [[publisher.wit-component]] version = "0.13.1" when = "2023-07-26" @@ -2244,27 +1184,6 @@ user-id = 1 user-login = "alexcrichton" user-name = "Alex Crichton" -[[publisher.wit-parser]] -version = "0.8.0" -when = "2023-05-26" -user-id = 1 -user-login = "alexcrichton" -user-name = "Alex Crichton" - -[[publisher.wit-parser]] -version = "0.9.0" -when = "2023-07-11" -user-id = 1 -user-login = "alexcrichton" -user-name = "Alex Crichton" - -[[publisher.wit-parser]] -version = "0.9.1" -when = "2023-07-17" -user-id = 1 -user-login = "alexcrichton" -user-name = "Alex Crichton" - [[publisher.wit-parser]] version = "0.9.2" when = "2023-07-26" @@ -2319,12 +1238,6 @@ criteria = "safe-to-deploy" version = "0.2.1" notes = "Single unsafe usage that looks sound, no ambient capabilities" -[[audits.embark-studios.audits.valuable]] -who = "Johan Andersson " -criteria = "safe-to-deploy" -version = "0.1.0" -notes = "No unsafe usage or ambient capabilities, sane build script" - [[audits.embark-studios.audits.webpki-roots]] who = "Johan Andersson " criteria = "safe-to-deploy" @@ -2358,23 +1271,12 @@ criteria = "safe-to-run" version = "0.4.4" aggregated-from = "https://chromium.googlesource.com/chromiumos/third_party/rust_crates/+/main/cargo-vet/audits.toml?format=TEXT" -[[audits.google.audits.miniz_oxide]] -who = "George Burgess IV " -criteria = "safe-to-run" -version = "0.6.2" -aggregated-from = "https://chromium.googlesource.com/chromiumos/third_party/rust_crates/+/main/cargo-vet/audits.toml?format=TEXT" - -[[audits.google.audits.miniz_oxide]] -who = "George Burgess IV " -criteria = "safe-to-run" -delta = "0.6.2 -> 0.7.1" -aggregated-from = "https://chromium.googlesource.com/chromiumos/third_party/rust_crates/+/main/cargo-vet/audits.toml?format=TEXT" - -[[audits.google.audits.proc-macro-error-attr]] -who = "George Burgess IV " +[[audits.google.audits.pin-project-lite]] +who = "David Koloski " criteria = "safe-to-deploy" -version = "1.0.4" -aggregated-from = "https://chromium.googlesource.com/chromiumos/third_party/rust_crates/+/main/cargo-vet/audits.toml?format=TEXT" +version = "0.2.9" +notes = "Reviewed on https://fxrev.dev/824504" +aggregated-from = "https://fuchsia.googlesource.com/fuchsia/+/refs/heads/main/third_party/rust_crates/supply-chain/audits.toml?format=TEXT" [[audits.google.audits.static_assertions]] who = "ChromeOS" @@ -2398,11 +1300,6 @@ who = "Brandon Pitman " criteria = "safe-to-run" delta = "0.4.0 -> 0.5.1" -[[audits.isrg.audits.libc]] -who = "Brandon Pitman " -criteria = "safe-to-deploy" -delta = "0.2.139 -> 0.2.141" - [[audits.isrg.audits.once_cell]] who = "Brandon Pitman " criteria = "safe-to-deploy" @@ -2413,26 +1310,21 @@ who = "David Cook " criteria = "safe-to-deploy" delta = "1.17.2 -> 1.18.0" -[[audits.isrg.audits.opaque-debug]] +[[audits.isrg.audits.rand_core]] who = "David Cook " criteria = "safe-to-deploy" -version = "0.3.0" +version = "0.6.3" -[[audits.isrg.audits.universal-hash]] +[[audits.isrg.audits.sha2]] who = "David Cook " criteria = "safe-to-deploy" -version = "0.4.1" +version = "0.10.2" [[audits.isrg.audits.untrusted]] who = "David Cook " criteria = "safe-to-deploy" version = "0.7.1" -[[audits.isrg.audits.wasm-bindgen-shared]] -who = "David Cook " -criteria = "safe-to-deploy" -version = "0.2.83" - [[audits.mozilla.wildcard-audits.unicode-segmentation]] who = "Manish Goregaokar " criteria = "safe-to-deploy" @@ -2667,18 +1559,6 @@ version = "1.4.0" notes = "I have read over the macros, and audited the unsafe code." aggregated-from = "https://raw.githubusercontent.com/mozilla/cargo-vet/main/supply-chain/audits.toml" -[[audits.mozilla.audits.libc]] -who = "Mike Hommey " -criteria = "safe-to-deploy" -delta = "0.2.132 -> 0.2.138" -aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml" - -[[audits.mozilla.audits.libc]] -who = "Mike Hommey " -criteria = "safe-to-deploy" -delta = "0.2.138 -> 0.2.139" -aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml" - [[audits.mozilla.audits.log]] who = "Mike Hommey " criteria = "safe-to-deploy" @@ -2691,20 +1571,6 @@ criteria = "safe-to-deploy" delta = "0.6.5 -> 0.7.1" aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml" -[[audits.mozilla.audits.num-integer]] -who = "Josh Stone " -criteria = "safe-to-deploy" -version = "0.1.45" -notes = "All code written or reviewed by Josh Stone." -aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml" - -[[audits.mozilla.audits.num-iter]] -who = "Josh Stone " -criteria = "safe-to-deploy" -version = "0.1.43" -notes = "All code written or reviewed by Josh Stone." -aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml" - [[audits.mozilla.audits.num-traits]] who = "Josh Stone " criteria = "safe-to-deploy" @@ -2797,34 +1663,6 @@ delta = "1.0.57 -> 1.0.59" notes = "Enabled on Wasm" aggregated-from = "https://raw.githubusercontent.com/mozilla/glean/main/supply-chain/audits.toml" -[[audits.mozilla.audits.quote]] -who = "Nika Layzell " -criteria = "safe-to-deploy" -version = "1.0.18" -notes = """ -`quote` is a utility crate used by proc-macros to generate TokenStreams -conveniently from source code. The bulk of the logic is some complex -interlocking `macro_rules!` macros which are used to parse and build the -`TokenStream` within the proc-macro. - -This crate contains no unsafe code, and the internal logic, while difficult to -read, is generally straightforward. I have audited the the quote macros, ident -formatter, and runtime logic. -""" -aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml" - -[[audits.mozilla.audits.quote]] -who = "Mike Hommey " -criteria = "safe-to-deploy" -delta = "1.0.18 -> 1.0.21" -aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml" - -[[audits.mozilla.audits.quote]] -who = "Mike Hommey " -criteria = "safe-to-deploy" -delta = "1.0.21 -> 1.0.23" -aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml" - [[audits.mozilla.audits.rayon]] who = "Josh Stone " criteria = "safe-to-deploy" @@ -2868,17 +1706,6 @@ criteria = "safe-to-deploy" delta = "0.4.4 -> 0.4.7" aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml" -[[audits.mozilla.audits.synstructure]] -who = "Nika Layzell " -criteria = "safe-to-deploy" -version = "0.12.6" -notes = """ -I am the primary author of the `synstructure` crate, and its current -maintainer. The one use of `unsafe` is unnecessary, but documented and -harmless. It will be removed in the next version. -""" -aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml" - [[audits.mozilla.audits.toml]] who = "Bobby Holley " criteria = "safe-to-deploy"