[PATCH 5/7] capsules: hmac: Continue reducing code size

From: Alistair Francis
Date: Sat Oct 09 2021 - 07:51:31 EST


From: Alistair Francis <alistair.francis@xxxxxxx>

Signed-off-by: Alistair Francis <alistair.francis@xxxxxxx>
---
capsules/src/hmac.rs | 52 ++++++++++++++++++++------------------------
1 file changed, 24 insertions(+), 28 deletions(-)

diff --git a/capsules/src/hmac.rs b/capsules/src/hmac.rs
index 83d1e5ea5..0ea30635b 100644
--- a/capsules/src/hmac.rs
+++ b/capsules/src/hmac.rs
@@ -478,37 +478,33 @@ impl<
allow_num: usize,
mut slice: ReadOnlyProcessBuffer,
) -> Result<ReadOnlyProcessBuffer, (ReadOnlyProcessBuffer, ErrorCode)> {
- let res = match allow_num {
- // Pass buffer for the key to be in
- 0 => self
- .apps
- .enter(appid, |app, _| {
- mem::swap(&mut app.key, &mut slice);
- Ok(())
- })
- .unwrap_or(Err(ErrorCode::FAIL)),
+ let res = self
+ .apps
+ .enter(appid, |app, _| {
+ match allow_num {
+ // Pass buffer for the key to be in
+ 0 => {
+ mem::swap(&mut app.key, &mut slice);
+ Ok(())
+ }

- // Pass buffer for the data to be in
- 1 => self
- .apps
- .enter(appid, |app, _| {
- mem::swap(&mut app.data, &mut slice);
- Ok(())
- })
- .unwrap_or(Err(ErrorCode::FAIL)),
+ // Pass buffer for the data to be in
+ 1 => {
+ mem::swap(&mut app.data, &mut slice);
+ Ok(())
+ }

- // Compare buffer for verify
- 2 => self
- .apps
- .enter(appid, |app, _| {
- mem::swap(&mut app.compare, &mut slice);
- Ok(())
- })
- .unwrap_or(Err(ErrorCode::FAIL)),
+ // Compare buffer for verify
+ 2 => {
+ mem::swap(&mut app.compare, &mut slice);
+ Ok(())
+ }

- // default
- _ => Err(ErrorCode::NOSUPPORT),
- };
+ // default
+ _ => Err(ErrorCode::NOSUPPORT),
+ }
+ })
+ .unwrap_or(Err(ErrorCode::FAIL));

match res {
Ok(()) => Ok(slice),
--
2.31.1