Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F3333386
D13895.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
26 KB
Referenced Files
None
Subscribers
None
D13895.diff
View Options
diff --git a/Cargo.lock b/Cargo.lock
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -520,12 +520,13 @@
[[package]]
name = "argon2"
-version = "0.4.1"
+version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db4ce4441f99dbd377ca8a8f57b698c44d0d6e712d8329b5040da5a64aa1ce73"
+checksum = "3c3610892ee6e0cbce8ae2700349fcf8f98adb0dbfbee85aec3c9179d29cc072"
dependencies = [
"base64ct",
"blake2",
+ "cpufeatures",
"password-hash",
]
@@ -1736,6 +1737,7 @@
version = "0.2.0"
dependencies = [
"argon2",
+ "generic-array",
"log",
"opaque-ke",
"rand 0.8.5",
@@ -1974,17 +1976,31 @@
[[package]]
name = "curve25519-dalek"
-version = "4.0.0-pre.1"
+version = "4.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4033478fbf70d6acf2655ac70da91ee65852d69daf7a67bf7a2f518fb47aafcf"
+checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be"
dependencies = [
- "byteorder",
- "digest 0.9.0",
+ "cfg-if",
+ "cpufeatures",
+ "curve25519-dalek-derive",
+ "fiat-crypto",
"rand_core 0.6.4",
+ "rustc_version",
"subtle",
"zeroize",
]
+[[package]]
+name = "curve25519-dalek-derive"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.65",
+]
+
[[package]]
name = "darling"
version = "0.20.9"
@@ -2108,13 +2124,13 @@
[[package]]
name = "derive-where"
-version = "1.0.0-rc.3"
+version = "1.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d322f2907b2abad3117790c1a54d8f2d64574ba0fbea54cb6c6e66a0e50d99a4"
+checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.65",
]
[[package]]
@@ -2442,6 +2458,12 @@
"subtle",
]
+[[package]]
+name = "fiat-crypto"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
+
[[package]]
name = "fixedbitset"
version = "0.4.2"
@@ -3694,16 +3716,16 @@
[[package]]
name = "opaque-ke"
-version = "2.0.0"
+version = "2.1.0-pre.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76d410412d23781909d90c3900c5783e830586765f2277bccc78167da8af81a5"
+checksum = "3752668208a325d8c887827fc3e7ee8f5b4030cc036fb63ddeb02c21921b700c"
dependencies = [
"argon2",
- "curve25519-dalek 4.0.0-pre.1",
+ "curve25519-dalek 4.1.3",
"derive-where",
"digest 0.10.7",
"displaydoc",
- "elliptic-curve 0.12.3",
+ "elliptic-curve 0.13.8",
"generic-array",
"hkdf",
"hmac",
@@ -3864,9 +3886,9 @@
[[package]]
name = "password-hash"
-version = "0.4.2"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700"
+checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166"
dependencies = [
"base64ct",
"rand_core 0.6.4",
@@ -5165,9 +5187,9 @@
[[package]]
name = "subtle"
-version = "2.5.0"
+version = "2.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
[[package]]
name = "syn"
@@ -6006,15 +6028,15 @@
[[package]]
name = "voprf"
-version = "0.4.0-pre.3"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "081acbe8fcf05d5e8e2aad8ef3d40e02eddeaec07c75a9770d862a0fc0874322"
+checksum = "3e389827f1bd1fe2b69c03ee133aed75c49f03f2d021c40b88c2ff6ce5517846"
dependencies = [
- "curve25519-dalek 4.0.0-pre.1",
+ "curve25519-dalek 4.1.3",
"derive-where",
"digest 0.10.7",
"displaydoc",
- "elliptic-curve 0.12.3",
+ "elliptic-curve 0.13.8",
"generic-array",
"rand_core 0.6.4",
"serde",
@@ -6447,9 +6469,9 @@
[[package]]
name = "zeroize"
-version = "1.7.0"
+version = "1.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
dependencies = [
"zeroize_derive",
]
diff --git a/Cargo.toml b/Cargo.toml
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -43,7 +43,7 @@
aead = "0.5"
aes-gcm = "0.10"
anyhow = "1.0.74"
-argon2 = "0.4"
+argon2 = "0.5.3"
async-stream = "0.3.2"
aws-config = "1.5.4"
aws-sdk-dynamodb = "1.39.1"
@@ -60,6 +60,7 @@
futures = "0.3.30"
futures-core = "0.3"
futures-util = "0.3.28"
+generic-array = "0.14.7"
hex = "0.4.3"
http = "0.2.9"
hyper = "0.14"
@@ -75,7 +76,7 @@
num-traits = "0.2"
num_cpus = "1.13.1"
once_cell = "1.17"
-opaque-ke = "2.0"
+opaque-ke = "2.1.0-pre.1"
postmark = "0.8"
prost = "0.11"
regex = "1.10.3"
diff --git a/native/native_rust_library/Cargo.lock b/native/native_rust_library/Cargo.lock
--- a/native/native_rust_library/Cargo.lock
+++ b/native/native_rust_library/Cargo.lock
@@ -49,25 +49,14 @@
[[package]]
name = "argon2"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db4ce4441f99dbd377ca8a8f57b698c44d0d6e712d8329b5040da5a64aa1ce73"
-dependencies = [
- "base64ct",
- "blake2",
- "password-hash 0.4.2",
-]
-
-[[package]]
-name = "argon2"
-version = "0.5.1"
+version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2e554a8638bdc1e4eae9984845306cc95f8a9208ba8d49c3859fd958b46774d"
+checksum = "3c3610892ee6e0cbce8ae2700349fcf8f98adb0dbfbee85aec3c9179d29cc072"
dependencies = [
"base64ct",
"blake2",
"cpufeatures",
- "password-hash 0.5.0",
+ "password-hash",
]
[[package]]
@@ -195,9 +184,9 @@
[[package]]
name = "base16ct"
-version = "0.1.1"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce"
+checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
[[package]]
name = "base64"
@@ -238,7 +227,7 @@
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe"
dependencies = [
- "digest 0.10.5",
+ "digest 0.10.7",
]
[[package]]
@@ -348,7 +337,8 @@
name = "comm-opaque2"
version = "0.2.0"
dependencies = [
- "argon2 0.4.1",
+ "argon2",
+ "generic-array",
"log",
"opaque-ke",
"rand",
@@ -393,9 +383,9 @@
[[package]]
name = "cpufeatures"
-version = "0.2.9"
+version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
+checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0"
dependencies = [
"libc",
]
@@ -414,9 +404,9 @@
[[package]]
name = "crypto-bigint"
-version = "0.4.9"
+version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef"
+checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
dependencies = [
"generic-array",
"rand_core",
@@ -436,9 +426,9 @@
[[package]]
name = "crypto-mac"
-version = "0.11.1"
+version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714"
+checksum = "25fab6889090c8133f3deb8f73ba3c65a7f456f66436fc012a1b1e272b1e103e"
dependencies = [
"generic-array",
"subtle",
@@ -446,17 +436,31 @@
[[package]]
name = "curve25519-dalek"
-version = "4.0.0-pre.1"
+version = "4.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4033478fbf70d6acf2655ac70da91ee65852d69daf7a67bf7a2f518fb47aafcf"
+checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be"
dependencies = [
- "byteorder",
- "digest 0.9.0",
+ "cfg-if",
+ "cpufeatures",
+ "curve25519-dalek-derive",
+ "fiat-crypto",
"rand_core",
+ "rustc_version",
"subtle",
"zeroize",
]
+[[package]]
+name = "curve25519-dalek-derive"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.51",
+]
+
[[package]]
name = "cxx"
version = "1.0.75"
@@ -515,22 +519,23 @@
[[package]]
name = "der"
-version = "0.6.1"
+version = "0.7.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de"
+checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0"
dependencies = [
"const-oid",
+ "zeroize",
]
[[package]]
name = "derive-where"
-version = "1.0.0-rc.3"
+version = "1.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d322f2907b2abad3117790c1a54d8f2d64574ba0fbea54cb6c6e66a0e50d99a4"
+checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.99",
+ "syn 2.0.51",
]
[[package]]
@@ -557,9 +562,9 @@
[[package]]
name = "digest"
-version = "0.10.5"
+version = "0.10.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
dependencies = [
"block-buffer 0.10.3",
"crypto-common",
@@ -612,17 +617,16 @@
[[package]]
name = "elliptic-curve"
-version = "0.12.3"
+version = "0.13.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3"
+checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47"
dependencies = [
"base16ct",
- "crypto-bigint 0.4.9",
- "der 0.6.1",
- "digest 0.10.5",
- "ff 0.12.1",
+ "crypto-bigint 0.5.5",
+ "digest 0.10.7",
+ "ff 0.13.0",
"generic-array",
- "group 0.12.1",
+ "group 0.13.0",
"rand_core",
"sec1",
"subtle",
@@ -659,14 +663,20 @@
[[package]]
name = "ff"
-version = "0.12.1"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160"
+checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
dependencies = [
"rand_core",
"subtle",
]
+[[package]]
+name = "fiat-crypto"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
+
[[package]]
name = "fixedbitset"
version = "0.4.2"
@@ -766,13 +776,14 @@
[[package]]
name = "generic-array"
-version = "0.14.6"
+version = "0.14.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
dependencies = [
"serde",
"typenum",
"version_check",
+ "zeroize",
]
[[package]]
@@ -807,11 +818,11 @@
[[package]]
name = "group"
-version = "0.12.1"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7"
+checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
dependencies = [
- "ff 0.12.1",
+ "ff 0.13.0",
"rand_core",
"subtle",
]
@@ -900,7 +911,7 @@
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
dependencies = [
- "digest 0.10.5",
+ "digest 0.10.7",
]
[[package]]
@@ -1120,9 +1131,9 @@
[[package]]
name = "libc"
-version = "0.2.150"
+version = "0.2.162"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
+checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398"
[[package]]
name = "link-cplusplus"
@@ -1233,7 +1244,7 @@
name = "native_rust_library"
version = "0.1.0"
dependencies = [
- "argon2 0.5.1",
+ "argon2",
"backup_client",
"base64",
"comm-opaque2",
@@ -1313,16 +1324,16 @@
[[package]]
name = "opaque-ke"
-version = "2.0.0"
+version = "2.1.0-pre.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76d410412d23781909d90c3900c5783e830586765f2277bccc78167da8af81a5"
+checksum = "3752668208a325d8c887827fc3e7ee8f5b4030cc036fb63ddeb02c21921b700c"
dependencies = [
- "argon2 0.4.1",
+ "argon2",
"curve25519-dalek",
"derive-where",
- "digest 0.10.5",
+ "digest 0.10.7",
"displaydoc",
- "elliptic-curve 0.12.3",
+ "elliptic-curve 0.13.8",
"generic-array",
"hkdf",
"hmac 0.12.1",
@@ -1383,17 +1394,6 @@
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
-[[package]]
-name = "password-hash"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700"
-dependencies = [
- "base64ct",
- "rand_core",
- "subtle",
-]
-
[[package]]
name = "password-hash"
version = "0.5.0"
@@ -1795,12 +1795,12 @@
[[package]]
name = "sec1"
-version = "0.3.0"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928"
+checksum = "48518a2b5775ba8ca5b46596aae011caa431e6ce7e4a67ead66d92f08884220e"
dependencies = [
"base16ct",
- "der 0.6.1",
+ "der 0.7.9",
"generic-array",
"subtle",
"zeroize",
@@ -1897,7 +1897,7 @@
dependencies = [
"cfg-if",
"cpufeatures",
- "digest 0.10.5",
+ "digest 0.10.7",
]
[[package]]
@@ -1908,7 +1908,7 @@
dependencies = [
"cfg-if",
"cpufeatures",
- "digest 0.10.5",
+ "digest 0.10.7",
]
[[package]]
@@ -2001,9 +2001,9 @@
[[package]]
name = "subtle"
-version = "2.4.1"
+version = "2.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
[[package]]
name = "syn"
@@ -2419,9 +2419,9 @@
[[package]]
name = "typenum"
-version = "1.15.0"
+version = "1.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
[[package]]
name = "unicase"
@@ -2518,15 +2518,15 @@
[[package]]
name = "voprf"
-version = "0.4.0-pre.3"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "081acbe8fcf05d5e8e2aad8ef3d40e02eddeaec07c75a9770d862a0fc0874322"
+checksum = "3e389827f1bd1fe2b69c03ee133aed75c49f03f2d021c40b88c2ff6ce5517846"
dependencies = [
"curve25519-dalek",
"derive-where",
- "digest 0.10.5",
+ "digest 0.10.7",
"displaydoc",
- "elliptic-curve 0.12.3",
+ "elliptic-curve 0.13.8",
"generic-array",
"rand_core",
"serde",
@@ -2848,9 +2848,9 @@
[[package]]
name = "zeroize"
-version = "1.5.7"
+version = "1.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
dependencies = [
"zeroize_derive",
]
diff --git a/shared/comm-opaque2/Cargo.toml b/shared/comm-opaque2/Cargo.toml
--- a/shared/comm-opaque2/Cargo.toml
+++ b/shared/comm-opaque2/Cargo.toml
@@ -13,3 +13,4 @@
tonic = { version = "0.9.1", default-features = false }
wasm-bindgen = { workspace = true }
serde = { workspace = true, features = ["derive"] }
+generic-array = { workspace = true }
diff --git a/shared/comm-opaque2/src/opaque.rs b/shared/comm-opaque2/src/opaque.rs
--- a/shared/comm-opaque2/src/opaque.rs
+++ b/shared/comm-opaque2/src/opaque.rs
@@ -1,5 +1,6 @@
-use argon2::Argon2;
+use generic_array::{ArrayLength, GenericArray};
use opaque_ke::ciphersuite::CipherSuite;
+use opaque_ke::errors::InternalError;
pub struct Cipher;
@@ -7,5 +8,28 @@
type OprfCs = opaque_ke::Ristretto255;
type KeGroup = opaque_ke::Ristretto255;
type KeyExchange = opaque_ke::key_exchange::tripledh::TripleDh;
- type Ksf = Argon2<'static>;
+ type Ksf = Argon2_4096_3_1;
+}
+
+pub struct Argon2_4096_3_1 {
+ inner: argon2::Argon2<'static>,
+}
+impl Default for Argon2_4096_3_1 {
+ fn default() -> Self {
+ Self {
+ inner: argon2::Argon2::new(
+ argon2::Algorithm::default(),
+ argon2::Version::default(),
+ argon2::Params::new(4096, 3, 1, None).unwrap(),
+ ),
+ }
+ }
+}
+impl opaque_ke::ksf::Ksf for Argon2_4096_3_1 {
+ fn hash<L: ArrayLength<u8>>(
+ &self,
+ input: GenericArray<u8, L>,
+ ) -> Result<GenericArray<u8, L>, InternalError> {
+ self.inner.hash(input)
+ }
}
diff --git a/web/opaque-ke-wasm/Cargo.lock b/web/opaque-ke-wasm/Cargo.lock
--- a/web/opaque-ke-wasm/Cargo.lock
+++ b/web/opaque-ke-wasm/Cargo.lock
@@ -4,12 +4,13 @@
[[package]]
name = "argon2"
-version = "0.4.1"
+version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db4ce4441f99dbd377ca8a8f57b698c44d0d6e712d8329b5040da5a64aa1ce73"
+checksum = "3c3610892ee6e0cbce8ae2700349fcf8f98adb0dbfbee85aec3c9179d29cc072"
dependencies = [
"base64ct",
"blake2",
+ "cpufeatures",
"password-hash",
]
@@ -21,9 +22,9 @@
[[package]]
name = "base16ct"
-version = "0.1.1"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce"
+checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
[[package]]
name = "base64"
@@ -43,7 +44,7 @@
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe"
dependencies = [
- "digest 0.10.6",
+ "digest",
]
[[package]]
@@ -61,12 +62,6 @@
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
-[[package]]
-name = "byteorder"
-version = "1.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
-
[[package]]
name = "bytes"
version = "1.4.0"
@@ -84,6 +79,7 @@
version = "0.2.0"
dependencies = [
"argon2",
+ "generic-array",
"log",
"opaque-ke",
"rand",
@@ -120,18 +116,18 @@
[[package]]
name = "cpufeatures"
-version = "0.2.6"
+version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "280a9f2d8b3a38871a3c8a46fb80db65e5e5ed97da80c4d08bf27fb63e35e181"
+checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0"
dependencies = [
"libc",
]
[[package]]
name = "crypto-bigint"
-version = "0.4.9"
+version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef"
+checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
dependencies = [
"generic-array",
"rand_core",
@@ -151,51 +147,57 @@
[[package]]
name = "curve25519-dalek"
-version = "4.0.0-pre.1"
+version = "4.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4033478fbf70d6acf2655ac70da91ee65852d69daf7a67bf7a2f518fb47aafcf"
+checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be"
dependencies = [
- "byteorder",
- "digest 0.9.0",
+ "cfg-if",
+ "cpufeatures",
+ "curve25519-dalek-derive",
+ "fiat-crypto",
"rand_core",
+ "rustc_version",
"subtle",
"zeroize",
]
[[package]]
-name = "der"
-version = "0.6.1"
+name = "curve25519-dalek-derive"
+version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de"
+checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
dependencies = [
- "const-oid",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
]
[[package]]
-name = "derive-where"
-version = "1.0.0-rc.3"
+name = "der"
+version = "0.7.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d322f2907b2abad3117790c1a54d8f2d64574ba0fbea54cb6c6e66a0e50d99a4"
+checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0"
dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
+ "const-oid",
+ "zeroize",
]
[[package]]
-name = "digest"
-version = "0.9.0"
+name = "derive-where"
+version = "1.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
+checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25"
dependencies = [
- "generic-array",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
]
[[package]]
name = "digest"
-version = "0.10.6"
+version = "0.10.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
dependencies = [
"block-buffer",
"crypto-common",
@@ -215,14 +217,13 @@
[[package]]
name = "elliptic-curve"
-version = "0.12.3"
+version = "0.13.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3"
+checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47"
dependencies = [
"base16ct",
"crypto-bigint",
- "der",
- "digest 0.10.6",
+ "digest",
"ff",
"generic-array",
"group",
@@ -234,14 +235,20 @@
[[package]]
name = "ff"
-version = "0.12.1"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160"
+checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
dependencies = [
"rand_core",
"subtle",
]
+[[package]]
+name = "fiat-crypto"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
+
[[package]]
name = "fnv"
version = "1.0.7"
@@ -274,13 +281,14 @@
[[package]]
name = "generic-array"
-version = "0.14.6"
+version = "0.14.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
dependencies = [
"serde",
"typenum",
"version_check",
+ "zeroize",
]
[[package]]
@@ -298,9 +306,9 @@
[[package]]
name = "group"
-version = "0.12.1"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7"
+checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
dependencies = [
"ff",
"rand_core",
@@ -322,7 +330,7 @@
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
dependencies = [
- "digest 0.10.6",
+ "digest",
]
[[package]]
@@ -364,9 +372,9 @@
[[package]]
name = "libc"
-version = "0.2.140"
+version = "0.2.162"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c"
+checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398"
[[package]]
name = "log"
@@ -385,14 +393,14 @@
[[package]]
name = "opaque-ke"
-version = "2.0.0"
+version = "2.1.0-pre.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76d410412d23781909d90c3900c5783e830586765f2277bccc78167da8af81a5"
+checksum = "3752668208a325d8c887827fc3e7ee8f5b4030cc036fb63ddeb02c21921b700c"
dependencies = [
"argon2",
"curve25519-dalek",
"derive-where",
- "digest 0.10.6",
+ "digest",
"displaydoc",
"elliptic-curve",
"generic-array",
@@ -407,9 +415,9 @@
[[package]]
name = "password-hash"
-version = "0.4.2"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700"
+checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166"
dependencies = [
"base64ct",
"rand_core",
@@ -508,6 +516,15 @@
"getrandom",
]
+[[package]]
+name = "rustc_version"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
+dependencies = [
+ "semver",
+]
+
[[package]]
name = "scoped-tls"
version = "1.0.1"
@@ -516,9 +533,9 @@
[[package]]
name = "sec1"
-version = "0.3.0"
+version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928"
+checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
dependencies = [
"base16ct",
"der",
@@ -527,6 +544,12 @@
"zeroize",
]
+[[package]]
+name = "semver"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+
[[package]]
name = "serde"
version = "1.0.203"
@@ -555,14 +578,14 @@
dependencies = [
"cfg-if",
"cpufeatures",
- "digest 0.10.6",
+ "digest",
]
[[package]]
name = "subtle"
-version = "2.4.1"
+version = "2.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
[[package]]
name = "syn"
@@ -692,13 +715,13 @@
[[package]]
name = "voprf"
-version = "0.4.0-pre.3"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "081acbe8fcf05d5e8e2aad8ef3d40e02eddeaec07c75a9770d862a0fc0874322"
+checksum = "3e389827f1bd1fe2b69c03ee133aed75c49f03f2d021c40b88c2ff6ce5517846"
dependencies = [
"curve25519-dalek",
"derive-where",
- "digest 0.10.6",
+ "digest",
"displaydoc",
"elliptic-curve",
"generic-array",
@@ -883,9 +906,9 @@
[[package]]
name = "zeroize"
-version = "1.6.0"
+version = "1.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
dependencies = [
"zeroize_derive",
]
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Fri, Nov 22, 4:15 AM (10 h, 46 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2558970
Default Alt Text
D13895.diff (26 KB)
Attached To
Mode
D13895: [shared] bump opaque-ke to 2.1.0-pre.1
Attached
Detach File
Event Timeline
Log In to Comment