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

Refactor for hax: avoid unneeded .unwrap calls #149

Merged
merged 3 commits into from
Nov 21, 2023
Merged

Refactor for hax: avoid unneeded .unwrap calls #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fad058f
feat: udpate bindgen to avoid proc-macro2 issue on nightly
geonnave Nov 20, 2023
91894f1
refactor(hax): use if let instead of calling .unwrap
geonnave Nov 20, 2023
7b4fdaf
refactor: make get_id_cred return Result to avoid unwrap
geonnave Nov 20, 2023
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
17 changes: 7 additions & 10 deletions consts/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,9 +377,9 @@ mod helpers {
))
}

pub fn get_id_cred<'a>(cred: &'a [u8]) -> BytesIdCred {
let (_g, kid) = parse_cred(cred).unwrap();
[0xa1, 0x04, 0x41, kid]
pub fn get_id_cred<'a>(cred: &'a [u8]) -> Result<BytesIdCred, EDHOCError> {
let (_g, kid) = parse_cred(cred)?;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This early return could be easily replaced with a .map(|(_g, kid)| [0xa1, 0x04, 0x41, kid]).

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, will apply it but in #150.

Ok([0xa1, 0x04, 0x41, kid])
}
}

Expand All @@ -399,7 +399,7 @@ mod test {
let (g_a, kid) = res.unwrap();
assert_eq!(g_a, G_A_TV);
assert_eq!(kid, ID_CRED_TV[3]);
assert_eq!(get_id_cred(CRED_TV), ID_CRED_TV);
assert_eq!(get_id_cred(CRED_TV).unwrap(), ID_CRED_TV);
}
}

Expand Down Expand Up @@ -515,8 +515,7 @@ mod edhoc_parser {
// NOTE: since the current implementation only supports one EAD handler,
// we assume only one EAD item
let ead_res = parse_ead(decoder.remaining_buffer()?);
if ead_res.is_ok() {
let ead_1 = ead_res.unwrap();
if let Ok(ead_1) = ead_res {
Ok((method, suites_i, suites_i_len, g_x, c_i, ead_1))
} else {
Err(ead_res.unwrap_err())
Expand Down Expand Up @@ -579,8 +578,7 @@ mod edhoc_parser {
if plaintext_2.len > decoder.position() {
// assume only one EAD item
let ead_res = parse_ead(decoder.remaining_buffer()?);
if ead_res.is_ok() {
let ead_2 = ead_res.unwrap();
if let Ok(ead_2) = ead_res {
Ok((c_r, id_cred_r, mac_2, ead_2))
} else {
Err(ead_res.unwrap_err())
Expand Down Expand Up @@ -614,8 +612,7 @@ mod edhoc_parser {
if plaintext_3.len > decoder.position() {
// assume only one EAD item
let ead_res = parse_ead(decoder.remaining_buffer()?);
if ead_res.is_ok() {
let ead_3 = ead_res.unwrap();
if let Ok(ead_3) = ead_res {
Ok((id_cred_i, mac_3, ead_3))
} else {
Err(ead_res.unwrap_err())
Expand Down
2 changes: 1 addition & 1 deletion crypto/edhoc-crypto-cryptocell310-sys/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ links = "nrf_cc310_0.9.13"
edhoc-consts = { path = "../../consts" }

[build-dependencies]
bindgen = "0.63.0"
bindgen = "0.69.1"
36 changes: 13 additions & 23 deletions lib/src/edhoc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,7 @@ pub fn r_process_message_1(
// g_x will be saved to the state
let res = parse_message_1(message_1);

if res.is_ok() {
let (method, suites_i, suites_i_len, g_x, c_i, ead_1) = res.unwrap();
if let Ok((method, suites_i, suites_i_len, g_x, c_i, ead_1)) = res {
// verify that the method is supported
if method == EDHOC_METHOD {
// Step 2: verify that the selected cipher suite is supported
Expand Down Expand Up @@ -160,15 +159,15 @@ pub fn r_prepare_message_2(
let prk_3e2m = compute_prk_3e2m(crypto, &salt_3e2m, r, &g_x);

// compute MAC_2
let mac_2 = compute_mac_2(crypto, &prk_3e2m, &get_id_cred(cred_r), cred_r, &th_2);
let mac_2 = compute_mac_2(crypto, &prk_3e2m, &get_id_cred(cred_r)?, cred_r, &th_2);

let ead_2 = r_prepare_ead_2();

let id_cred_r = if ead_2.is_some() {
// NOTE: assume EAD_2 is for zeroconf
IdCred::FullCredential(cred_r)
} else {
let (_g_r, kid) = parse_cred(cred_r).unwrap(); // FIXME
let (_g_r, kid) = parse_cred(cred_r)?;
IdCred::CompactKid(kid)
};

Expand Down Expand Up @@ -227,23 +226,19 @@ pub fn r_process_message_3(

let plaintext_3 = decrypt_message_3(crypto, &prk_3e2m, &th_3, message_3);

if plaintext_3.is_ok() {
let plaintext_3 = plaintext_3.unwrap();
if let Ok(plaintext_3) = plaintext_3 {
let decoded_p3_res = decode_plaintext_3(&plaintext_3);

if decoded_p3_res.is_ok() {
if let Ok((id_cred_i, mac_3, ead_3)) = decoded_p3_res {
// The implementation currently supports the following two cases on handling the credentials:
// 1. R receives a kid and has a corresponding CRED_x passed in as cred_i_expected
// 2. R receives CRED_x by value in the message and uses it
// TODO: add support for fetching CRED_x based on kid received in the message
let (id_cred_i, mac_3, ead_3) = decoded_p3_res.unwrap();

let cred_i = credential_check_or_fetch(cred_i_expected, id_cred_i);
// IMPL: stop if credential_check_or_fetch returns Error

if cred_i.is_ok() {
let (valid_cred_i, g_i) = cred_i.unwrap();

if let Ok((valid_cred_i, g_i)) = cred_i {
// Phase 2:
// - Process EAD_X items that have not been processed yet, and that can be processed before message verification
// IMPL: we are sure valid_cred_i is a full credential
Expand Down Expand Up @@ -272,7 +267,7 @@ pub fn r_process_message_3(
crypto,
&prk_4e3m,
&th_3,
&get_id_cred(valid_cred_i),
&get_id_cred(valid_cred_i)?,
valid_cred_i,
);

Expand Down Expand Up @@ -421,9 +416,7 @@ pub fn i_process_message_2(
let mut kid = 0xffu8; // invalidate kid

let res = parse_message_2(message_2);
if res.is_ok() {
let (g_y, ciphertext_2) = res.unwrap();

if let Ok((g_y, ciphertext_2)) = res {
let th_2 = compute_th_2(crypto, &g_y, &h_message_1);

// compute prk_2e
Expand All @@ -434,14 +427,12 @@ pub fn i_process_message_2(
// decode plaintext_2
let plaintext_2_decoded = decode_plaintext_2(&plaintext_2);

if plaintext_2_decoded.is_ok() {
let (c_r_2, id_cred_r, mac_2, ead_2) = plaintext_2_decoded.unwrap();
if let Ok((c_r_2, id_cred_r, mac_2, ead_2)) = plaintext_2_decoded {
let c_r = c_r_2;

let cred_r = credential_check_or_fetch(cred_r_expected, id_cred_r);
// IMPL: stop if credential_check_or_fetch returns Error
if cred_r.is_ok() {
let (valid_cred_r, g_r) = cred_r.unwrap();
if let Ok((valid_cred_r, g_r)) = cred_r {
// Phase 2:
// - Process EAD_X items that have not been processed yet, and that can be processed before message verification
// IMPL: we are sure valid_cred_r is a full credential
Expand All @@ -466,7 +457,7 @@ pub fn i_process_message_2(
let expected_mac_2 = compute_mac_2(
crypto,
&prk_3e2m,
&get_id_cred(valid_cred_r),
&get_id_cred(valid_cred_r)?,
&valid_cred_r,
&th_2,
);
Expand Down Expand Up @@ -594,7 +585,7 @@ fn credential_check_or_fetch<'a>(
// 1. Does ID_CRED_X point to a stored authentication credential? YES
// IMPL: compare cred_i_expected with id_cred
// IMPL: assume cred_i_expected is well formed
let (public_key_expected, kid_expected) = parse_cred(cred_expected).unwrap();
let (public_key_expected, kid_expected) = parse_cred(cred_expected)?;
let public_key = public_key_expected;
let credentials_match = match id_cred_received {
IdCred::CompactKid(kid_received) => kid_received == kid_expected,
Expand Down Expand Up @@ -932,8 +923,7 @@ fn decrypt_message_3(

let p3 = crypto.aes_ccm_decrypt_tag_8(&k_3, &iv_3, &enc_structure, &ciphertext_3);

if p3.is_ok() {
let p3 = p3.unwrap();
if let Ok(p3) = p3 {
plaintext_3.content[..p3.len].copy_from_slice(&p3.content[..p3.len]);
plaintext_3.len = p3.len;

Expand Down
2 changes: 1 addition & 1 deletion lib/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ impl<'a, Crypto: CryptoTrait> EdhocInitiatorBuildM3<'a, Crypto> {
match i_prepare_message_3(
self.state,
&mut self.crypto,
&get_id_cred(self.cred_i),
&get_id_cred(self.cred_i)?,
self.cred_i,
) {
Ok((state, message_3, prk_out)) => Ok((
Expand Down