Skip to content

Refactor key export methods #199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SCingolani wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Refactor key export methods #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion heimlig/src/crypto/aes/cmac.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ define_aes_cmac_impl!(
#[cfg(test)]
mod test {
use super::*;
use crate::crypto::aes::{test::*, CMAC_TAG_SIZE, KEY128_SIZE, KEY192_SIZE, KEY256_SIZE};
use crate::crypto::aes::{test::*, KEY128_SIZE, KEY192_SIZE, KEY256_SIZE};

macro_rules! define_aes_cmac_calculate_verify_test {
(
Expand Down
131 changes: 59 additions & 72 deletions heimlig/src/hsm/core.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,14 +393,14 @@ impl<
request_id,
key_id,
} => match self.key_store {
None => Ok(Self::no_key_store_response(client_id, request_id)),
None => Self::no_key_store_response(client_id, request_id),
Some(key_store) => {
let is_available = key_store.lock().await.deref_mut().is_key_available(key_id);
Ok(Response::IsKeyAvailable {
Response::IsKeyAvailable {
client_id,
request_id,
is_available,
})
}
}
},
Request::ImportSymmetricKey {
Expand All @@ -410,19 +410,19 @@ impl<
data,
overwrite,
} => match self.key_store {
None => Ok(Self::no_key_store_response(client_id, request_id)),
None => Self::no_key_store_response(client_id, request_id),
Some(key_store) => {
let result = key_store
.lock()
.await
.deref_mut()
.import_symmetric_key(key_id, data, overwrite);
match result {
Ok(()) => Ok(Response::ImportSymmetricKey {
Ok(()) => Response::ImportSymmetricKey {
client_id,
request_id,
}),
Err(e) => Ok(Self::key_store_error_response(client_id, request_id, e)),
},
Err(e) => Self::key_store_error_response(client_id, request_id, e),
}
}
},
Expand All @@ -434,7 +434,7 @@ impl<
private_key,
overwrite,
} => match self.key_store {
None => Ok(Self::no_key_store_response(client_id, request_id)),
None => Self::no_key_store_response(client_id, request_id),
Some(key_store) => {
let result = key_store.lock().await.deref_mut().import_key_pair(
key_id,
Expand All @@ -443,11 +443,11 @@ impl<
overwrite,
);
match result {
Ok(()) => Ok(Response::ImportKeyPair {
Ok(()) => Response::ImportKeyPair {
client_id,
request_id,
}),
Err(e) => Ok(Self::key_store_error_response(client_id, request_id, e)),
},
Err(e) => Self::key_store_error_response(client_id, request_id, e),
}
}
},
Expand All @@ -457,82 +457,69 @@ impl<
key_id,
data,
} => match self.key_store {
None => Ok(Self::no_key_store_response(client_id, request_id)),
Some(key_store) => {
let exported_key = key_store
.lock()
.await
.deref_mut()
.export_symmetric_key(key_id, data);
match exported_key {
Ok(written) => {
let written_len = written.len();
Ok(Response::ExportSymmetricKey {
client_id,
request_id,
key: &mut data[..written_len],
})
}
Err(e) => Ok(Self::key_store_error_response(client_id, request_id, e)),
}
}
None => Self::no_key_store_response(client_id, request_id),
Some(key_store) => key_store
.lock()
.await
.deref_mut()
.export_symmetric_key_to_slice(key_id, data)
.map_or_else(
|e| Self::key_store_error_response(client_id, request_id, e),
|()| Response::ExportSymmetricKey {
client_id,
request_id,
key: data,
},
),
},
Request::ExportPublicKey {
client_id,
request_id,
key_id,
public_key,
} => match self.key_store {
None => Ok(Self::no_key_store_response(client_id, request_id)),
Some(key_store) => {
let exported_key = key_store
.lock()
.await
.deref_mut()
.export_public_key(key_id, public_key);
match exported_key {
Ok(written) => {
let exported_key_len = written.len();
Ok(Response::ExportPublicKey {
client_id,
request_id,
public_key: &mut public_key[..exported_key_len],
})
}
Err(e) => Ok(Self::key_store_error_response(client_id, request_id, e)),
}
}
None => Self::no_key_store_response(client_id, request_id),
Some(key_store) => key_store
.lock()
.await
.deref_mut()
.export_public_key_to_slice(key_id, public_key)
.map_or_else(
|e| Self::key_store_error_response(client_id, request_id, e),
|()| Response::ExportPublicKey {
client_id,
request_id,
public_key,
},
),
},
Request::ExportPrivateKey {
client_id,
request_id,
key_id,
private_key,
} => match self.key_store {
None => Ok(Self::no_key_store_response(client_id, request_id)),
Some(key_store) => {
let exported_key = key_store
.lock()
.await
.deref_mut()
.export_private_key(key_id, private_key);
match exported_key {
Ok(written) => {
let written_len = written.len();
Ok(Response::ExportPrivateKey {
client_id,
request_id,
private_key: &mut private_key[..written_len],
})
}
Err(e) => Ok(Self::key_store_error_response(client_id, request_id, e)),
}
}
None => Self::no_key_store_response(client_id, request_id),
Some(key_store) => key_store
.lock()
.await
.deref_mut()
.export_private_key_to_slice(key_id, private_key)
.map_or_else(
|e| Self::key_store_error_response(client_id, request_id, e),
|()| Response::ExportPrivateKey {
client_id,
request_id,
private_key,
},
),
},
req => Response::Error {
client_id: req.get_client_id(),
request_id: req.get_request_id(),
error: jobs::Error::UnexpectedRequestType,
},
_ => Err(Error::Internal(InternalError::UnexpectedCoreRequest(
request.get_type(),
))),
}?;
};
self.send_to_client(response).await
}

Expand Down
Loading