diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 90ed082..b42297b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,7 +23,7 @@ jobs: - --features serde toolchain: - stable - - 1.60.0 + - 1.62.0 name: test steps: - name: Checkout sources @@ -78,7 +78,7 @@ jobs: matrix: toolchain: - stable - - 1.60.0 + - 1.62.0 name: test simple_login command-line example steps: - name: install expect @@ -101,7 +101,7 @@ jobs: matrix: toolchain: - stable - - 1.60.0 + - 1.62.0 name: test digital_locker command-line example steps: - name: install expect diff --git a/Cargo.toml b/Cargo.toml index c8b5e86..abc422e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ license = "Apache-2.0 OR MIT" name = "opaque-ke" readme = "README.md" repository = "https://github.com/novifinancial/opaque-ke" -rust-version = "1.60" +rust-version = "1.62" version = "3.0.0-pre.1" [features] @@ -62,7 +62,7 @@ proptest = "1" rand = "0.8" regex = "1" # MSRV -rustyline = "10.1.1" +rustyline = "11" scrypt = "0.10" serde_json = "1" diff --git a/README.md b/README.md index a4f22f9..7f12050 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ opaque-ke = "3.0.0-pre.1" ### Minimum Supported Rust Version -Rust **1.60** or higher. +Rust **1.62** or higher. Audit ----- diff --git a/examples/digital_locker.rs b/examples/digital_locker.rs index 3aae25a..c1a8d92 100644 --- a/examples/digital_locker.rs +++ b/examples/digital_locker.rs @@ -40,6 +40,7 @@ use opaque_ke::{ ServerLoginStartParameters, ServerRegistration, ServerRegistrationLen, ServerSetup, }; use rustyline::error::ReadlineError; +use rustyline::history::DefaultHistory; use rustyline::Editor; // The ciphersuite trait allows to specify the underlying primitives that will @@ -216,7 +217,7 @@ fn main() { let mut rng = OsRng; let server_setup = ServerSetup::::new(&mut rng); - let mut rl = Editor::<()>::new().unwrap(); + let mut rl = Editor::<(), _>::new().unwrap(); let mut registered_lockers: Vec = vec![]; loop { display_lockers(®istered_lockers); @@ -323,7 +324,7 @@ fn handle_error(err: ReadlineError) { fn get_two_strings( s1: &str, s2: &str, - rl: &mut Editor<()>, + rl: &mut Editor<(), DefaultHistory>, string1: Option, ) -> (String, String) { let query = if string1.is_none() { s1 } else { s2 }; diff --git a/examples/simple_login.rs b/examples/simple_login.rs index 10e4b92..7e82c52 100644 --- a/examples/simple_login.rs +++ b/examples/simple_login.rs @@ -35,6 +35,7 @@ use opaque_ke::{ ServerLoginStartParameters, ServerRegistration, ServerRegistrationLen, ServerSetup, }; use rustyline::error::ReadlineError; +use rustyline::history::DefaultHistory; use rustyline::Editor; // The ciphersuite trait allows to specify the underlying primitives that will @@ -160,7 +161,7 @@ fn main() { let mut rng = OsRng; let server_setup = ServerSetup::::new(&mut rng); - let mut rl = Editor::<()>::new().unwrap(); + let mut rl = Editor::<(), _>::new().unwrap(); let mut registered_users = HashMap::>>::new(); loop { @@ -237,7 +238,7 @@ fn handle_error(err: ReadlineError) { fn get_two_strings( s1: &str, s2: &str, - rl: &mut Editor<()>, + rl: &mut Editor<(), DefaultHistory>, string1: Option, ) -> (String, String) { let query = if string1.is_none() { s1 } else { s2 }; diff --git a/src/lib.rs b/src/lib.rs index d31899e..de749ca 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -14,7 +14,7 @@ //! //! ### Minimum Supported Rust Version //! -//! Rust **1.60** or higher. +//! Rust **1.62** or higher. //! //! # Overview //!