Skip to content
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

Jump to bottom

Core api: make the configuration of the SE050 lazy. #29

Closed
wants to merge 1 commit into from
Closed

Core api: make the configuration of the SE050 lazy. #29

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
59 changes: 35 additions & 24 deletions src/core_api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2982,36 +2982,47 @@ impl<Twi: I2CForT1, D: DelayUs<u32>> Se050Backend<Twi, D> {
request: &Request,
resources: &mut ServiceResources<P>,
) -> Result<trussed::Reply, Error> {
self.configure()?;

// FIXME: Have a real implementation from trussed
let mut backend_path = core_ctx.path.clone();
backend_path.push(&PathBuf::from(BACKEND_DIR));
backend_path.push(&PathBuf::from(CORE_DIR));

/// Coerce an FnMut into a FnOnce to ensure the stores are not created twice by mistake
fn once<R, P>(
generator: impl FnMut(&mut ServiceResources<P>, &mut CoreContext) -> R,
/// Coerce an Fn* into a FnOnce to ensure the stores are not created twice by mistake
fn once2<R, P>(
generator: impl FnOnce(&mut ServiceResources<P>, &mut CoreContext) -> R,
) -> impl FnOnce(&mut ServiceResources<P>, &mut CoreContext) -> R {
generator
}
let core_keystore = once(|resources, core_ctx| resources.keystore(core_ctx.path.clone()));
let se050_keystore = once(|resources, _core_ctx| resources.keystore(backend_path.clone()));
fn once<R>(generator: impl FnOnce() -> R) -> impl FnOnce() -> R {
generator
}

let core_keystore = once2(|resources, core_ctx| resources.keystore(core_ctx.path.clone()));
let se050_keystore = once2(|resources, _core_ctx| resources.keystore(backend_path.clone()));

let backend_ctx = backend_ctx.with_namespace(&self.ns, &core_ctx.path);
let ns = backend_ctx.ns;

let this = once(move || {
self.configure()
.map_err(|_err| {
error!("Failed to configure SE050: {_err:?}");
Error::FunctionFailed
})
.map(|()| self)
});

Ok(match request {
Request::RandomBytes(request::RandomBytes { count }) => self.random_bytes(*count)?,
Request::Agree(req) if supported(req.mechanism) => self
Request::RandomBytes(request::RandomBytes { count }) => this()?.random_bytes(*count)?,
Request::Agree(req) if supported(req.mechanism) => this()?
.agree(
req,
&mut core_keystore(resources, core_ctx)?,
&mut se050_keystore(resources, core_ctx)?,
ns,
)?
.into(),
Request::Decrypt(req) if supported(req.mechanism) => self
Request::Decrypt(req) if supported(req.mechanism) => this()?
.decrypt(
req.key,
req.mechanism,
Expand All @@ -3020,61 +3031,61 @@ impl<Twi: I2CForT1, D: DelayUs<u32>> Se050Backend<Twi, D> {
ns,
)?
.into(),
Request::DeriveKey(req) if supported(req.mechanism) => self
Request::DeriveKey(req) if supported(req.mechanism) => this()?
.derive_key(
req,
&mut core_keystore(resources, core_ctx)?,
&mut se050_keystore(resources, core_ctx)?,
ns,
)?
.into(),
Request::Encrypt(req) if supported(req.mechanism) => self
Request::Encrypt(req) if supported(req.mechanism) => this()?
.encrypt(req, &mut core_keystore(resources, core_ctx)?, ns)?
.into(),
Request::DeserializeKey(req) if supported(req.mechanism) => self
Request::DeserializeKey(req) if supported(req.mechanism) => this()?
.deserialize_key(req, &mut core_keystore(resources, core_ctx)?)?
.into(),
Request::SerializeKey(req) if supported(req.mechanism) => self
Request::SerializeKey(req) if supported(req.mechanism) => this()?
.serialize_key(req, &mut core_keystore(resources, core_ctx)?)?
.into(),
Request::Delete(request::Delete { key }) => self
Request::Delete(request::Delete { key }) => this()?
.delete(key, ns, &mut se050_keystore(resources, core_ctx)?)?
.into(),
Request::Clear(req) => self
Request::Clear(req) => this()?
.clear(req, &mut se050_keystore(resources, core_ctx)?, ns)?
.into(),
Request::DeleteAllKeys(req) => self
Request::DeleteAllKeys(req) => this()?
.delete_all_keys(
req,
&mut core_keystore(resources, core_ctx)?,
&mut se050_keystore(resources, core_ctx)?,
ns,
)?
.into(),
Request::Exists(req) if supported(req.mechanism) => self
Request::Exists(req) if supported(req.mechanism) => this()?
.exists(req, &mut se050_keystore(resources, core_ctx)?, ns)?
.into(),
Request::GenerateKey(req) if supported(req.mechanism) => self
Request::GenerateKey(req) if supported(req.mechanism) => this()?
.generate_key(req, &mut se050_keystore(resources, core_ctx)?, ns)?
.into(),
Request::Sign(req) if supported(req.mechanism) => self
Request::Sign(req) if supported(req.mechanism) => this()?
.sign(req, &mut se050_keystore(resources, core_ctx)?, ns)?
.into(),
Request::UnsafeInjectKey(req) if supported(req.mechanism) => self
Request::UnsafeInjectKey(req) if supported(req.mechanism) => this()?
.unsafe_inject_key(req, &mut se050_keystore(resources, core_ctx)?, ns)?
.into(),
Request::UnwrapKey(req) => self
Request::UnwrapKey(req) => this()?
.unwrap_key(
req,
&mut core_keystore(resources, core_ctx)?,
&mut se050_keystore(resources, core_ctx)?,
ns,
)?
.into(),
Request::Verify(req) if supported(req.mechanism) => self
Request::Verify(req) if supported(req.mechanism) => this()?
.verify(req, &mut core_keystore(resources, core_ctx)?, ns)?
.into(),
Request::WrapKey(req) => self
Request::WrapKey(req) => this()?
.wrap_key(
req,
&mut core_keystore(resources, core_ctx)?,
Expand Down
10 changes: 5 additions & 5 deletions src/manage.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@ impl<Twi: I2CForT1, D: DelayUs<u32>> ExtensionImpl<Se050ManageExtension> for Se0
request: &<Se050ManageExtension as Extension>::Request,
_resources: &mut ServiceResources<P>,
) -> Result<<Se050ManageExtension as Extension>::Reply, Error> {
self.configure().map_err(|err| {
debug!("Failed to enable for management: {err:?}");
err
})?;

debug!("Runnig manage request: {request:?}");
match request {
Se050ManageRequest::Info(InfoRequest) => {
Expand Down Expand Up @@ -98,6 +93,11 @@ impl<Twi: I2CForT1, D: DelayUs<u32>> ExtensionImpl<Se050ManageExtension> for Se0
.into())
}
Se050ManageRequest::TestSe050(_) => {
self.configure().map_err(|err| {
debug!("Failed to enable for test: {err:?}");
err
})?;

let mut buf = [b'a'; 128];
let mut reply = Bytes::new();
let atr = self.enable()?;
Expand Down
5 changes: 5 additions & 0 deletions src/staging.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ impl<Twi: I2CForT1, D: DelayUs<u32>> ExtensionImpl<WrapKeyToFileExtension>
request: &WrapKeyToFileRequest,
resources: &mut ServiceResources<P>,
) -> Result<WrapKeyToFileReply, Error> {
self.configure().map_err(|err| {
debug!("Failed to enable for wrapkey: {err:?}");
err
})?;

// FIXME: Have a real implementation from trussed
let mut backend_path = core_ctx.path.clone();
backend_path.push(&PathBuf::from(BACKEND_DIR));
Expand Down