feat: upgrade crypto ecosystem to latest RustCrypto stack (#1)

Upgrade all core cryptographic dependencies to their latest versions:

Dependencies:
- digest: 0.10 to 0.11
- elliptic-curve: 0.13 to 0.14
- hkdf: 0.12 to 0.13
- hmac: 0.12 to 0.13
- rand: 0.8 to 0.10
- rand_chacha: 0.3 to 0.10
- sha2: 0.10 to 0.11
- getrandom: 0.2 to 0.4 (WASM)
- ml-kem: 0.3.0-rc.0 to 0.3
- ecdsa: 0.16 to 0.17.0-rc.23
- rfc6979: 0.4 to 0.6 (now internal to ecdsa)
- p256/p384/p521: 0.13 to 0.14.0-rc.15
- curve25519-dalek: 4 to 5.0.0-rc
- ed25519-dalek: 2 to 3.0.0-rc
- cryptoki: 0.9 to 0.12
- rustyline: 17 to 18
- scrypt: 0.11 to 0.12
- voprf replaced by voprf-vx 1.0.0-pre.0

Migration changes:
- generic-array 0.14 to 1.4 with hybrid-array 0.4 interop
- ArrayLength<u8> to ArrayLength (generic-array 1.x)
- Added ConcatExt trait to disambiguate from [T]::concat
- Replaced Hmac with SimpleHmac for digest 0.11 compatibility
- Added OutputSize<H>: ArrayLength bounds throughout Hash trait
- Converted hybrid_array::Array between GenericArray at API boundaries
- Updated GroupEncoding Repr bound to hybrid_array::Array
- ECDSA sign now uses ecdsa::hazmat::sign_prehashed_rfc6979
- Removed direct rfc6979 dependency (handled by ecdsa internally)
- Replaced bincode with postcard for no_std serialization
- Re-exported hybrid_array from crate root

Other changes:
- Renamed crate to opaque-vx
- Increased MSRV to 1.89
- Added cryptography to Cargo.toml categories
- Removed Facebook-specific contributions from CONTRIBUTING.md
- Removed v3 to v4 migration test
- Removed unstable rustfmt configurations for stable compatibility

Reviewed-on: #1
Co-authored-by: UneBaguette <[email protected]>
Co-committed-by: UneBaguette <[email protected]>

examples/digital_locker.rs

@@ -30,16 +30,16 @@ use std::process::exit;
 
 use chacha20poly1305::aead::{Aead, KeyInit};
 use chacha20poly1305::{ChaCha20Poly1305, Key, Nonce};
-use opaque_ke::ciphersuite::CipherSuite;
-use opaque_ke::generic_array::GenericArray;
-use opaque_ke::rand::RngCore;
-use opaque_ke::rand::rngs::OsRng;
-use opaque_ke::{
+use opaque_vx::ciphersuite::CipherSuite;
+use opaque_vx::rand::Rng;
+use opaque_vx::rand::rngs::SysRng;
+use opaque_vx::{
     ClientLogin, ClientLoginFinishParameters, ClientRegistration,
     ClientRegistrationFinishParameters, CredentialFinalization, CredentialRequest,
     CredentialResponse, RegistrationRequest, RegistrationResponse, RegistrationUpload, ServerLogin,
-    ServerLoginParameters, ServerRegistration, ServerRegistrationLen, ServerSetup,
+    ServerLoginParameters, ServerRegistration, ServerSetup,
 };
+use rand_core::UnwrapErr;
 use rustyline::Editor;
 use rustyline::error::ReadlineError;
 use rustyline::history::DefaultHistory;
@@ -51,43 +51,43 @@ struct DefaultCipherSuite;
 
 #[cfg(feature = "ristretto255")]
 impl CipherSuite for DefaultCipherSuite {
-    type OprfCs = opaque_ke::Ristretto255;
-    type KeyExchange = opaque_ke::TripleDh<opaque_ke::Ristretto255, sha2::Sha512>;
-    type Ksf = opaque_ke::ksf::Identity;
+    type OprfCs = opaque_vx::Ristretto255;
+    type KeyExchange = opaque_vx::TripleDh<opaque_vx::Ristretto255, sha2::Sha512>;
+    type Ksf = opaque_vx::ksf::Identity;
 }
 
 #[cfg(not(feature = "ristretto255"))]
 impl CipherSuite for DefaultCipherSuite {
     type OprfCs = p256::NistP256;
-    type KeyExchange = opaque_ke::TripleDh<p256::NistP256, sha2::Sha256>;
-    type Ksf = opaque_ke::ksf::Identity;
+    type KeyExchange = opaque_vx::TripleDh<p256::NistP256, sha2::Sha256>;
+    type Ksf = opaque_vx::ksf::Identity;
 }
 
 struct Locker {
     contents: Vec<u8>,
-    password_file: GenericArray<u8, ServerRegistrationLen<DefaultCipherSuite>>,
+    password_file: Vec<u8>,
 }
 
 // Given a key and plaintext, produce an AEAD ciphertext along with a nonce
 fn encrypt(key: &[u8], plaintext: &[u8]) -> Vec<u8> {
-    let cipher = ChaCha20Poly1305::new(Key::from_slice(&key[..32]));
+    let cipher = ChaCha20Poly1305::new(&Key::try_from(&key[..32]).unwrap());
 
-    let mut rng = OsRng;
+    let mut rng = UnwrapErr(SysRng);
     let mut nonce_bytes = [0u8; 12];
     rng.fill_bytes(&mut nonce_bytes);
-    let nonce = Nonce::from_slice(&nonce_bytes);
+    let nonce = Nonce::try_from(&nonce_bytes[..]).unwrap();
 
-    let ciphertext = cipher.encrypt(nonce, plaintext.as_ref()).unwrap();
+    let ciphertext = cipher.encrypt(&nonce, plaintext.as_ref()).unwrap();
     [nonce_bytes.to_vec(), ciphertext].concat()
 }
 
 // Decrypt using a key and a ciphertext (nonce included) to recover the original
 // plaintext
 fn decrypt(key: &[u8], ciphertext: &[u8]) -> Vec<u8> {
-    let cipher = ChaCha20Poly1305::new(Key::from_slice(&key[..32]));
+    let cipher = ChaCha20Poly1305::new(&Key::try_from(&key[..32]).unwrap());
     cipher
         .decrypt(
-            Nonce::from_slice(&ciphertext[..12]),
+            &Nonce::try_from(&ciphertext[..12]).unwrap(),
             ciphertext[12..].as_ref(),
         )
         .unwrap()
@@ -101,7 +101,7 @@ fn register_locker(
     password: String,
     secret_message: String,
 ) -> Locker {
-    let mut client_rng = OsRng;
+    let mut client_rng = UnwrapErr(SysRng);
     let client_registration_start_result =
         ClientRegistration::<DefaultCipherSuite>::start(&mut client_rng, password.as_bytes())
             .unwrap();
@@ -143,7 +143,7 @@ fn register_locker(
 
     Locker {
         contents: ciphertext,
-        password_file: password_file.serialize(),
+        password_file: password_file.serialize().to_vec(),
     }
 }
 
@@ -154,7 +154,7 @@ fn open_locker(
     password: String,
     locker: &Locker,
 ) -> Result<String, String> {
-    let mut client_rng = OsRng;
+    let mut client_rng = UnwrapErr(SysRng);
     let client_login_start_result =
         ClientLogin::<DefaultCipherSuite>::start(&mut client_rng, password.as_bytes()).unwrap();
     let credential_request_bytes = client_login_start_result.message.serialize();
@@ -163,7 +163,7 @@ fn open_locker(
 
     let password_file =
         ServerRegistration::<DefaultCipherSuite>::deserialize(&locker.password_file).unwrap();
-    let mut server_rng = OsRng;
+    let mut server_rng = UnwrapErr(SysRng);
     let server_login_start_result = ServerLogin::start(
         &mut server_rng,
         server_setup,
@@ -217,7 +217,7 @@ fn open_locker(
 }
 
 fn main() {
-    let mut rng = OsRng;
+    let mut rng = UnwrapErr(SysRng);
     let server_setup = ServerSetup::<DefaultCipherSuite>::new(&mut rng);
 
     let mut rl = Editor::<(), _>::new().unwrap();

examples/simple_login.rs

@@ -22,22 +22,22 @@
 //! over "the wire" to the server. These bytes are serialized and explicitly
 //! annotated in the below functions.
 
-use std::collections::HashMap;
-use std::process::exit;
-
-use opaque_ke::argon2::Argon2;
-use opaque_ke::ciphersuite::CipherSuite;
-use opaque_ke::generic_array::GenericArray;
-use opaque_ke::rand::rngs::OsRng;
-use opaque_ke::{
+use opaque_vx::argon2::Argon2;
+use opaque_vx::ciphersuite::CipherSuite;
+use opaque_vx::hybrid_array::Array;
+use opaque_vx::rand::rngs::SysRng;
+use opaque_vx::{
     ClientLogin, ClientLoginFinishParameters, ClientRegistration,
     ClientRegistrationFinishParameters, CredentialFinalization, CredentialRequest,
     CredentialResponse, RegistrationRequest, RegistrationResponse, RegistrationUpload, ServerLogin,
     ServerLoginParameters, ServerRegistration, ServerRegistrationLen, ServerSetup,
 };
+use rand_core::UnwrapErr;
 use rustyline::Editor;
 use rustyline::error::ReadlineError;
 use rustyline::history::DefaultHistory;
+use std::collections::HashMap;
+use std::process::exit;
 
 // The ciphersuite trait allows to specify the underlying primitives that will
 // be used in the OPAQUE protocol
@@ -46,8 +46,8 @@ struct DefaultCipherSuite;
 
 #[cfg(feature = "ristretto255")]
 impl CipherSuite for DefaultCipherSuite {
-    type OprfCs = opaque_ke::Ristretto255;
-    type KeyExchange = opaque_ke::TripleDh<opaque_ke::Ristretto255, sha2::Sha512>;
+    type OprfCs = opaque_vx::Ristretto255;
+    type KeyExchange = opaque_vx::TripleDh<opaque_vx::Ristretto255, sha2::Sha512>;
 
     type Ksf = Argon2<'static>;
 }
@@ -55,7 +55,7 @@ impl CipherSuite for DefaultCipherSuite {
 #[cfg(not(feature = "ristretto255"))]
 impl CipherSuite for DefaultCipherSuite {
     type OprfCs = p256::NistP256;
-    type KeyExchange = opaque_ke::TripleDh<p256::NistP256, sha2::Sha256>;
+    type KeyExchange = opaque_vx::TripleDh<p256::NistP256, sha2::Sha256>;
 
     type Ksf = Argon2<'static>;
 }
@@ -65,8 +65,8 @@ fn account_registration(
     server_setup: &ServerSetup<DefaultCipherSuite>,
     username: String,
     password: String,
-) -> GenericArray<u8, ServerRegistrationLen<DefaultCipherSuite>> {
-    let mut client_rng = OsRng;
+) -> Array<u8, ServerRegistrationLen<DefaultCipherSuite>> {
+    let mut client_rng = UnwrapErr(SysRng);
     let client_registration_start_result =
         ClientRegistration::<DefaultCipherSuite>::start(&mut client_rng, password.as_bytes())
             .unwrap();
@@ -100,7 +100,7 @@ fn account_registration(
     let password_file = ServerRegistration::finish(
         RegistrationUpload::<DefaultCipherSuite>::deserialize(&message_bytes).unwrap(),
     );
-    password_file.serialize()
+    password_file.serialize().into_ha0_4()
 }
 
 // Password-based login between a client and server
@@ -110,7 +110,7 @@ fn account_login(
     password: String,
     password_file_bytes: &[u8],
 ) -> bool {
-    let mut client_rng = OsRng;
+    let mut client_rng = UnwrapErr(SysRng);
     let client_login_start_result =
         ClientLogin::<DefaultCipherSuite>::start(&mut client_rng, password.as_bytes()).unwrap();
     let credential_request_bytes = client_login_start_result.message.serialize();
@@ -119,7 +119,7 @@ fn account_login(
 
     let password_file =
         ServerRegistration::<DefaultCipherSuite>::deserialize(password_file_bytes).unwrap();
-    let mut server_rng = OsRng;
+    let mut server_rng = UnwrapErr(SysRng);
     let server_login_start_result = ServerLogin::start(
         &mut server_rng,
         server_setup,
@@ -161,12 +161,12 @@ fn account_login(
 }
 
 fn main() {
-    let mut rng = OsRng;
+    let mut rng = UnwrapErr(SysRng);
     let server_setup = ServerSetup::<DefaultCipherSuite>::new(&mut rng);
 
     let mut rl = Editor::<(), _>::new().unwrap();
     let mut registered_users =
-        HashMap::<String, GenericArray<u8, ServerRegistrationLen<DefaultCipherSuite>>>::new();
+        HashMap::<String, Array<u8, ServerRegistrationLen<DefaultCipherSuite>>>::new();
     loop {
         println!(
             "\nCurrently registered usernames: {:?}\n",