Use NSS backend for OHTTP in as-ohttp-client

This commit is contained in:
Ted Campbell 2023-08-02 00:21:21 -04:00 коммит произвёл Ted Campbell
Родитель 99f090846e
Коммит 5c9042dbd5
7 изменённых файлов: 230 добавлений и 619 удалений

Просмотреть файл

@ -106,6 +106,7 @@ commands:
- run: sudo apt-get update
- run: sudo apt-get install python tcl
- run: sudo apt-get install python3-venv
- run: sudo apt-get install libclang-dev
- run:
name: Install NSS build system dependencies
command: sudo apt-get install ninja-build gyp zlib1g-dev pip

375
Cargo.lock сгенерированный
Просмотреть файл

@ -17,42 +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",
"rand_core 0.6.3",
]
[[package]]
name = "aes"
version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8"
dependencies = [
"cfg-if 1.0.0",
"cipher",
"cpufeatures 0.2.2",
"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.7.6"
@ -181,6 +145,7 @@ dependencies = [
"bhttp",
"ohttp",
"parking_lot",
"rusqlite",
"thiserror",
"uniffi",
]
@ -214,7 +179,7 @@ checksum = "ca2925c4c290382f9d2fa3d1c1b6a63fa1427099721ecca4749b154cc9c25522"
dependencies = [
"askama_shared",
"proc-macro2",
"syn 1.0.98",
"syn 1.0.109",
]
[[package]]
@ -253,7 +218,7 @@ dependencies = [
"proc-macro2",
"quote",
"serde",
"syn 1.0.98",
"syn 1.0.109",
"toml",
]
@ -449,6 +414,26 @@ dependencies = [
"serde",
]
[[package]]
name = "bindgen"
version = "0.64.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4"
dependencies = [
"bitflags 1.3.2",
"cexpr",
"clang-sys",
"lazy_static",
"lazycell",
"peeking_take_while",
"proc-macro2",
"quote",
"regex",
"rustc-hash",
"shlex",
"syn 1.0.109",
]
[[package]]
name = "bit-set"
version = "0.5.2"
@ -602,6 +587,15 @@ version = "1.0.73"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
[[package]]
name = "cexpr"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
dependencies = [
"nom 7.1.1",
]
[[package]]
name = "cfg-if"
version = "0.1.10"
@ -614,31 +608,6 @@ version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "chacha20"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fee7ad89dc1128635074c268ee661f90c3f7e83d9fd12910608c36b47d6c3412"
dependencies = [
"cfg-if 1.0.0",
"cipher",
"cpufeatures 0.1.5",
"zeroize",
]
[[package]]
name = "chacha20poly1305"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1580317203210c517b6d44794abfbe600698276db18127e37ad3e69bf5e848e5"
dependencies = [
"aead",
"chacha20",
"cipher",
"poly1305",
"zeroize",
]
[[package]]
name = "chrono"
version = "0.4.26"
@ -655,15 +624,6 @@ dependencies = [
"winapi",
]
[[package]]
name = "cipher"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7"
dependencies = [
"generic-array",
]
[[package]]
name = "cirrus"
version = "0.1.0"
@ -673,6 +633,17 @@ dependencies = [
"nimbus-sdk",
]
[[package]]
name = "clang-sys"
version = "1.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f"
dependencies = [
"glob",
"libc",
"libloading 0.7.4",
]
[[package]]
name = "clap"
version = "2.34.0"
@ -826,15 +797,6 @@ version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
[[package]]
name = "cpufeatures"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "66c99696f6c9dd7f35d486b9d04d7e6e202aa3e8c40d553f2fdf5e7e0c6a71ef"
dependencies = [
"libc",
]
[[package]]
name = "cpufeatures"
version = "0.2.2"
@ -943,16 +905,6 @@ dependencies = [
"once_cell",
]
[[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 = "csv"
version = "1.1.6"
@ -993,16 +945,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c"
dependencies = [
"quote",
"syn 1.0.98",
]
[[package]]
name = "ctr"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea"
dependencies = [
"cipher",
"syn 1.0.109",
]
[[package]]
@ -1015,19 +958,6 @@ dependencies = [
"winapi",
]
[[package]]
name = "curve25519-dalek"
version = "3.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61"
dependencies = [
"byteorder",
"digest",
"rand_core 0.5.1",
"subtle",
"zeroize",
]
[[package]]
name = "cxx"
version = "1.0.92"
@ -1052,7 +982,7 @@ dependencies = [
"proc-macro2",
"quote",
"scratch",
"syn 1.0.98",
"syn 1.0.109",
]
[[package]]
@ -1069,7 +999,7 @@ checksum = "0b75aed41bb2e6367cae39e6326ef817a851db13c13e4f3263714ca3cfb8de56"
dependencies = [
"proc-macro2",
"quote",
"syn 1.0.98",
"syn 1.0.109",
]
[[package]]
@ -1168,7 +1098,7 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
dependencies = [
"libloading",
"libloading 0.8.0",
]
[[package]]
@ -1748,16 +1678,6 @@ dependencies = [
"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",
]
[[package]]
name = "gimli"
version = "0.26.1"
@ -1881,46 +1801,6 @@ version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
[[package]]
name = "hkdf"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "01706d578d5c281058480e673ae4086a9f4710d8df1ad80a5b03e39ece5f886b"
dependencies = [
"digest",
"hmac",
]
[[package]]
name = "hmac"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b"
dependencies = [
"crypto-mac",
"digest",
]
[[package]]
name = "hpke"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b27779b5c326e3afe887e806ab04ac34922a9a723ee3fae62170b3f7ad33380"
dependencies = [
"aead",
"aes-gcm",
"byteorder",
"chacha20poly1305",
"digest",
"generic-array",
"hkdf",
"rand_core 0.6.3",
"sha2",
"subtle",
"x25519-dalek",
"zeroize",
]
[[package]]
name = "http"
version = "0.2.9"
@ -2239,6 +2119,12 @@ version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "lazycell"
version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
[[package]]
name = "lexical-core"
version = "0.7.6"
@ -2258,6 +2144,16 @@ version = "0.2.147"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
[[package]]
name = "libloading"
version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
dependencies = [
"cfg-if 1.0.0",
"winapi",
]
[[package]]
name = "libloading"
version = "0.8.0"
@ -2563,7 +2459,7 @@ dependencies = [
"cfg-if 1.0.0",
"proc-macro2",
"quote",
"syn 1.0.98",
"syn 1.0.109",
]
[[package]]
@ -2588,7 +2484,7 @@ dependencies = [
"proc-macro2",
"quote",
"rustc_version 0.2.3",
"syn 1.0.98",
"syn 1.0.109",
]
[[package]]
@ -2673,7 +2569,7 @@ dependencies = [
"proc-macro2",
"quote",
"serde",
"syn 1.0.98",
"syn 1.0.109",
]
[[package]]
@ -2976,23 +2872,16 @@ dependencies = [
[[package]]
name = "ohttp"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "850ce328ec7e4dc1a9446c56aef700d21d914268c8529b96017a2bf10f74b70f"
version = "0.4.0"
source = "git+https://github.com/martinthomson/ohttp.git#fc3f4c787d1f6a6a87bf5194f7152cc906b02973"
dependencies = [
"aead",
"aes-gcm",
"bindgen",
"byteorder",
"chacha20poly1305",
"hex",
"hkdf",
"hpke",
"lazy_static",
"log",
"rand",
"serde",
"serde_derive",
"sha2",
"thiserror",
"toml",
]
@ -3038,7 +2927,7 @@ checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
dependencies = [
"proc-macro2",
"quote",
"syn 1.0.98",
"syn 1.0.109",
]
[[package]]
@ -3122,6 +3011,12 @@ version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc"
[[package]]
name = "peeking_take_while"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
[[package]]
name = "percent-encoding"
version = "2.3.0"
@ -3274,29 +3169,6 @@ dependencies = [
"plotters-backend",
]
[[package]]
name = "poly1305"
version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede"
dependencies = [
"cpufeatures 0.2.2",
"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 1.0.0",
"cpufeatures 0.2.2",
"opaque-debug",
"universal-hash",
]
[[package]]
name = "ppv-lite86"
version = "0.2.16"
@ -3352,7 +3224,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86"
dependencies = [
"proc-macro2",
"syn 1.0.98",
"syn 1.0.109",
]
[[package]]
@ -3378,7 +3250,7 @@ dependencies = [
"proc-macro-error-attr",
"proc-macro2",
"quote",
"syn 1.0.98",
"syn 1.0.109",
"version_check",
]
@ -3429,7 +3301,7 @@ dependencies = [
"prost",
"prost-types",
"regex",
"syn 1.0.98",
"syn 1.0.109",
"tempfile",
"which",
]
@ -3444,7 +3316,7 @@ dependencies = [
"itertools",
"proc-macro2",
"quote",
"syn 1.0.98",
"syn 1.0.109",
]
[[package]]
@ -3523,7 +3395,7 @@ checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
dependencies = [
"libc",
"rand_chacha",
"rand_core 0.6.3",
"rand_core",
]
[[package]]
@ -3533,15 +3405,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
dependencies = [
"ppv-lite86",
"rand_core 0.6.3",
"rand_core",
]
[[package]]
name = "rand_core"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
[[package]]
name = "rand_core"
version = "0.6.3"
@ -3556,7 +3422,7 @@ name = "rand_rccrypto"
version = "0.1.0"
dependencies = [
"rand",
"rand_core 0.6.3",
"rand_core",
"rc_crypto",
]
@ -3782,6 +3648,12 @@ version = "0.1.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
[[package]]
name = "rustc-hash"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
[[package]]
name = "rustc_version"
version = "0.2.3"
@ -3894,7 +3766,7 @@ checksum = "bdbda6ac5cd1321e724fa9cee216f3a61885889b896f073b8f82322789c5250e"
dependencies = [
"proc-macro2",
"quote",
"syn 1.0.98",
"syn 1.0.109",
]
[[package]]
@ -4048,11 +3920,17 @@ checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
dependencies = [
"block-buffer",
"cfg-if 1.0.0",
"cpufeatures 0.2.2",
"cpufeatures",
"digest",
"opaque-debug",
]
[[package]]
name = "shlex"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
[[package]]
name = "similar"
version = "2.1.0"
@ -4182,15 +4060,9 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
"syn 1.0.98",
"syn 1.0.109",
]
[[package]]
name = "subtle"
version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
[[package]]
name = "suggest"
version = "0.1.0"
@ -4214,9 +4086,9 @@ dependencies = [
[[package]]
name = "syn"
version = "1.0.98"
version = "1.0.109"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd"
checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
dependencies = [
"proc-macro2",
"quote",
@ -4436,7 +4308,7 @@ checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a"
dependencies = [
"proc-macro2",
"quote",
"syn 1.0.98",
"syn 1.0.109",
]
[[package]]
@ -4862,16 +4734,6 @@ dependencies = [
"serde_json",
]
[[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 = "unsafe-libyaml"
version = "0.2.8"
@ -5017,7 +4879,7 @@ dependencies = [
"log",
"proc-macro2",
"quote",
"syn 1.0.98",
"syn 1.0.109",
"wasm-bindgen-shared",
]
@ -5051,7 +4913,7 @@ checksum = "7d94ac45fcf608c1f45ef53e748d35660f168490c10b23704c7779ab8f5c3048"
dependencies = [
"proc-macro2",
"quote",
"syn 1.0.98",
"syn 1.0.109",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@ -5481,17 +5343,6 @@ dependencies = [
"nix",
]
[[package]]
name = "x25519-dalek"
version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a0c105152107e3b96f6a00a65e86ce82d9b125230e1c4302940eca58ff71f4f"
dependencies = [
"curve25519-dalek",
"rand_core 0.5.1",
"zeroize",
]
[[package]]
name = "xcursor"
version = "0.3.4"
@ -5545,23 +5396,3 @@ checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
dependencies = [
"linked-hash-map",
]
[[package]]
name = "zeroize"
version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
dependencies = [
"zeroize_derive",
]
[[package]]
name = "zeroize_derive"
version = "1.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.26",
]

Просмотреть файл

@ -38,13 +38,12 @@ the details of which are reproduced below.
* [MIT License: winreg](#mit-license-winreg)
* [MIT License: xshell-venv](#mit-license-xshell-venv)
* [CC0-1.0 License: base16](#cc0-10-license-base16)
* [ISC License: libloading](#isc-license-libloading)
* [ISC License: ring](#isc-license-ring)
* [BSD-2-Clause License: arrayref](#bsd-2-clause-license-arrayref)
* [BSD-3-Clause License: curve25519-dalek](#bsd-3-clause-license-curve25519-dalek)
* [BSD-3-Clause License: bindgen](#bsd-3-clause-license-bindgen)
* [BSD-3-Clause License: protobuf](#bsd-3-clause-license-protobuf)
* [BSD-3-Clause License: sqlcipher](#bsd-3-clause-license-sqlcipher)
* [BSD-3-Clause License: subtle](#bsd-3-clause-license-subtle)
* [BSD-3-Clause License: x25519-dalek](#bsd-3-clause-license-x25519-dalek)
* [OpenSSL License](#openssl-license)
* [Optional Notice: SQLite](#optional-notice-sqlite)
* [(Apache-2.0 OR MIT) AND BSD-3-Clause License: encoding_rs](#(apache-20-or-mit)-and-bsd-3-clause-license-encoding_rs)
@ -447,9 +446,6 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
## Apache License 2.0
The following text applies to code linked from these dependencies:
[aead](https://github.com/RustCrypto/traits),
[aes-gcm](https://github.com/RustCrypto/AEADs),
[aes](https://github.com/RustCrypto/block-ciphers),
[ahash](https://github.com/tkaitchuck/ahash),
[android-tzdata](https://github.com/RumovZ/android-tzdata),
[android_system_properties](https://github.com/nical/android_system_properties),
@ -466,16 +462,13 @@ The following text applies to code linked from these dependencies:
[camino](https://github.com/camino-rs/camino),
[cargo-platform](https://github.com/rust-lang/cargo),
[cc](https://github.com/alexcrichton/cc-rs),
[cexpr](https://github.com/jethrogb/rust-cexpr),
[cfg-if](https://github.com/alexcrichton/cfg-if),
[chacha20](https://github.com/RustCrypto/stream-ciphers),
[chacha20poly1305](https://github.com/RustCrypto/AEADs),
[chrono](https://github.com/chronotope/chrono),
[cipher](https://github.com/RustCrypto/traits),
[clang-sys](https://github.com/KyleMayes/clang-sys),
[core-foundation-sys](https://github.com/servo/core-foundation-rs),
[core-foundation](https://github.com/servo/core-foundation-rs),
[cpufeatures](https://github.com/RustCrypto/utils),
[crypto-mac](https://github.com/RustCrypto/traits),
[ctr](https://github.com/RustCrypto/stream-ciphers),
[digest](https://github.com/RustCrypto/traits),
[dogear](https://github.com/mozilla/dogear),
[either](https://github.com/bluss/either),
@ -496,15 +489,11 @@ The following text applies to code linked from these dependencies:
[futures-task](https://github.com/rust-lang/futures-rs),
[futures-util](https://github.com/rust-lang/futures-rs),
[getrandom](https://github.com/rust-random/getrandom),
[ghash](https://github.com/RustCrypto/universal-hashes),
[glob](https://github.com/rust-lang/glob),
[hashbrown](https://github.com/rust-lang/hashbrown),
[hashlink](https://github.com/kyren/hashlink),
[heck](https://github.com/withoutboats/heck),
[hex](https://github.com/KokaKiwi/rust-hex),
[hkdf](https://github.com/RustCrypto/KDFs/),
[hmac](https://github.com/RustCrypto/MACs),
[hpke](https://github.com/rozbb/rust-hpke),
[http](https://github.com/hyperium/http),
[httparse](https://github.com/seanmonstar/httparse),
[httpdate](https://github.com/pyfisch/httpdate),
@ -520,6 +509,7 @@ The following text applies to code linked from these dependencies:
[jna](https://github.com/java-native-access/jna),
[lalrpop-util](https://github.com/lalrpop/lalrpop),
[lazy_static](https://github.com/rust-lang-nursery/lazy-static.rs),
[lazycell](https://github.com/indiv0/lazycell),
[libc](https://github.com/rust-lang/libc),
[linux-raw-sys](https://github.com/sunfishcode/linux-raw-sys),
[lmdb-rkv-sys](https://github.com/mozilla/lmdb-rs.git),
@ -541,13 +531,12 @@ The following text applies to code linked from these dependencies:
[parking_lot](https://github.com/Amanieu/parking_lot),
[parking_lot_core](https://github.com/Amanieu/parking_lot),
[paste](https://github.com/dtolnay/paste),
[peeking_take_while](https://github.com/fitzgen/peeking_take_while),
[percent-encoding](https://github.com/servo/rust-url/),
[pin-project-lite](https://github.com/taiki-e/pin-project-lite),
[pin-utils](https://github.com/rust-lang-nursery/pin-utils),
[pkg-config](https://github.com/rust-lang/pkg-config-rs),
[plain](https://github.com/randomites/plain),
[poly1305](https://github.com/RustCrypto/universal-hashes),
[polyval](https://github.com/RustCrypto/universal-hashes),
[ppv-lite86](https://github.com/cryptocorrosion/cryptocorrosion),
[proc-macro2](https://github.com/dtolnay/proc-macro2),
[prost-derive](https://github.com/tokio-rs/prost),
@ -560,6 +549,7 @@ The following text applies to code linked from these dependencies:
[regex](https://github.com/rust-lang/regex),
[reqwest](https://github.com/seanmonstar/reqwest),
[rkv](https://github.com/mozilla/rkv),
[rustc-hash](https://github.com/rust-lang-nursery/rustc-hash),
[rustix](https://github.com/bytecodealliance/rustix),
[ryu](https://github.com/dtolnay/ryu),
[scopeguard](https://github.com/bluss/scopeguard),
@ -572,6 +562,7 @@ The following text applies to code linked from these dependencies:
[serde_path_to_error](https://github.com/dtolnay/path-to-error),
[serde_urlencoded](https://github.com/nox/serde_urlencoded),
[sha2](https://github.com/RustCrypto/hashes),
[shlex](https://github.com/comex/rust-shlex),
[siphasher](https://github.com/jedisct1/rust-siphash),
[smallbitvec](https://github.com/servo/smallbitvec),
[smallvec](https://github.com/servo/rust-smallvec),
@ -591,7 +582,6 @@ The following text applies to code linked from these dependencies:
[unicode-ident](https://github.com/dtolnay/unicode-ident),
[unicode-normalization](https://github.com/unicode-rs/unicode-normalization),
[unicode-segmentation](https://github.com/unicode-rs/unicode-segmentation),
[universal-hash](https://github.com/RustCrypto/traits),
[url](https://github.com/servo/rust-url),
[uuid](https://github.com/uuid-rs/uuid),
[vcpkg](https://github.com/mcgoo/vcpkg-rs),
@ -603,9 +593,7 @@ The following text applies to code linked from these dependencies:
[windows_x86_64_gnu](https://github.com/microsoft/windows-rs),
[windows_x86_64_msvc](https://github.com/microsoft/windows-rs),
[xshell-macros](https://github.com/matklad/xshell),
[xshell](https://github.com/matklad/xshell),
[zeroize](https://github.com/RustCrypto/utils/tree/master/zeroize),
[zeroize_derive](https://github.com/RustCrypto/utils/tree/master/zeroize/derive)
[xshell](https://github.com/matklad/xshell)
```
Apache License
@ -810,7 +798,6 @@ 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.
```
-------------
## MIT License: SwiftKeychainWrapper
@ -1895,6 +1882,27 @@ express Statement of Purpose.
party to this document and has no duty or obligation with respect to
this CC0 or use of the Work.
```
-------------
## ISC License: libloading
The following text applies to code linked from these dependencies:
[libloading](https://github.com/nagisa/rust_libloading/)
```
Copyright © 2015, Simonas Kazlauskas
Permission to use, copy, modify, and/or distribute this software for any purpose with or without
fee is hereby granted, provided that the above copyright notice and this permission notice appear
in all copies.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
THIS SOFTWARE.
```
-------------
## ISC License: ring
@ -1955,77 +1963,41 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
```
-------------
## BSD-3-Clause License: curve25519-dalek
## BSD-3-Clause License: bindgen
The following text applies to code linked from these dependencies:
[curve25519-dalek](https://github.com/dalek-cryptography/curve25519-dalek)
[bindgen](https://github.com/rust-lang/rust-bindgen)
```
Copyright (c) 2016-2021 isis agora lovecruft. All rights reserved.
Copyright (c) 2016-2021 Henry de Valence. All rights reserved.
BSD 3-Clause License
Copyright (c) 2013, Jyun-Yan You
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
3. Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
* Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
========================================================================
Portions of curve25519-dalek were originally derived from Adam Langley's
Go ed25519 implementation, found at <https://github.com/agl/ed25519/>,
under the following licence:
========================================================================
Copyright (c) 2012 The Go Authors. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following disclaimer
in the documentation and/or other materials provided with the
distribution.
* Neither the name of Google Inc. nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
```
-------------
@ -2101,81 +2073,6 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
```
-------------
## BSD-3-Clause License: subtle
The following text applies to code linked from these dependencies:
[subtle](https://github.com/dalek-cryptography/subtle)
```
Copyright (c) 2016-2017 Isis Agora Lovecruft, Henry de Valence. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
```
-------------
## BSD-3-Clause License: x25519-dalek
The following text applies to code linked from these dependencies:
[x25519-dalek](https://github.com/dalek-cryptography/x25519-dalek)
```
Copyright (c) 2017-2021 isis agora lovecruft. All rights reserved.
Copyright (c) 2019-2021 DebugSteven. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
```
-------------
## OpenSSL License

Просмотреть файл

@ -12,8 +12,15 @@ license = "MPL-2.0"
uniffi = "0.24.1"
thiserror = "1.0"
bhttp = "0.3"
ohttp = { version = "0.3", default-features = false, features = ["client", "server", "rust-hpke"]}
parking_lot = "0.12"
rusqlite = { version = "0.29.0", features=["sqlcipher"] }
[dependencies.ohttp]
version = "0.4"
default-features = false
git = "https://github.com/martinthomson/ohttp.git"
revision = "fc3f4c787d1f6a6a87bf5194f7152cc906b02973"
features = ["client", "server", "app-svc", "external-sqlite"]
[build-dependencies]
uniffi = { version = "0.24.1", features=["build"]}

Просмотреть файл

@ -1,5 +1,6 @@
extern crate bhttp;
extern crate ohttp;
extern crate rusqlite;
use parking_lot::Mutex;
use std::collections::HashMap;
@ -76,7 +77,9 @@ fn headers_to_map(message: &bhttp::Message) -> Result<HashMap<String, String>, O
impl OhttpSession {
/// Create a new encryption session for use with specific key configuration
pub fn new(config: &[u8]) -> Result<Self, OhttpError> {
let request = ohttp::ClientRequest::new(config).map_err(|e| match e {
ohttp::init();
let request = ohttp::ClientRequest::from_encoded_config(config).map_err(|e| match e {
ohttp::Error::Unsupported => OhttpError::UnsupportedKeyConfig,
_ => OhttpError::MalformedKeyConfig,
})?;
@ -171,6 +174,8 @@ impl OhttpTestServer {
/// Create a simple OHTTP server to decrypt and respond to OHTTP messages in
/// testing. The key is randomly generated.
fn new() -> Self {
ohttp::init();
let key = ohttp::KeyConfig::new(
0x01,
ohttp::hpke::Kem::X25519Sha256,

Просмотреть файл

@ -35,12 +35,11 @@ the details of which are reproduced below.
* [MIT License: weedle2](#mit-license-weedle2)
* [MIT License: xshell-venv](#mit-license-xshell-venv)
* [CC0-1.0 License: base16](#cc0-10-license-base16)
* [ISC License: libloading](#isc-license-libloading)
* [ISC License: ring](#isc-license-ring)
* [BSD-2-Clause License: arrayref](#bsd-2-clause-license-arrayref)
* [BSD-3-Clause License: curve25519-dalek](#bsd-3-clause-license-curve25519-dalek)
* [BSD-3-Clause License: bindgen](#bsd-3-clause-license-bindgen)
* [BSD-3-Clause License: sqlcipher](#bsd-3-clause-license-sqlcipher)
* [BSD-3-Clause License: subtle](#bsd-3-clause-license-subtle)
* [BSD-3-Clause License: x25519-dalek](#bsd-3-clause-license-x25519-dalek)
* [Optional Notice: SQLite](#optional-notice-sqlite)
* [(Apache-2.0 OR MIT) AND BSD-3-Clause License: encoding_rs](#(apache-20-or-mit)-and-bsd-3-clause-license-encoding_rs)
-------------
@ -442,9 +441,6 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
## Apache License 2.0
The following text applies to code linked from these dependencies:
[aead](https://github.com/RustCrypto/traits),
[aes-gcm](https://github.com/RustCrypto/AEADs),
[aes](https://github.com/RustCrypto/block-ciphers),
[ahash](https://github.com/tkaitchuck/ahash),
[anyhow](https://github.com/dtolnay/anyhow),
[askama](https://github.com/djc/askama),
@ -459,16 +455,13 @@ The following text applies to code linked from these dependencies:
[camino](https://github.com/camino-rs/camino),
[cargo-platform](https://github.com/rust-lang/cargo),
[cc](https://github.com/alexcrichton/cc-rs),
[cexpr](https://github.com/jethrogb/rust-cexpr),
[cfg-if](https://github.com/alexcrichton/cfg-if),
[chacha20](https://github.com/RustCrypto/stream-ciphers),
[chacha20poly1305](https://github.com/RustCrypto/AEADs),
[chrono](https://github.com/chronotope/chrono),
[cipher](https://github.com/RustCrypto/traits),
[clang-sys](https://github.com/KyleMayes/clang-sys),
[core-foundation-sys](https://github.com/servo/core-foundation-rs),
[core-foundation](https://github.com/servo/core-foundation-rs),
[cpufeatures](https://github.com/RustCrypto/utils),
[crypto-mac](https://github.com/RustCrypto/traits),
[ctr](https://github.com/RustCrypto/stream-ciphers),
[digest](https://github.com/RustCrypto/traits),
[dogear](https://github.com/mozilla/dogear),
[either](https://github.com/bluss/either),
@ -487,15 +480,11 @@ The following text applies to code linked from these dependencies:
[futures-task](https://github.com/rust-lang/futures-rs),
[futures-util](https://github.com/rust-lang/futures-rs),
[getrandom](https://github.com/rust-random/getrandom),
[ghash](https://github.com/RustCrypto/universal-hashes),
[glob](https://github.com/rust-lang/glob),
[hashbrown](https://github.com/rust-lang/hashbrown),
[hashlink](https://github.com/kyren/hashlink),
[heck](https://github.com/withoutboats/heck),
[hex](https://github.com/KokaKiwi/rust-hex),
[hkdf](https://github.com/RustCrypto/KDFs/),
[hmac](https://github.com/RustCrypto/MACs),
[hpke](https://github.com/rozbb/rust-hpke),
[http](https://github.com/hyperium/http),
[httparse](https://github.com/seanmonstar/httparse),
[httpdate](https://github.com/pyfisch/httpdate),
@ -510,6 +499,7 @@ The following text applies to code linked from these dependencies:
[itoa](https://github.com/dtolnay/itoa),
[lalrpop-util](https://github.com/lalrpop/lalrpop),
[lazy_static](https://github.com/rust-lang-nursery/lazy-static.rs),
[lazycell](https://github.com/indiv0/lazycell),
[libc](https://github.com/rust-lang/libc),
[lmdb-rkv-sys](https://github.com/mozilla/lmdb-rs.git),
[lmdb-rkv](https://github.com/mozilla/lmdb-rs.git),
@ -526,13 +516,12 @@ The following text applies to code linked from these dependencies:
[parking_lot](https://github.com/Amanieu/parking_lot),
[parking_lot_core](https://github.com/Amanieu/parking_lot),
[paste](https://github.com/dtolnay/paste),
[peeking_take_while](https://github.com/fitzgen/peeking_take_while),
[percent-encoding](https://github.com/servo/rust-url/),
[pin-project-lite](https://github.com/taiki-e/pin-project-lite),
[pin-utils](https://github.com/rust-lang-nursery/pin-utils),
[pkg-config](https://github.com/rust-lang/pkg-config-rs),
[plain](https://github.com/randomites/plain),
[poly1305](https://github.com/RustCrypto/universal-hashes),
[polyval](https://github.com/RustCrypto/universal-hashes),
[ppv-lite86](https://github.com/cryptocorrosion/cryptocorrosion),
[proc-macro2](https://github.com/dtolnay/proc-macro2),
[prost-derive](https://github.com/tokio-rs/prost),
@ -545,6 +534,7 @@ The following text applies to code linked from these dependencies:
[regex](https://github.com/rust-lang/regex),
[reqwest](https://github.com/seanmonstar/reqwest),
[rkv](https://github.com/mozilla/rkv),
[rustc-hash](https://github.com/rust-lang-nursery/rustc-hash),
[rustix](https://github.com/bytecodealliance/rustix),
[ryu](https://github.com/dtolnay/ryu),
[scopeguard](https://github.com/bluss/scopeguard),
@ -557,6 +547,7 @@ The following text applies to code linked from these dependencies:
[serde_path_to_error](https://github.com/dtolnay/path-to-error),
[serde_urlencoded](https://github.com/nox/serde_urlencoded),
[sha2](https://github.com/RustCrypto/hashes),
[shlex](https://github.com/comex/rust-shlex),
[siphasher](https://github.com/jedisct1/rust-siphash),
[smallbitvec](https://github.com/servo/smallbitvec),
[smallvec](https://github.com/servo/rust-smallvec),
@ -576,15 +567,12 @@ The following text applies to code linked from these dependencies:
[unicode-ident](https://github.com/dtolnay/unicode-ident),
[unicode-normalization](https://github.com/unicode-rs/unicode-normalization),
[unicode-segmentation](https://github.com/unicode-rs/unicode-segmentation),
[universal-hash](https://github.com/RustCrypto/traits),
[url](https://github.com/servo/rust-url),
[uuid](https://github.com/uuid-rs/uuid),
[vcpkg](https://github.com/mcgoo/vcpkg-rs),
[version_check](https://github.com/SergioBenitez/version_check),
[xshell-macros](https://github.com/matklad/xshell),
[xshell](https://github.com/matklad/xshell),
[zeroize](https://github.com/RustCrypto/utils/tree/master/zeroize),
[zeroize_derive](https://github.com/RustCrypto/utils/tree/master/zeroize/derive)
[xshell](https://github.com/matklad/xshell)
```
Apache License
@ -789,7 +777,6 @@ 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.
```
-------------
## MIT License: SwiftKeychainWrapper
@ -1796,6 +1783,27 @@ express Statement of Purpose.
party to this document and has no duty or obligation with respect to
this CC0 or use of the Work.
```
-------------
## ISC License: libloading
The following text applies to code linked from these dependencies:
[libloading](https://github.com/nagisa/rust_libloading/)
```
Copyright © 2015, Simonas Kazlauskas
Permission to use, copy, modify, and/or distribute this software for any purpose with or without
fee is hereby granted, provided that the above copyright notice and this permission notice appear
in all copies.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
THIS SOFTWARE.
```
-------------
## ISC License: ring
@ -1856,77 +1864,41 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
```
-------------
## BSD-3-Clause License: curve25519-dalek
## BSD-3-Clause License: bindgen
The following text applies to code linked from these dependencies:
[curve25519-dalek](https://github.com/dalek-cryptography/curve25519-dalek)
[bindgen](https://github.com/rust-lang/rust-bindgen)
```
Copyright (c) 2016-2021 isis agora lovecruft. All rights reserved.
Copyright (c) 2016-2021 Henry de Valence. All rights reserved.
BSD 3-Clause License
Copyright (c) 2013, Jyun-Yan You
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
3. Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
* Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
========================================================================
Portions of curve25519-dalek were originally derived from Adam Langley's
Go ed25519 implementation, found at <https://github.com/agl/ed25519/>,
under the following licence:
========================================================================
Copyright (c) 2012 The Go Authors. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following disclaimer
in the documentation and/or other materials provided with the
distribution.
* Neither the name of Google Inc. nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
```
-------------
@ -1961,81 +1933,6 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
```
-------------
## BSD-3-Clause License: subtle
The following text applies to code linked from these dependencies:
[subtle](https://github.com/dalek-cryptography/subtle)
```
Copyright (c) 2016-2017 Isis Agora Lovecruft, Henry de Valence. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
```
-------------
## BSD-3-Clause License: x25519-dalek
The following text applies to code linked from these dependencies:
[x25519-dalek](https://github.com/dalek-cryptography/x25519-dalek)
```
Copyright (c) 2017-2021 isis agora lovecruft. All rights reserved.
Copyright (c) 2019-2021 DebugSteven. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
```
-------------
## Optional Notice: SQLite

Просмотреть файл

@ -282,33 +282,6 @@ PACKAGE_METADATA_FIXUPS = {
"fixup": "https://raw.githubusercontent.com/martinthomson/ohttp/main/LICENSE-APACHE",
}
},
"zeroize_derive": {
"license": {
"check": "Apache-2.0 OR MIT"
},
"license_file": {
"check": None,
"fixup": "https://raw.githubusercontent.com/RustCrypto/utils/master/zeroize/derive/LICENSE-APACHE"
}
},
"ctr": {
"license": {
"check": "MIT OR Apache-2.0"
},
"license_file": {
"check": None,
"fixup": "https://raw.githubusercontent.com/RustCrypto/block-modes/master/ctr/LICENSE-APACHE",
}
},
"crypto-mac": {
"license": {
"check": "MIT OR Apache-2.0"
},
"license_file": {
"check": None,
"fixup": "https://raw.githubusercontent.com/RustCrypto/traits/master/digest/LICENSE-APACHE",
}
},
# These packages do not include their license file in their release distributions,
# so we have to fetch it over the network. Each has been manually checked and resolved
# to a final URL from which the file can be fetched (typically based on the *name* of