From a0cab10663306c76e262f94a760531cff338f3bc Mon Sep 17 00:00:00 2001
From: daxpedda <daxpedda@gmail.com>
Date: Sun, 11 Dec 2022 06:30:05 +0100
Subject: [PATCH] Update dependencies (#288)

* Fix Clippy

* Update dependencies
---
 Cargo.toml                 | 10 ++++------
 examples/digital_locker.rs |  4 ++--
 examples/simple_login.rs   |  2 +-
 src/opaque.rs              |  4 ++--
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 0dea93c..084b2e5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -34,7 +34,7 @@ argon2 = { version = "0.4", default-features = false, features = [
   "alloc",
 ], optional = true }
 curve25519-dalek = { version = "=4.0.0-pre.1", default-features = false, optional = true }
-derive-where = { version = "=1.0.0-rc.3", features = ["zeroize-on-drop"] }
+derive-where = { version = "1", features = ["zeroize-on-drop"] }
 digest = "0.10"
 displaydoc = { version = "0.2", default-features = false }
 elliptic-curve = { version = "0.12", features = ["hash2curve", "sec1"] }
@@ -46,9 +46,7 @@ serde_ = { version = "1", package = "serde", default-features = false, features
   "derive",
 ], optional = true }
 subtle = { version = "2.3", default-features = false }
-voprf = { version = "=0.4.0-pre.3", default-features = false, features = [
-  "danger",
-] }
+voprf = { version = "0.4", default-features = false, features = ["danger"] }
 zeroize = { version = "1.5", features = ["zeroize_derive"] }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
@@ -56,7 +54,7 @@ getrandom = { version = "0.2", features = ["js"], optional = true }
 
 [dev-dependencies]
 bincode = "1"
-chacha20poly1305 = "=0.10.0-pre"
+chacha20poly1305 = "0.10"
 criterion = "0.4"
 hex = "0.4"
 json = "0.12"
@@ -67,7 +65,7 @@ p256 = { version = "0.11", default-features = false, features = [
 proptest = "1"
 rand = "0.8"
 regex = "1"
-rustyline = "9"
+rustyline = "10"
 scrypt = "0.10"
 serde_json = "1"
 
diff --git a/examples/digital_locker.rs b/examples/digital_locker.rs
index 6bb5d73..c480856 100644
--- a/examples/digital_locker.rs
+++ b/examples/digital_locker.rs
@@ -27,7 +27,7 @@
 
 use std::process::exit;
 
-use chacha20poly1305::aead::{Aead, NewAead};
+use chacha20poly1305::aead::{Aead, KeyInit};
 use chacha20poly1305::{ChaCha20Poly1305, Key, Nonce};
 use generic_array::GenericArray;
 use opaque_ke::ciphersuite::CipherSuite;
@@ -216,7 +216,7 @@ fn main() {
     let mut rng = OsRng;
     let server_setup = ServerSetup::<DefaultCipherSuite>::new(&mut rng);
 
-    let mut rl = Editor::<()>::new();
+    let mut rl = Editor::<()>::new().unwrap();
     let mut registered_lockers: Vec<Locker> = vec![];
     loop {
         display_lockers(&registered_lockers);
diff --git a/examples/simple_login.rs b/examples/simple_login.rs
index 39296be..feeda5a 100644
--- a/examples/simple_login.rs
+++ b/examples/simple_login.rs
@@ -160,7 +160,7 @@ fn main() {
     let mut rng = OsRng;
     let server_setup = ServerSetup::<DefaultCipherSuite>::new(&mut rng);
 
-    let mut rl = Editor::<()>::new();
+    let mut rl = Editor::<()>::new().unwrap();
     let mut registered_users =
         HashMap::<String, GenericArray<u8, ServerRegistrationLen<DefaultCipherSuite>>>::new();
     loop {
diff --git a/src/opaque.rs b/src/opaque.rs
index c858b50..128d12a 100644
--- a/src/opaque.rs
+++ b/src/opaque.rs
@@ -453,7 +453,7 @@ where
             oprf_key_from_seed::<CS::OprfCs>(&server_setup.oprf_seed, credential_identifier)?;
 
         let server = voprf::OprfServer::new_with_key(&oprf_key)?;
-        let evaluation_element = server.evaluate(&message.blinded_element);
+        let evaluation_element = server.blind_evaluate(&message.blinded_element);
 
         Ok(ServerRegistrationStartResult {
             message: RegistrationResponse {
@@ -760,7 +760,7 @@ where
                 .map_err(ProtocolError::into_custom)?;
         let server = voprf::OprfServer::new_with_key(&oprf_key)
             .map_err(|e| ProtocolError::into_custom(e.into()))?;
-        let evaluation_element = server.evaluate(&credential_request.blinded_element);
+        let evaluation_element = server.blind_evaluate(&credential_request.blinded_element);
 
         let beta = OprfGroup::<CS>::serialize_elem(evaluation_element.value());
         let credential_response_component =