diff --git a/Cargo.lock b/Cargo.lock index cc3bc9e..08482db 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -37,15 +37,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - [[package]] name = "arrayref" version = "0.3.7" @@ -58,32 +49,6 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" -[[package]] -name = "aws-lc-rs" -version = "1.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df33e4a55b03f8780ba55041bc7be91a2a8ec8c03517b0379d2d6c96d2c30d95" -dependencies = [ - "aws-lc-sys", - "mirai-annotations", - "paste", - "zeroize", -] - -[[package]] -name = "aws-lc-sys" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ede3d6e360a48436fee127cb81710834407b1ec0c48a001cc29dec9005f73e" -dependencies = [ - "bindgen", - "cmake", - "dunce", - "fs_extra", - "libc", - "paste", -] - [[package]] name = "base32" version = "0.4.0" @@ -96,35 +61,6 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" -[[package]] -name = "bindgen" -version = "0.69.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" -dependencies = [ - "bitflags", - "cexpr", - "clang-sys", - "itertools", - "lazy_static", - "lazycell", - "log", - "prettyplease", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn", - "which", -] - -[[package]] -name = "bitflags" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" - [[package]] name = "blake2b_simd" version = "1.0.2" @@ -169,15 +105,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - [[package]] name = "cfg-if" version = "1.0.0" @@ -194,26 +121,6 @@ dependencies = [ "inout", ] -[[package]] -name = "clang-sys" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" -dependencies = [ - "glob", - "libc", - "libloading", -] - -[[package]] -name = "cmake" -version = "0.1.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" -dependencies = [ - "cc", -] - [[package]] name = "combine" version = "4.6.6" @@ -279,28 +186,6 @@ dependencies = [ "crypto-common", ] -[[package]] -name = "dunce" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" - -[[package]] -name = "either" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" - -[[package]] -name = "errno" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - [[package]] name = "etopa" version = "0.0.0" @@ -321,7 +206,6 @@ version = "0.0.0" dependencies = [ "etopa", "json", - "kern", ] [[package]] @@ -346,12 +230,6 @@ dependencies = [ "wasm-bindgen-test", ] -[[package]] -name = "fs_extra" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" - [[package]] name = "generic-array" version = "0.14.7" @@ -385,27 +263,12 @@ dependencies = [ "polyval", ] -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - [[package]] name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -[[package]] -name = "home" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" -dependencies = [ - "windows-sys 0.52.0", -] - [[package]] name = "inout" version = "0.1.3" @@ -415,15 +278,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - [[package]] name = "itoa" version = "1.0.11" @@ -481,23 +335,6 @@ name = "kern" version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d264d60bc333b796813e95321a90e1b3c269aa94b8d8bff2a7dbe54d1663a85c" -dependencies = [ - "rustls", - "rustls-pemfile", - "rustls-pki-types", -] - -[[package]] -name = "lazy_static" -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 = "libc" @@ -505,22 +342,6 @@ version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" -[[package]] -name = "libloading" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" -dependencies = [ - "cfg-if", - "windows-targets 0.52.4", -] - -[[package]] -name = "linux-raw-sys" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" - [[package]] name = "log" version = "0.4.21" @@ -533,28 +354,6 @@ version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "mirai-annotations" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9be0862c1b3f26a88803c4a49de6889c10e608b3ee9344e6ef5b45fb37ad3d1" - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - [[package]] name = "once_cell" version = "1.19.0" @@ -567,12 +366,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" -[[package]] -name = "paste" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" - [[package]] name = "polyval" version = "0.6.2" @@ -591,16 +384,6 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" -[[package]] -name = "prettyplease" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7" -dependencies = [ - "proc-macro2", - "syn", -] - [[package]] name = "proc-macro2" version = "1.0.79" @@ -649,35 +432,6 @@ dependencies = [ "getrandom", ] -[[package]] -name = "regex" -version = "1.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" - [[package]] name = "ring" version = "0.17.8" @@ -704,68 +458,6 @@ dependencies = [ "constant_time_eq", ] -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustix" -version = "0.38.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" -dependencies = [ - "bitflags", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustls" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c4d6d8ad9f2492485e13453acbb291dd08f64441b6609c491f1c2cd2c6b4fe1" -dependencies = [ - "aws-lc-rs", - "log", - "once_cell", - "rustls-pki-types", - "rustls-webpki", - "subtle", - "zeroize", -] - -[[package]] -name = "rustls-pemfile" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f48172685e6ff52a556baa527774f61fcaa884f59daf3375c62a3f1cd2549dab" -dependencies = [ - "base64", - "rustls-pki-types", -] - -[[package]] -name = "rustls-pki-types" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247" - -[[package]] -name = "rustls-webpki" -version = "0.102.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" -dependencies = [ - "aws-lc-rs", - "ring", - "rustls-pki-types", - "untrusted", -] - [[package]] name = "ryu" version = "1.0.17" @@ -839,12 +531,6 @@ dependencies = [ "keccak", ] -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - [[package]] name = "spin" version = "0.9.8" @@ -1041,18 +727,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "which" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -dependencies = [ - "either", - "home", - "once_cell", - "rustix", -] - [[package]] name = "winapi" version = "0.3.9" @@ -1215,9 +889,3 @@ name = "windows_x86_64_msvc" version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" - -[[package]] -name = "zeroize" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" diff --git a/Makefile b/Makefile index c7672ad..5f43f0d 100644 --- a/Makefile +++ b/Makefile @@ -11,8 +11,7 @@ MINIFY_VERSION=$(shell ./build-config MINIFY_VERSION) # api API_FILE_NAME?=etopa -# TODO (API_TARGET_TRIPLE): change back to musl; temporary fix for aws-lc-sys build failure -API_TARGET_TRIPLE?=x86_64-unknown-linux-gnu +API_TARGET_TRIPLE?=x86_64-unknown-linux-musl API_STRIP?=strip CARGO_LICENSE?=cargo-license CARGO_UPGRADE?=cargo upgrade diff --git a/NOTICE.txt b/NOTICE.txt index 611c85e..1eb1139 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -843,26 +843,18 @@ name version authors repository license license_file description aead 0.5.2 RustCrypto Developers https://github.com/RustCrypto/traits Apache-2.0 OR MIT Traits for Authenticated Encryption with Associated Data (AEAD) algorithms, such as AES-GCM as ChaCha20Poly1305, which provide a high-level API aes 0.8.4 RustCrypto Developers https://github.com/RustCrypto/block-ciphers Apache-2.0 OR MIT Pure Rust implementation of the Advanced Encryption Standard (a.k.a. Rijndael) aes-gcm 0.10.3 RustCrypto Developers https://github.com/RustCrypto/AEADs Apache-2.0 OR MIT Pure Rust implementation of the AES-GCM (Galois/Counter Mode) Authenticated Encryption with Associated Data (AEAD) Cipher with optional architecture-specific hardware acceleration -aho-corasick 1.1.3 Andrew Gallant https://github.com/BurntSushi/aho-corasick MIT OR Unlicense Fast multiple substring searching. arrayref 0.3.7 David Roundy https://github.com/droundy/arrayref BSD-2-Clause Macros to take array references of slices arrayvec 0.7.4 bluss https://github.com/bluss/arrayvec Apache-2.0 OR MIT A vector with fixed capacity, backed by an array (it can be stored on the stack too). Implements fixed capacity ArrayVec and ArrayString. -aws-lc-rs 1.6.2 AWS-LibCrypto https://github.com/awslabs/aws-lc-rs ISC AND (Apache-2.0 OR ISC) aws-lc-rs is a cryptographic library using AWS-LC for its cryptographic operations. This library strives to be API-compatible with the popular Rust library named ring. -aws-lc-sys 0.13.3 AWS-LC https://github.com/aws/aws-lc-rs ISC AND (Apache-2.0 OR ISC) AND OpenSSL AWS-LC is a general-purpose cryptographic library maintained by the AWS Cryptography team for AWS and their customers. It іs based on code from the Google BoringSSL project and the OpenSSL project. base32 0.4.0 Andreas Ots |Tim Dumol https://github.com/andreasots/base32 Apache-2.0 OR MIT Base32 encoder/decoder for Rust base64 0.21.7 Alice Maz |Marshall Pierce https://github.com/marshallpierce/rust-base64 Apache-2.0 OR MIT encodes and decodes base64 as bytes or utf8 -bindgen 0.69.4 Jyun-Yan You |Emilio Cobos Álvarez |Nick Fitzgerald |The Servo project developers https://github.com/rust-lang/rust-bindgen BSD-3-Clause Automatically generates Rust FFI bindings to C and C++ libraries. -bitflags 2.5.0 The Rust Project Developers https://github.com/bitflags/bitflags Apache-2.0 OR MIT A macro to generate structures which behave like bitflags. blake2b_simd 1.0.2 Jack O'Connor https://github.com/oconnor663/blake2_simd MIT a pure Rust BLAKE2b implementation with dynamic SIMD block-buffer 0.10.4 RustCrypto Developers https://github.com/RustCrypto/utils Apache-2.0 OR MIT Buffer type for block processing of data bumpalo 3.15.4 Nick Fitzgerald https://github.com/fitzgen/bumpalo Apache-2.0 OR MIT A fast bump allocation arena for Rust. bytes 1.6.0 Carl Lerche |Sean McArthur https://github.com/tokio-rs/bytes MIT Types and traits for working with bytes cc 1.0.90 Alex Crichton https://github.com/rust-lang/cc-rs Apache-2.0 OR MIT A build-time dependency for Cargo build scripts to assist in invoking the native C compiler to compile native C code into a static archive to be linked into Rust code. cesu8 1.1.0 Eric Kidd https://github.com/emk/cesu8-rs Apache-2.0 OR MIT Convert to and from CESU-8 encoding (similar to UTF-8) -cexpr 0.6.0 Jethro Beekman https://github.com/jethrogb/rust-cexpr Apache-2.0 OR MIT A C expression parser and evaluator cfg-if 1.0.0 Alex Crichton https://github.com/alexcrichton/cfg-if Apache-2.0 OR MIT A macro to ergonomically define an item depending on a large number of #[cfg] parameters. Structured like an if-else chain, the first matching branch is the item that gets emitted. cipher 0.4.4 RustCrypto Developers https://github.com/RustCrypto/traits Apache-2.0 OR MIT Traits for describing block ciphers and stream ciphers -clang-sys 1.7.0 Kyle Mayes https://github.com/KyleMayes/clang-sys Apache-2.0 Rust bindings for libclang. -cmake 0.1.50 Alex Crichton https://github.com/rust-lang/cmake-rs Apache-2.0 OR MIT A build dependency for running `cmake` to build a native library combine 4.6.6 Markus Westerlind https://github.com/Marwes/combine MIT Fast parser combinators on arbitrary streams with zero-copy support. console_error_panic_hook 0.1.7 Nick Fitzgerald https://github.com/rustwasm/console_error_panic_hook Apache-2.0 OR MIT A panic hook for `wasm32-unknown-unknown` that logs panics to `console.error` constant_time_eq 0.3.0 Cesar Eduardo Barros https://github.com/cesarb/constant_time_eq Apache-2.0 OR CC0-1.0 OR MIT-0 Compares two equal-sized byte strings in constant time. @@ -870,22 +862,15 @@ cpufeatures 0.2.12 RustCrypto Developers https://github.com/RustCrypto/utils Apa crypto-common 0.1.6 RustCrypto Developers https://github.com/RustCrypto/traits Apache-2.0 OR MIT Common cryptographic traits ctr 0.9.2 RustCrypto Developers https://github.com/RustCrypto/block-modes Apache-2.0 OR MIT CTR block modes of operation digest 0.10.7 RustCrypto Developers https://github.com/RustCrypto/traits Apache-2.0 OR MIT Traits for cryptographic hash functions and message authentication codes -dunce 1.0.4 Kornel https://gitlab.com/kornelski/dunce Apache-2.0 OR CC0-1.0 OR MIT-0 Normalize Windows paths to the most compatible format, avoiding UNC where possible -either 1.10.0 bluss https://github.com/rayon-rs/either Apache-2.0 OR MIT The enum `Either` with variants `Left` and `Right` is a general purpose sum type with two cases. -errno 0.3.8 Chris Wong https://github.com/lambda-fairy/rust-errno Apache-2.0 OR MIT Cross-platform interface to the `errno` variable. etopa 0.0.0 Lennart Heinrich https://ltheinrich.de/etopa ISC Time-based one-time password authenticator etopai 0.0.0 Lennart Heinrich https://ltheinrich.de/etopa ISC Etopa HTTPS API etopan 0.0.0 Lennart Heinrich https://ltheinrich.de/etopa ISC Etopa for Android etopaw 0.0.0 Lennart Heinrich https://ltheinrich.de/etopa ISC Etopa for Web -fs_extra 1.3.0 Denis Kurilenko https://github.com/webdesus/fs_extra MIT Expanding std::fs and std::io. Recursively copy folders with information about process and much more. generic-array 0.14.7 Bartłomiej Kamiński |Aaron Trent https://github.com/fizyk20/generic-array.git MIT Generic types implementing functionality of arrays getrandom 0.2.12 The Rand Project Developers https://github.com/rust-random/getrandom Apache-2.0 OR MIT A small cross-platform library for retrieving random data from system source ghash 0.5.1 RustCrypto Developers https://github.com/RustCrypto/universal-hashes Apache-2.0 OR MIT Universal hash over GF(2^128) useful for constructing a Message Authentication Code (MAC), as in the AES-GCM authenticated encryption cipher. -glob 0.3.1 The Rust Project Developers https://github.com/rust-lang/glob Apache-2.0 OR MIT Support for matching file paths against Unix shell style patterns. hex 0.4.3 KokaKiwi https://github.com/KokaKiwi/rust-hex Apache-2.0 OR MIT Encoding and decoding data into/from hexadecimal representation. -home 0.5.9 Brian Anderson https://github.com/rust-lang/cargo Apache-2.0 OR MIT Shared definitions of home directories. inout 0.1.3 RustCrypto Developers https://github.com/RustCrypto/utils Apache-2.0 OR MIT Custom reference types for code generic over in-place and buffer-to-buffer modes of operation. -itertools 0.12.1 bluss https://github.com/rust-itertools/itertools Apache-2.0 OR MIT Extra iterator adaptors, iterator methods, free functions, and macros. itoa 1.0.11 David Tolnay https://github.com/dtolnay/itoa Apache-2.0 OR MIT Fast integer primitive to string conversion jni 0.21.1 Josh Chase https://github.com/jni-rs/jni-rs Apache-2.0 OR MIT Rust bindings to the JNI jni-sys 0.3.0 Steven Fackler https://github.com/sfackler/rust-jni-sys Apache-2.0 OR MIT Rust definitions corresponding to jni.h @@ -893,38 +878,20 @@ js-sys 0.3.69 The wasm-bindgen Developers https://github.com/rustwasm/wasm-bindg json 0.12.4 Maciej Hirsz https://github.com/maciejhirsz/json-rust Apache-2.0 OR MIT JSON implementation in Rust keccak 0.1.5 RustCrypto Developers https://github.com/RustCrypto/sponges/tree/master/keccak Apache-2.0 OR MIT Pure Rust implementation of the Keccak sponge function including the keccak-f and keccak-p variants kern 1.7.1 Lennart Heinrich https://ltheinrich.de/kern ISC General library for Rust -lazy_static 1.4.0 Marvin Löbel https://github.com/rust-lang-nursery/lazy-static.rs Apache-2.0 OR MIT A macro for declaring lazily evaluated statics in Rust. -lazycell 1.3.0 Alex Crichton |Nikita Pekin https://github.com/indiv0/lazycell Apache-2.0 OR MIT A library providing a lazily filled Cell struct libc 0.2.153 The Rust Project Developers https://github.com/rust-lang/libc Apache-2.0 OR MIT Raw FFI bindings to platform libraries like libc. -libloading 0.8.3 Simonas Kazlauskas https://github.com/nagisa/rust_libloading/ ISC Bindings around the platform's dynamic library loading primitives with greatly improved memory safety. -linux-raw-sys 0.4.13 Dan Gohman https://github.com/sunfishcode/linux-raw-sys Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR MIT Generated bindings for Linux's userspace API log 0.4.21 The Rust Project Developers https://github.com/rust-lang/log Apache-2.0 OR MIT A lightweight logging facade for Rust memchr 2.7.2 Andrew Gallant |bluss https://github.com/BurntSushi/memchr MIT OR Unlicense Provides extremely fast (uses SIMD on x86_64, aarch64 and wasm32) routines for 1, 2 or 3 byte search and single substring search. -minimal-lexical 0.2.1 Alex Huszagh https://github.com/Alexhuszagh/minimal-lexical Apache-2.0 OR MIT Fast float parsing conversion routines. -mirai-annotations 1.12.0 Herman Venter https://github.com/facebookexperimental/MIRAI MIT Macros that provide source code annotations for MIRAI -nom 7.1.3 contact@geoffroycouprie.com https://github.com/Geal/nom MIT A byte-oriented, zero-copy, parser combinators library once_cell 1.19.0 Aleksey Kladov https://github.com/matklad/once_cell Apache-2.0 OR MIT Single assignment cells and lazy values. opaque-debug 0.3.1 RustCrypto Developers https://github.com/RustCrypto/utils Apache-2.0 OR MIT Macro for opaque Debug trait implementation -paste 1.0.14 David Tolnay https://github.com/dtolnay/paste Apache-2.0 OR MIT Macros for all your token pasting needs polyval 0.6.2 RustCrypto Developers https://github.com/RustCrypto/universal-hashes Apache-2.0 OR MIT POLYVAL is a GHASH-like universal hash over GF(2^128) useful for constructing a Message Authentication Code (MAC) ppv-lite86 0.2.17 The CryptoCorrosion Contributors https://github.com/cryptocorrosion/cryptocorrosion Apache-2.0 OR MIT Implementation of the crypto-simd API for x86 -prettyplease 0.2.17 David Tolnay https://github.com/dtolnay/prettyplease Apache-2.0 OR MIT A minimal `syn` syntax tree pretty-printer proc-macro2 1.0.79 David Tolnay |Alex Crichton https://github.com/dtolnay/proc-macro2 Apache-2.0 OR MIT A substitute implementation of the compiler's `proc_macro` API to decouple token-based libraries from the procedural macro use case. quote 1.0.35 David Tolnay https://github.com/dtolnay/quote Apache-2.0 OR MIT Quasi-quoting macro quote!(...) rand 0.8.5 The Rand Project Developers|The Rust Project Developers https://github.com/rust-random/rand Apache-2.0 OR MIT Random number generators and other randomness functionality. rand_chacha 0.3.1 The Rand Project Developers|The Rust Project Developers|The CryptoCorrosion Contributors https://github.com/rust-random/rand Apache-2.0 OR MIT ChaCha random number generator rand_core 0.6.4 The Rand Project Developers|The Rust Project Developers https://github.com/rust-random/rand Apache-2.0 OR MIT Core random number generator traits and tools for implementation. -regex 1.10.4 The Rust Project Developers|Andrew Gallant https://github.com/rust-lang/regex Apache-2.0 OR MIT An implementation of regular expressions for Rust. This implementation uses finite automata and guarantees linear time matching on all inputs. -regex-automata 0.4.6 The Rust Project Developers|Andrew Gallant https://github.com/rust-lang/regex/tree/master/regex-automata Apache-2.0 OR MIT Automata construction and matching using regular expressions. -regex-syntax 0.8.3 The Rust Project Developers|Andrew Gallant https://github.com/rust-lang/regex/tree/master/regex-syntax Apache-2.0 OR MIT A regular expression parser. ring 0.17.8 Brian Smith https://github.com/briansmith/ring ring's license Safe, fast, small crypto using Rust. rust-argon2 2.1.0 Martijn Rijkeboer https://github.com/sru-systems/rust-argon2 Apache-2.0 OR MIT Rust implementation of the Argon2 password hashing function. -rustc-hash 1.1.0 The Rust Project Developers https://github.com/rust-lang-nursery/rustc-hash Apache-2.0 OR MIT speed, non-cryptographic hash used in rustc -rustix 0.38.32 Dan Gohman |Jakub Konka https://github.com/bytecodealliance/rustix Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR MIT Safe Rust bindings to POSIX/Unix/Linux/Winsock-like syscalls -rustls 0.23.4 https://github.com/rustls/rustls Apache-2.0 OR ISC OR MIT Rustls is a modern TLS library written in Rust. -rustls-pemfile 2.1.1 https://github.com/rustls/pemfile Apache-2.0 OR ISC OR MIT Basic .pem file parser for keys and certificates -rustls-pki-types 1.4.1 https://github.com/rustls/pki-types Apache-2.0 OR MIT Shared types for the rustls PKI ecosystem -rustls-webpki 0.102.2 https://github.com/rustls/webpki ISC Web PKI X.509 Certificate Verification. ryu 1.0.17 David Tolnay https://github.com/dtolnay/ryu Apache-2.0 OR BSL-1.0 Fast floating point to string conversion same-file 1.0.6 Andrew Gallant https://github.com/BurntSushi/same-file MIT OR Unlicense A simple crate for determining whether two file paths point to the same file. scoped-tls 1.0.1 Alex Crichton https://github.com/alexcrichton/scoped-tls Apache-2.0 OR MIT Library implementation of the standard library's old `scoped_thread_local!` macro for providing scoped access to thread local storage (TLS) so any type can be stored into TLS. @@ -933,7 +900,6 @@ serde-wasm-bindgen 0.6.5 Ingvar Stepanyan https://github.com/ serde_derive 1.0.197 Erick Tryzelaar |David Tolnay https://github.com/serde-rs/serde Apache-2.0 OR MIT Macros 1.1 implementation of #[derive(Serialize, Deserialize)] serde_json 1.0.115 Erick Tryzelaar |David Tolnay https://github.com/serde-rs/json Apache-2.0 OR MIT A JSON serialization file format sha3 0.10.8 RustCrypto Developers https://github.com/RustCrypto/hashes Apache-2.0 OR MIT Pure Rust implementation of SHA-3, a family of Keccak-based hash functions including the SHAKE family of eXtendable-Output Functions (XOFs), as well as the accelerated variant TurboSHAKE -shlex 1.3.0 comex |Fenhl |Adrian Taylor |Alex Touchet |Daniel Parks |Garrett Berg https://github.com/comex/rust-shlex Apache-2.0 OR MIT Split a string into shell words, like Python's shlex. spin 0.9.8 Mathijs van de Nes |John Ericson |Joshua Barretto https://github.com/mvdnes/spin-rs.git MIT Spin-based synchronization primitives subtle 2.5.0 Isis Lovecruft |Henry de Valence https://github.com/dalek-cryptography/subtle BSD-3-Clause Pure-Rust traits and utilities for constant-time cryptographic implementations. syn 2.0.57 David Tolnay https://github.com/dtolnay/syn Apache-2.0 OR MIT Parser for Rust source code @@ -955,7 +921,6 @@ wasm-bindgen-shared 0.2.92 The wasm-bindgen Developers https://github.com/rustwa wasm-bindgen-test 0.3.42 The wasm-bindgen Developers https://github.com/rustwasm/wasm-bindgen Apache-2.0 OR MIT Internal testing crate for wasm-bindgen wasm-bindgen-test-macro 0.3.42 The wasm-bindgen Developers https://github.com/rustwasm/wasm-bindgen Apache-2.0 OR MIT Internal testing macro for wasm-bindgen web-sys 0.3.69 The wasm-bindgen Developers https://github.com/rustwasm/wasm-bindgen/tree/master/crates/web-sys Apache-2.0 OR MIT Bindings for all Web APIs, a procedurally generated crate from WebIDL -which 4.4.2 Harry Fei https://github.com/harryfei/which-rs.git MIT "A Rust equivalent of Unix command ""which"". Locate installed executable in cross platforms." winapi 0.3.9 Peter Atashian https://github.com/retep998/winapi-rs Apache-2.0 OR MIT Raw FFI bindings for all of Windows API. winapi-i686-pc-windows-gnu 0.4.0 Peter Atashian https://github.com/retep998/winapi-rs Apache-2.0 OR MIT Import libraries for the i686-pc-windows-gnu target. Please don't use this crate directly, depend on winapi instead. winapi-util 0.1.6 Andrew Gallant https://github.com/BurntSushi/winapi-util MIT OR Unlicense A dumping ground for high level safe wrappers over winapi. @@ -978,4 +943,3 @@ windows_x86_64_gnullvm 0.42.2 Microsoft https://github.com/microsoft/windows-rs windows_x86_64_gnullvm 0.52.4 Microsoft https://github.com/microsoft/windows-rs Apache-2.0 OR MIT Import lib for Windows windows_x86_64_msvc 0.42.2 Microsoft https://github.com/microsoft/windows-rs Apache-2.0 OR MIT Import lib for Windows windows_x86_64_msvc 0.52.4 Microsoft https://github.com/microsoft/windows-rs Apache-2.0 OR MIT Import lib for Windows -zeroize 1.7.0 The RustCrypto Project Developers https://github.com/RustCrypto/utils/tree/master/zeroize Apache-2.0 OR MIT Securely clear secrets from memory with a simple trait built on stable Rust primitives which guarantee memory is zeroed using an operation will not be 'optimized away' by the compiler. Uses a portable pure Rust implementation that works everywhere, even WASM! diff --git a/etopai/Cargo.toml b/etopai/Cargo.toml index 1bd88fd..6e53c37 100644 --- a/etopai/Cargo.toml +++ b/etopai/Cargo.toml @@ -10,5 +10,4 @@ homepage = "https://etopa.de" [dependencies] etopa = { path = "../etopa" } -kern = { version = "1.7.1", features = ["tls"] } json = "0.12.4" diff --git a/etopai/src/common.rs b/etopai/src/common.rs index 47f949b..3222acb 100644 --- a/etopai/src/common.rs +++ b/etopai/src/common.rs @@ -19,8 +19,6 @@ Options: --logintime I Login fails cleanup time in seconds (60) --acclimit I Account registration limit per hour (10) --data S Data directory (data) - --cert S Path to TLS certificate (DATA_DIR/cert.pem) - --key S Path to TLS certificate key (DATA_DIR/key.pem) --licenses List licenses of project and libraries --nolog Print no log messages"; diff --git a/etopai/src/main.rs b/etopai/src/main.rs index f6084cc..bd6e85a 100644 --- a/etopai/src/main.rs +++ b/etopai/src/main.rs @@ -10,7 +10,7 @@ mod api; use common::{json_error, SharedData, BUILD_GRADLE, HELP, LICENSES}; use etopa::data::StorageFile; -use etopa::http::server::{load_certificate, HttpRequest, HttpServerBuilder}; +use etopa::http::server::{HttpRequest, HttpServerBuilder}; use etopa::{meta::search, CliBuilder, Config, Result}; use std::env::args; use std::fs::create_dir_all; @@ -58,8 +58,6 @@ fn main() { let login_time: u64 = cmd.parameter("logintime", config.get("logintime", 60)); let account_limit: u32 = cmd.parameter("acclimit", config.get("acclimit", 10)); let data = cmd.param("data", config.value("data", "data")); - let cert = cmd.parameter("cert", config.get("cert", format!("{}/cert.pem", data))); - let key = cmd.parameter("key", config.get("key", format!("{}/key.pem", data))); let log = !cmd.option("nolog") && !config.get("nolog", false); // open username/password storage @@ -68,7 +66,6 @@ fn main() { // server configuration let security = SecurityManager::new(ban_time, login_fails, login_time, account_limit, log); - let tls_config = load_certificate(cert, key).ok(); let shared = Arc::new(RwLock::new(SharedData::new( users, security, @@ -82,12 +79,11 @@ fn main() { .addr(format!("{}:{}", addr, port)) .threads(threads) .handler(handle) - .tls(tls_config) .build(shared) .unwrap(); // print info message and join threads - println!("HTTPS server available on {}:{}", addr, port); + println!("HTTP server available on {}:{}", addr, port); server.block().unwrap(); }