cargo fmt

This commit is contained in:
Jędrzej Stuczyński
2026-02-26 15:41:38 +00:00
parent 0f8598ad52
commit 96dbe583ce
4 changed files with 34 additions and 20 deletions
+1 -1
View File
@@ -112,7 +112,7 @@ impl KKTFrame {
responder_keypair: &DHKeyPair,
message: KKTRequest,
supported_versions: &[u8],
request_payload_len: usize
request_payload_len: usize,
) -> Result<DecryptedRequestFrame, KKTError> {
let mask = message.plaintext.version_mask(&responder_keypair.pk);
+5 -5
View File
@@ -40,7 +40,7 @@ impl<'a> KKTInitiator<'a> {
responder_dh_public_key: &DHPublicKey,
expected_hash: &'a [u8],
outer_protocol_version: u8,
payload: Option<Vec<u8>>
payload: Option<Vec<u8>>,
) -> Result<(Self, KKTRequestWithReceiverIndex), KKTError>
where
R: CryptoRng + RngCore,
@@ -53,7 +53,7 @@ impl<'a> KKTInitiator<'a> {
responder_dh_public_key,
expected_hash,
outer_protocol_version,
payload
payload,
)
}
@@ -78,7 +78,7 @@ impl<'a> KKTInitiator<'a> {
responder_dh_public_key,
expected_hash,
outer_protocol_version,
payload
payload,
)
}
@@ -118,7 +118,7 @@ impl<'a> KKTInitiator<'a> {
pub fn process_response(
&mut self,
response: KKTResponse,
response_payload_len: usize
response_payload_len: usize,
) -> Result<ProcessedKKTResponse, KKTError> {
let decrypted_response_bytes = self.carrier.decrypt(&response.encrypted_frame)?;
let response_frame = KKTFrame::from_bytes(&decrypted_response_bytes, response_payload_len)?;
@@ -191,6 +191,6 @@ pub fn initiator_ingest_response(
Ok(ProcessedKKTResponse {
encapsulation_key,
verified_initiator_kem_key,
response_payload: remote_frame.payload().to_vec()
response_payload: remote_frame.payload().to_vec(),
})
}
+21 -11
View File
@@ -107,15 +107,19 @@ mod test {
&responder_x25519_keypair.pk,
&r_dir_hash_mlkem,
1u8,
Some(payload.clone())
Some(payload.clone()),
)
.unwrap();
let processed_request = responder.process_request(request.request, payload.len()).unwrap();
let processed_request = responder
.process_request(request.request, payload.len())
.unwrap();
assert_eq!(processed_request.request_payload, payload);
let result = initiator.process_response(processed_request.response, 0).unwrap();
let result = initiator
.process_response(processed_request.response, 0)
.unwrap();
assert_eq!(
result.encapsulation_key.as_bytes(),
@@ -137,11 +141,13 @@ mod test {
&responder_x25519_keypair.pk,
&r_dir_hash_mlkem,
1u8,
Some(payload.clone())
Some(payload.clone()),
)
.unwrap();
let processed_request = responder.process_request(request.request,payload.len() ).unwrap();
let processed_request = responder
.process_request(request.request, payload.len())
.unwrap();
assert_eq!(processed_request.request_payload, payload);
@@ -173,13 +179,15 @@ mod test {
&responder_x25519_keypair.pk,
&r_dir_hash_mceliece,
1u8,
Some(payload.clone())
Some(payload.clone()),
)
.unwrap();
let processed_request = responder.process_request(request.request, payload.len()).unwrap();
assert_eq!(processed_request.request_payload, payload);
let processed_request = responder
.process_request(request.request, payload.len())
.unwrap();
assert_eq!(processed_request.request_payload, payload);
let processed_response = initiator
.process_response(processed_request.response, 0)
.unwrap();
@@ -204,11 +212,13 @@ assert_eq!(processed_request.request_payload, payload);
&responder_x25519_keypair.pk,
&r_dir_hash_mceliece,
1u8,
Some(payload.clone())
Some(payload.clone()),
)
.unwrap();
let processed_request = responder.process_request(request.request, payload.len()).unwrap();
let processed_request = responder
.process_request(request.request, payload.len())
.unwrap();
assert_eq!(processed_request.request_payload, payload);
+7 -3
View File
@@ -89,12 +89,16 @@ impl<'a> KKTResponder<'a> {
// When this function fails, we do that silently (i.e. we don't generate a response to the initiator).
pub fn process_request(&self, request: KKTRequest, request_payload_len: usize) -> Result<ProcessedKKTRequest, KKTError> {
pub fn process_request(
&self,
request: KKTRequest,
request_payload_len: usize,
) -> Result<ProcessedKKTRequest, KKTError> {
let processed_req = KKTFrame::decrypt_initiator_frame(
self.x25519_keypair,
request,
&self.supported_outer_protocol_versions,
request_payload_len
request_payload_len,
)?;
let remote_context = *processed_req.remote_context();
@@ -136,7 +140,7 @@ impl<'a> KKTResponder<'a> {
requested_kem: remote_context.ciphersuite().kem(),
receiver_index: processed_req.receiver_index,
outer_protocol_version: processed_req.outer_protocol_version,
request_payload
request_payload,
})
}
}