Skip to content

Commit 0191a18

Browse files
conradgroblerconradgrobler
committed
Address review comments
1 parent 917e0be commit 0191a18

File tree

5 files changed

+24
-26
lines changed

5 files changed

+24
-26
lines changed

‎remote_attestation/rust/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ edition = "2021"
66
license = "Apache-2.0"
77

88
[features]
9-
default = ["alloc"]
9+
default = []
1010
std = ["anyhow/std", "prost/std"]
11-
alloc = []
1211

1312
[dependencies]
1413
anyhow = { version = "*", default-features = false }

‎remote_attestation/rust/src/crypto.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
// protocol.
2121

2222
use crate::message::EncryptedData;
23-
use alloc::vec::Vec;
23+
use alloc::{format, vec, vec::Vec};
2424
use anyhow::{anyhow, Context};
2525
use core::convert::TryInto;
2626
use ring::{
@@ -194,7 +194,7 @@ impl KeyNegotiator {
194194
.map_err(|error| anyhow!("Couldn't get public key: {:?}", error))?
195195
.as_ref()
196196
.to_vec();
197-
public_key.as_slice().try_into().context(alloc::format!(
197+
public_key.as_slice().try_into().context(format!(
198198
"Incorrect public key length, expected {}, found {}",
199199
KEY_AGREEMENT_ALGORITHM_KEY_LENGTH,
200200
public_key.len()
@@ -235,7 +235,7 @@ impl KeyNegotiator {
235235
&agreement::UnparsedPublicKey::new(KEY_AGREEMENT_ALGORITHM, peer_public_key),
236236
anyhow!("Couldn't derive session keys"),
237237
|key_material| {
238-
let key_material = key_material.try_into().context(alloc::format!(
238+
let key_material = key_material.try_into().context(format!(
239239
"Incorrect key material length, expected {}, found {}",
240240
KEY_AGREEMENT_ALGORITHM_KEY_LENGTH,
241241
key_material.len()
@@ -299,7 +299,7 @@ impl KeyNegotiator {
299299
client_public_key: &[u8; KEY_AGREEMENT_ALGORITHM_KEY_LENGTH],
300300
) -> anyhow::Result<[u8; AEAD_ALGORITHM_KEY_LENGTH]> {
301301
// Session key is derived from a purpose string and two public keys.
302-
let info = alloc::vec![key_purpose.as_bytes(), server_public_key, client_public_key];
302+
let info = vec![key_purpose.as_bytes(), server_public_key, client_public_key];
303303

304304
// Initialize key derivation function.
305305
let salt = Salt::new(HKDF_SHA256, KEY_DERIVATION_SALT.as_bytes());
@@ -352,7 +352,7 @@ impl Signer {
352352

353353
pub fn public_key(&self) -> anyhow::Result<[u8; SIGNING_ALGORITHM_KEY_LENGTH]> {
354354
let public_key = self.key_pair.public_key().as_ref().to_vec();
355-
public_key.as_slice().try_into().context(alloc::format!(
355+
public_key.as_slice().try_into().context(format!(
356356
"Incorrect public key length, expected {}, found {}",
357357
SIGNING_ALGORITHM_KEY_LENGTH,
358358
public_key.len()
@@ -367,7 +367,7 @@ impl Signer {
367367
.map_err(|error| anyhow!("Couldn't sign input: {:?}", error))?
368368
.as_ref()
369369
.to_vec();
370-
signature.as_slice().try_into().context(alloc::format!(
370+
signature.as_slice().try_into().context(format!(
371371
"Incorrect signature length, expected {}, found {}",
372372
SIGNATURE_LENGTH,
373373
signature.len()

‎remote_attestation/rust/src/handshaker.rs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ use crate::{
3434
},
3535
proto::{AttestationInfo, AttestationReport},
3636
};
37-
use alloc::{boxed::Box, vec::Vec};
37+
use alloc::{boxed::Box, vec, vec::Vec};
3838
use anyhow::{anyhow, Context};
3939
use prost::Message;
4040

@@ -304,7 +304,7 @@ impl ClientHandshaker {
304304
// Signing public key.
305305
[Default::default(); SIGNING_ALGORITHM_KEY_LENGTH],
306306
// Attestation info.
307-
alloc::vec![],
307+
vec![],
308308
)
309309
};
310310

@@ -485,9 +485,9 @@ impl ServerHandshaker {
485485
// Signing public key.
486486
[Default::default(); SIGNING_ALGORITHM_KEY_LENGTH],
487487
// Attestation info.
488-
alloc::vec![],
488+
vec![],
489489
// Additional info.
490-
alloc::vec![],
490+
vec![],
491491
)
492492
};
493493

@@ -681,9 +681,7 @@ struct Transcript {
681681

682682
impl Transcript {
683683
pub fn new() -> Self {
684-
Self {
685-
value: alloc::vec![],
686-
}
684+
Self { value: vec![] }
687685
}
688686

689687
/// Appends a serialized `message` to the end of [`Transcript::value`].

‎remote_attestation/rust/src/tests/handshaker.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ use crate::{
2222
},
2323
tests::message::INVALID_MESSAGE_HEADER,
2424
};
25+
use alloc::{boxed::Box, vec};
2526
use assert_matches::assert_matches;
2627

2728
const TEE_MEASUREMENT: &str = "Test TEE measurement";
@@ -33,7 +34,7 @@ fn create_handshakers() -> (ClientHandshaker, ServerHandshaker) {
3334
.unwrap();
3435
let client_handshaker = ClientHandshaker::new(
3536
bidirectional_attestation,
36-
alloc::boxed::Box::new(|server_identity| {
37+
Box::new(|server_identity| {
3738
if !server_identity.additional_info.is_empty() {
3839
Ok(())
3940
} else {
@@ -113,7 +114,7 @@ fn test_handshake() {
113114
#[test]
114115
fn test_invalid_message_after_initialization() {
115116
let (mut client_handshaker, mut server_handshaker) = create_handshakers();
116-
let invalid_message = alloc::vec![INVALID_MESSAGE_HEADER];
117+
let invalid_message = vec![INVALID_MESSAGE_HEADER];
117118

118119
let result = client_handshaker.next_step(&invalid_message);
119120
assert_matches!(result, Err(_));
@@ -129,7 +130,7 @@ fn test_invalid_message_after_initialization() {
129130
#[test]
130131
fn test_invalid_message_after_hello() {
131132
let (mut client_handshaker, mut server_handshaker) = create_handshakers();
132-
let invalid_message = alloc::vec![INVALID_MESSAGE_HEADER];
133+
let invalid_message = vec![INVALID_MESSAGE_HEADER];
133134

134135
let client_hello = client_handshaker.create_client_hello().unwrap();
135136
let result = client_handshaker.next_step(&invalid_message);
@@ -148,7 +149,7 @@ fn test_invalid_message_after_hello() {
148149
#[test]
149150
fn test_invalid_message_after_identities() {
150151
let (mut client_handshaker, mut server_handshaker) = create_handshakers();
151-
let invalid_message = alloc::vec![INVALID_MESSAGE_HEADER];
152+
let invalid_message = vec![INVALID_MESSAGE_HEADER];
152153

153154
let client_hello = client_handshaker.create_client_hello().unwrap();
154155
let server_identity = server_handshaker.next_step(&client_hello).unwrap().unwrap();

‎remote_attestation/rust/src/tests/message.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ use crate::{
2525
MAXIMUM_MESSAGE_SIZE, REPLAY_PROTECTION_ARRAY_LENGTH, SERVER_IDENTITY_HEADER,
2626
},
2727
};
28-
use alloc::vec::Vec;
28+
use alloc::{vec, vec::Vec};
2929
use anyhow::{anyhow, Context};
3030
use assert_matches::assert_matches;
3131
use quickcheck::{quickcheck, TestResult};
@@ -201,8 +201,8 @@ fn test_deserialize_message() {
201201
default_array(),
202202
default_array(),
203203
default_array(),
204-
alloc::vec![],
205-
alloc::vec![],
204+
vec![],
205+
vec![],
206206
);
207207
let deserialized_server_identity = deserialize_message(&server_identity.serialize().unwrap());
208208
assert_matches!(deserialized_server_identity, Ok(_));
@@ -211,23 +211,23 @@ fn test_deserialize_message() {
211211
MessageWrapper::ServerIdentity(server_identity)
212212
);
213213

214-
let client_identity = ClientIdentity::new(default_array(), default_array(), alloc::vec![]);
214+
let client_identity = ClientIdentity::new(default_array(), default_array(), vec![]);
215215
let deserialized_client_identity = deserialize_message(&client_identity.serialize().unwrap());
216216
assert_matches!(deserialized_client_identity, Ok(_));
217217
assert_eq!(
218218
deserialized_client_identity.unwrap(),
219219
MessageWrapper::ClientIdentity(client_identity)
220220
);
221221

222-
let encrypted_data = EncryptedData::new(default_array(), alloc::vec![]);
222+
let encrypted_data = EncryptedData::new(default_array(), vec![]);
223223
let deserialized_encrypted_data = deserialize_message(&encrypted_data.serialize().unwrap());
224224
assert_matches!(deserialized_encrypted_data, Ok(_));
225225
assert_eq!(
226226
deserialized_encrypted_data.unwrap(),
227227
MessageWrapper::EncryptedData(encrypted_data)
228228
);
229229

230-
let invalid_message = alloc::vec![INVALID_MESSAGE_HEADER];
230+
let invalid_message = vec![INVALID_MESSAGE_HEADER];
231231
let deserialized_invalid_message = deserialize_message(&invalid_message);
232232
assert_matches!(deserialized_invalid_message, Err(_));
233233

@@ -249,7 +249,7 @@ fn test_deserialize_message() {
249249
assert_matches!(deserialized_big_client_identity, Err(_));
250250

251251
let big_encrypted_data =
252-
EncryptedData::new([0; NONCE_LENGTH], alloc::vec![0; MAXIMUM_MESSAGE_SIZE + 1])
252+
EncryptedData::new([0; NONCE_LENGTH], vec![0; MAXIMUM_MESSAGE_SIZE + 1])
253253
.serialize()
254254
.unwrap();
255255
let deserialized_big_encrypted_data = deserialize_message(&big_encrypted_data);

0 commit comments

Comments
 (0)