Merge pull request 'Upgrade bcrypt create' (#941) from update-blowfish into main

Reviewed-on: https://git.joinplu.me/Plume/Plume/pulls/941
This commit is contained in:
KitaitiMakoto 2021-08-14 10:23:41 +00:00
commit c374e0af4c
2 changed files with 45 additions and 22 deletions

65
Cargo.lock generated
View file

@ -74,7 +74,7 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4cf01b9b56e767bb57b94ebf91a58b338002963785cdd7013e21c0d4679471e4"
dependencies = [
"generic-array",
"generic-array 0.12.3",
]
[[package]]
@ -110,7 +110,7 @@ checksum = "cfd7e7ae3f9a1fb5c03b389fc6bb9a51400d0c13053f0dca698c832bfd893a0d"
dependencies = [
"block-cipher-trait",
"byteorder 1.3.4",
"opaque-debug",
"opaque-debug 0.2.3",
]
[[package]]
@ -120,7 +120,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2f70a6b5f971e473091ab7cfb5ffac6cde81666c4556751d8d5620ead8abf100"
dependencies = [
"block-cipher-trait",
"opaque-debug",
"opaque-debug 0.2.3",
]
[[package]]
@ -331,15 +331,13 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
[[package]]
name = "bcrypt"
version = "0.5.0"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b4fd6a91ff640809cfab4ea74312a892238a7bbae53adbf717b71122deb0c85"
checksum = "f691e63585950d8c1c43644d11bab9073e40f5060dd2822734ae7c3dc69a3a80"
dependencies = [
"base64 0.10.1",
"base64 0.13.0",
"blowfish",
"byteorder 1.3.4",
"lazy_static",
"rand 0.7.3",
"getrandom 0.2.1",
]
[[package]]
@ -382,7 +380,7 @@ dependencies = [
"block-padding",
"byte-tools",
"byteorder 1.3.4",
"generic-array",
"generic-array 0.12.3",
]
[[package]]
@ -391,7 +389,7 @@ version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1c924d49bd09e7c06003acda26cd9742e796e34282ec6c1189404dee0c1f4774"
dependencies = [
"generic-array",
"generic-array 0.12.3",
]
[[package]]
@ -405,13 +403,13 @@ dependencies = [
[[package]]
name = "blowfish"
version = "0.4.0"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6aeb80d00f2688459b8542068abd974cfb101e7a82182414a99b5026c0d85cc3"
checksum = "fe3ff3fc1de48c1ac2e3341c4df38b0d1bfb8fdf04632a187c8b75aaa319a7ab"
dependencies = [
"block-cipher-trait",
"byteorder 1.3.4",
"opaque-debug",
"cipher",
"opaque-debug 0.3.0",
]
[[package]]
@ -527,6 +525,15 @@ dependencies = [
"winapi 0.3.9",
]
[[package]]
name = "cipher"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7"
dependencies = [
"generic-array 0.14.4",
]
[[package]]
name = "clap"
version = "2.33.3"
@ -822,7 +829,7 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5"
dependencies = [
"generic-array",
"generic-array 0.12.3",
"subtle 1.0.0",
]
@ -991,7 +998,7 @@ version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
dependencies = [
"generic-array",
"generic-array 0.12.3",
]
[[package]]
@ -1417,6 +1424,16 @@ dependencies = [
"typenum",
]
[[package]]
name = "generic-array"
version = "0.14.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817"
dependencies = [
"typenum",
"version_check 0.9.2",
]
[[package]]
name = "getrandom"
version = "0.1.15"
@ -2659,6 +2676,12 @@ version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
[[package]]
name = "opaque-debug"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
[[package]]
name = "openssl"
version = "0.10.32"
@ -3663,9 +3686,9 @@ dependencies = [
[[package]]
name = "rocket_contrib"
version = "0.4.6"
version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9465babd59cfb360669b60431db510f3dc3268d51ccd69fc9264e626681e596a"
checksum = "e3946ca815127041d8f64455561031d058c22ae1b135251502c5ea523cf9e14b"
dependencies = [
"log 0.4.11",
"notify",
@ -3965,7 +3988,7 @@ dependencies = [
"block-buffer",
"digest",
"fake-simd",
"opaque-debug",
"opaque-debug 0.2.3",
]
[[package]]
@ -4955,7 +4978,7 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df0c900f2f9b4116803415878ff48b63da9edb268668e08cf9292d7503114a01"
dependencies = [
"generic-array",
"generic-array 0.12.3",
"subtle 2.4.0",
]

View file

@ -8,7 +8,7 @@ edition = "2018"
activitypub = "0.1.1"
ammonia = "2.1.1"
askama_escape = "0.1"
bcrypt = "0.5"
bcrypt = "0.10.1"
guid-create = "0.1"
itertools = "0.8.0"
lazy_static = "1.0"