Add SlowHash configuration (#234)
* Add `SlowHash` configuration * Use a reference * Changing generic argument to be CipherSuite instead of SlowHash Co-authored-by: Kevin Lewi <[email protected]>
This commit is contained in:
+26
-10
@@ -347,8 +347,12 @@ fn generate_parameters<CS: CipherSuite>() -> TestVectorParameters {
|
||||
.finish(
|
||||
&mut finish_registration_rng,
|
||||
server_registration_start_result.message,
|
||||
ClientRegistrationFinishParameters::WithIdentifiers(
|
||||
Identifiers::ClientAndServerIdentifiers(id_u.to_vec(), id_s.to_vec()),
|
||||
ClientRegistrationFinishParameters::new(
|
||||
Some(Identifiers::ClientAndServerIdentifiers(
|
||||
id_u.to_vec(),
|
||||
id_s.to_vec(),
|
||||
)),
|
||||
None,
|
||||
),
|
||||
)
|
||||
.unwrap();
|
||||
@@ -402,9 +406,13 @@ fn generate_parameters<CS: CipherSuite>() -> TestVectorParameters {
|
||||
.state
|
||||
.finish(
|
||||
server_login_start_result.message,
|
||||
ClientLoginFinishParameters::WithContextAndIdentifiers(
|
||||
context.to_vec(),
|
||||
Identifiers::ClientAndServerIdentifiers(id_u.to_vec(), id_s.to_vec()),
|
||||
ClientLoginFinishParameters::new(
|
||||
Some(context.to_vec()),
|
||||
Some(Identifiers::ClientAndServerIdentifiers(
|
||||
id_u.to_vec(),
|
||||
id_s.to_vec(),
|
||||
)),
|
||||
None,
|
||||
),
|
||||
)
|
||||
.unwrap();
|
||||
@@ -544,8 +552,12 @@ fn test_registration_upload() -> Result<(), ProtocolError> {
|
||||
.finish(
|
||||
&mut finish_registration_rng,
|
||||
RegistrationResponse::deserialize(¶meters.registration_response[..])?,
|
||||
ClientRegistrationFinishParameters::WithIdentifiers(
|
||||
Identifiers::ClientAndServerIdentifiers(parameters.id_u, parameters.id_s),
|
||||
ClientRegistrationFinishParameters::new(
|
||||
Some(Identifiers::ClientAndServerIdentifiers(
|
||||
parameters.id_u,
|
||||
parameters.id_s,
|
||||
)),
|
||||
None,
|
||||
),
|
||||
)?;
|
||||
|
||||
@@ -662,9 +674,13 @@ fn test_credential_finalization() -> Result<(), ProtocolError> {
|
||||
CredentialResponse::<RistrettoSha5123dhNoSlowHash>::deserialize(
|
||||
¶meters.credential_response[..],
|
||||
)?,
|
||||
ClientLoginFinishParameters::WithContextAndIdentifiers(
|
||||
parameters.context,
|
||||
Identifiers::ClientAndServerIdentifiers(parameters.id_u, parameters.id_s),
|
||||
ClientLoginFinishParameters::new(
|
||||
Some(parameters.context),
|
||||
Some(Identifiers::ClientAndServerIdentifiers(
|
||||
parameters.id_u,
|
||||
parameters.id_s,
|
||||
)),
|
||||
None,
|
||||
),
|
||||
)?;
|
||||
|
||||
|
||||
@@ -881,8 +881,8 @@ fn test_registration_upload<CS: CipherSuite>(tvs: &[&str]) -> Result<(), Protoco
|
||||
&mut finish_registration_rng,
|
||||
RegistrationResponse::deserialize(¶meters.registration_response[..]).unwrap(),
|
||||
match parse_identifiers(parameters.client_identity, parameters.server_identity) {
|
||||
None => ClientRegistrationFinishParameters::Default,
|
||||
Some(ids) => ClientRegistrationFinishParameters::WithIdentifiers(ids),
|
||||
None => ClientRegistrationFinishParameters::default(),
|
||||
Some(ids) => ClientRegistrationFinishParameters::new(Some(ids), None),
|
||||
},
|
||||
)?;
|
||||
|
||||
@@ -998,9 +998,9 @@ fn test_ke3<CS: CipherSuite>(tvs: &[&str]) -> Result<(), ProtocolError> {
|
||||
let client_login_finish_result = client_login_start_result.state.finish(
|
||||
CredentialResponse::<CS>::deserialize(¶meters.KE2[..])?,
|
||||
match parse_identifiers(parameters.client_identity, parameters.server_identity) {
|
||||
None => ClientLoginFinishParameters::WithContext(parameters.context),
|
||||
None => ClientLoginFinishParameters::new(Some(parameters.context), None, None),
|
||||
Some(ids) => {
|
||||
ClientLoginFinishParameters::WithContextAndIdentifiers(parameters.context, ids)
|
||||
ClientLoginFinishParameters::new(Some(parameters.context), Some(ids), None)
|
||||
}
|
||||
},
|
||||
)?;
|
||||
|
||||
Reference in New Issue
Block a user