Skip to content
This repository has been archived by the owner on Jul 29, 2024. It is now read-only.

Commit

Permalink
Optimize IDEKM stack usage.
Browse files Browse the repository at this point in the history 
fix #186.

Signed-off-by: Yang, Longlong <[email protected]>
  • Loading branch information
@longlongyang
longlongyang committed Dec 29, 2023
1 parent 3d3d79e commit 36e2686
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 21 deletions.
4 changes: 2 additions & 2 deletions idekm/src/pci_ide_km_requester/pci_ide_km_req_key_prog.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ impl IdekmReqContext {
key_direction: u8,
key_sub_stream: u8,
port_index: u8,
key_iv: Aes256GcmKeyBuffer,
key_iv: &Aes256GcmKeyBuffer,
// OUT
kp_ack_status: &mut KpAckStatus,
) -> SpdmResult {
Expand All @@ -50,7 +50,7 @@ impl IdekmReqContext {
key_direction,
key_sub_stream,
port_index,
key_iv,
key_iv: key_iv.clone(),
}
.encode(&mut writer)
.map_err(|_| SPDM_STATUS_BUFFER_FULL)?
Expand Down
41 changes: 22 additions & 19 deletions test/spdm-requester-emu/src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,7 @@ async fn test_spdm(
async fn test_idekm_tdisp(
socket_io_transport: Arc<Mutex<dyn SpdmDeviceIo + Send + Sync>>,
transport_encap: Arc<Mutex<dyn SpdmTransportEncap + Send + Sync>>,
key_iv: Arc<Mutex<Aes256GcmKeyBuffer>>,
) {
let req_capabilities = SpdmRequestCapabilityFlags::CERT_CAP
| SpdmRequestCapabilityFlags::CHAL_CAP
Expand Down Expand Up @@ -656,8 +657,9 @@ async fn test_idekm_tdisp(
let key_set = KEY_SET_0;
let key_direction = KEY_DIRECTION_RX;
let key_sub_stream = KEY_SUB_STREAM_PR;
let mut key_iv: Aes256GcmKeyBuffer;
key_iv = Default::default();

let mut key_iv = key_iv.lock();

get_random(&mut key_iv.key[0].to_le_bytes()).unwrap();
get_random(&mut key_iv.key[1].to_le_bytes()).unwrap();
get_random(&mut key_iv.key[2].to_le_bytes()).unwrap();
Expand All @@ -678,7 +680,7 @@ async fn test_idekm_tdisp(
key_direction,
key_sub_stream,
port_index,
key_iv,
&key_iv,
&mut kp_ack_status,
)
.await
Expand All @@ -697,8 +699,7 @@ async fn test_idekm_tdisp(
let key_set = KEY_SET_0;
let key_direction = KEY_DIRECTION_RX;
let key_sub_stream = KEY_SUB_STREAM_NPR;
let mut key_iv: Aes256GcmKeyBuffer;
key_iv = Default::default();

get_random(&mut key_iv.key[0].to_le_bytes()).unwrap();
get_random(&mut key_iv.key[1].to_le_bytes()).unwrap();
get_random(&mut key_iv.key[2].to_le_bytes()).unwrap();
Expand All @@ -719,7 +720,7 @@ async fn test_idekm_tdisp(
key_direction,
key_sub_stream,
port_index,
key_iv,
&key_iv,
&mut kp_ack_status,
)
.await
Expand All @@ -738,8 +739,7 @@ async fn test_idekm_tdisp(
let key_set = KEY_SET_0;
let key_direction = KEY_DIRECTION_RX;
let key_sub_stream = KEY_SUB_STREAM_CPL;
let mut key_iv: Aes256GcmKeyBuffer;
key_iv = Default::default();

get_random(&mut key_iv.key[0].to_le_bytes()).unwrap();
get_random(&mut key_iv.key[1].to_le_bytes()).unwrap();
get_random(&mut key_iv.key[2].to_le_bytes()).unwrap();
Expand All @@ -760,7 +760,7 @@ async fn test_idekm_tdisp(
key_direction,
key_sub_stream,
port_index,
key_iv,
&key_iv,
&mut kp_ack_status,
)
.await
Expand All @@ -779,8 +779,7 @@ async fn test_idekm_tdisp(
let key_set = KEY_SET_0;
let key_direction = KEY_DIRECTION_TX;
let key_sub_stream = KEY_SUB_STREAM_PR;
let mut key_iv: Aes256GcmKeyBuffer;
key_iv = Default::default();

get_random(&mut key_iv.key[0].to_le_bytes()).unwrap();
get_random(&mut key_iv.key[1].to_le_bytes()).unwrap();
get_random(&mut key_iv.key[2].to_le_bytes()).unwrap();
Expand All @@ -801,7 +800,7 @@ async fn test_idekm_tdisp(
key_direction,
key_sub_stream,
port_index,
key_iv,
&key_iv,
&mut kp_ack_status,
)
.await
Expand All @@ -820,8 +819,7 @@ async fn test_idekm_tdisp(
let key_set = KEY_SET_0;
let key_direction = KEY_DIRECTION_TX;
let key_sub_stream = KEY_SUB_STREAM_NPR;
let mut key_iv: Aes256GcmKeyBuffer;
key_iv = Default::default();

get_random(&mut key_iv.key[0].to_le_bytes()).unwrap();
get_random(&mut key_iv.key[1].to_le_bytes()).unwrap();
get_random(&mut key_iv.key[2].to_le_bytes()).unwrap();
Expand All @@ -842,7 +840,7 @@ async fn test_idekm_tdisp(
key_direction,
key_sub_stream,
port_index,
key_iv,
&key_iv,
&mut kp_ack_status,
)
.await
Expand All @@ -861,8 +859,7 @@ async fn test_idekm_tdisp(
let key_set = KEY_SET_0;
let key_direction = KEY_DIRECTION_TX;
let key_sub_stream = KEY_SUB_STREAM_CPL;
let mut key_iv: Aes256GcmKeyBuffer;
key_iv = Default::default();

get_random(&mut key_iv.key[0].to_le_bytes()).unwrap();
get_random(&mut key_iv.key[1].to_le_bytes()).unwrap();
get_random(&mut key_iv.key[2].to_le_bytes()).unwrap();
Expand All @@ -883,7 +880,7 @@ async fn test_idekm_tdisp(
key_direction,
key_sub_stream,
port_index,
key_iv,
&key_iv,
&mut kp_ack_status,
)
.await
Expand Down Expand Up @@ -1372,6 +1369,11 @@ fn emu_main_inner() {
let socket_io_transport: Arc<Mutex<dyn SpdmDeviceIo + Send + Sync>> =
Arc::new(Mutex::new(socket_io_transport));

let key_iv = Arc::new(Mutex::new(Aes256GcmKeyBuffer {
key: Box::new([0u32; 8]),
iv: Box::new([0u32; 2]),
}));

#[cfg(not(feature = "is_sync"))]
{
block_on(Box::pin(test_spdm(
Expand All @@ -1382,6 +1384,7 @@ fn emu_main_inner() {
block_on(Box::pin(test_idekm_tdisp(
socket_io_transport.clone(),
transport_encap.clone(),
key_iv,
)));

block_on(Box::pin(send_receive_stop(
Expand All @@ -1395,7 +1398,7 @@ fn emu_main_inner() {
{
test_spdm(socket_io_transport.clone(), transport_encap.clone());

test_idekm_tdisp(socket_io_transport.clone(), transport_encap.clone());
test_idekm_tdisp(socket_io_transport.clone(), transport_encap.clone(), key_iv);

send_receive_stop(socket, transport_encap, transport_type);
}
Expand Down

0 comments on commit 36e2686

Please sign in to comment.